Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 gnome2-libs/gtk-doc/DETAILS         |    4 ++--
 gnome2-libs/gtk-doc/HISTORY         |    8 +++++++-
 gnome2-libs/gtk-doc/PRE_BUILD       |    3 +++
 gnome2-libs/gtk-doc/bug612028.patch |   18 ++++++++++++++++++
 utils/eggdbus/HISTORY               |    4 ++--
 5 files changed, 32 insertions(+), 5 deletions(-)

New commits:
commit 6a5cbf04074108d13b61dc5fd0e97e5b700b226f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    eggdbus: Cleanup formatting

commit 28d8297ccd7f5dc795818e3907e68efcc5a7b1fd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gtk-doc: Cleanup formatting

commit dca20b38089c9413815da76bcc3501486aa0a506
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gtk-doc: Fix https://bugzilla.gnome.org/show_bug.cgi?id=612028
    Fixes eggdbus compilation, even when using '--disable-gtk-doc'
    PATCHLEVEL++
    
    readline() on closed filehandle NEWFILE at /usr/bin/gtkdoc-fixxref line 
470.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 473.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 474.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 478.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 479.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 480.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 481.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 482.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 483.
    Use of uninitialized value in substitution (s///) at 
/usr/bin/gtkdoc-fixxref line 484.
    Can't delete html/_temp_src.29581.h.html: No such file or directory at 
/usr/bin/gtkdoc-fixxref line 489.

diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS
index fd55bcc..ce645dd 100755
--- a/gnome2-libs/gtk-doc/DETAILS
+++ b/gnome2-libs/gtk-doc/DETAILS
@@ -6,12 +6,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=GPL
+      PATCHLEVEL=1
         WEB_SITE=http://www.gtk.org/gtk-doc/
          ENTERED=20020509
         KEYWORDS="gnome2 libs"
            SHORT="Tools for authors of the GTK+ reference documentation."
 cat << EOF
 These are tools for authors of the GTK+ reference documentation.
-See the GTK+ Reference Documentation Project home page: 
-http://www.gtk.org/rdp
+See the GTK+ Reference Documentation Project home page: 
http://www.gtk.org/rdp
 EOF
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index 908f4e2..1c9e1b0 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,9 @@
+2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++
+       * PRE_BUILD: Apply bug612028.patch
+       * bug612028.patch: Fix 
https://bugzilla.gnome.org/show_bug.cgi?id=612028
+         Fixes eggdbus compilation, even when using '--disable-gtk-doc'
+
 2010-05-23 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.15
 
@@ -16,7 +22,7 @@
 
 2009-09-04 Finn Haedicke <finn_haedicke AT gmx.net>
        * DEPENDS: docbook-xsl not optional,
-         requires docbook-dtd 
+         requires docbook-dtd
 
 2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
        * DEPENDS: added dependency on gnome-doc-utils
diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD
new file mode 100755
index 0000000..0ae4d00
--- /dev/null
+++ b/gnome2-libs/gtk-doc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+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
new file mode 100644
index 0000000..275e1db
--- /dev/null
+++ b/gnome2-libs/gtk-doc/bug612028.patch
@@ -0,0 +1,18 @@
+#
+# 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/utils/eggdbus/HISTORY b/utils/eggdbus/HISTORY
index dfd845f..192dc7c 100644
--- a/utils/eggdbus/HISTORY
+++ b/utils/eggdbus/HISTORY
@@ -6,8 +6,8 @@
          not libxslt
 
 2009-09-30 Arjan Bouter <abouter AT sourcemage.org>
-        * DEPENDS: added missing optional dep on libxslt
-        * BUILD: removed, not needed anymore
+       * DEPENDS: added missing optional dep on libxslt
+       * BUILD: removed, not needed anymore
 
 2009-09-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added gtk-doc as opt dep