[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (592b701ba3ff58cd8b8142aae95e6ccfeb69167d)

Ladislav Hagara scm at sourcemage.org
Sat Jan 15 09:58:28 EST 2011


GIT changes to master grimoire by Ladislav Hagara <hgr at vabo.cz>:

 dev/null                                     |binary
 gnome2-libs/gtk-doc/DETAILS                  |    2 +-
 gnome2-libs/gtk-doc/HISTORY                  |    4 ++++
 gnome2-libs/gtk-doc/PRE_BUILD                |    5 -----
 gnome2-libs/gtk-doc/bug612028.patch          |   18 ------------------
 gnome2-libs/gtk-doc/gtk-doc-1.15.tar.bz2.sig |    0 
 gnome2-libs/gtk-doc/gtk-doc-1.16.tar.bz2.sig |binary
 7 files changed, 5 insertions(+), 24 deletions(-)

New commits:
commit 592b701ba3ff58cd8b8142aae95e6ccfeb69167d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gtk-doc 1.16

diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS
index ce645dd..9f6082d 100755
--- a/gnome2-libs/gtk-doc/DETAILS
+++ b/gnome2-libs/gtk-doc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gtk-doc
-         VERSION=1.15
+         VERSION=1.16
 	  BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index 37703b2..dab22ba 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,7 @@
+2011-01-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.16
+	* PRE_BUILD, bug612028.patch: removed, fixed upstream
+
 2010-10-06 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* PRE_BUILD: Apply bug612028.patch
diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD
deleted file mode 100755
index cbed84e..0000000
--- a/gnome2-libs/gtk-doc/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-message "${MESSAGE_COLOR}Applying make 3.82 syntax patch...${DEFAULT_COLOR}" &&
-patch "$SOURCE_DIRECTORY"/gtkdoc-fixxref.in \
-      "$SPELL_DIRECTORY"/bug612028.patch
diff --git a/gnome2-libs/gtk-doc/bug612028.patch b/gnome2-libs/gtk-doc/bug612028.patch
deleted file mode 100644
index 275e1db..0000000
--- a/gnome2-libs/gtk-doc/bug612028.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# From http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0
-# to fix https://bugzilla.gnome.org/show_bug.cgi?id=612028
-#
-
-diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
-index 33a31b8..9f53852 100755
---- a/gtkdoc-fixxref.in
-+++ b/gtkdoc-fixxref.in
-@@ -464,7 +464,7 @@ sub HighlightSourceVim {
-     close (NEWFILE);
- 
-     # format source
--    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null";
-+    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w! $temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null";
- 
-     my $highlighted_source;
-     {
diff --git a/gnome2-libs/gtk-doc/gtk-doc-1.15.tar.bz2.sig b/gnome2-libs/gtk-doc/gtk-doc-1.15.tar.bz2.sig
deleted file mode 100644
index 05dd049..0000000
Binary files a/gnome2-libs/gtk-doc/gtk-doc-1.15.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gtk-doc/gtk-doc-1.16.tar.bz2.sig b/gnome2-libs/gtk-doc/gtk-doc-1.16.tar.bz2.sig
new file mode 100644
index 0000000..d58f3a6
Binary files /dev/null and b/gnome2-libs/gtk-doc/gtk-doc-1.16.tar.bz2.sig differ



More information about the SM-Commit mailing list