Source Mage code commit list

[Robin Cook <scm AT sourcemage.org>]

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

 gnome2-libs/goffice-0.6/DETAILS           |    2 +-
 gnome2-libs/goffice-0.6/HISTORY           |    5 +++++
 gnome2-libs/goffice-0.6/PRE_BUILD         |    8 ++------
 gnome2-libs/goffice-0.6/gtk-doc.patch     |   30 
++++++++++++++++++++++++++++++
 gnome2-libs/goffice-0.6/patch-Makefile_in |   11 -----------
 5 files changed, 38 insertions(+), 18 deletions(-)

New commits:
commit eb6b2c61ed5ab75775ed0d8816ddbdbd1b3b35c6
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

    goffice-0.6: apply patch that fixes the problem.

diff --git a/gnome2-libs/goffice-0.6/DETAILS b/gnome2-libs/goffice-0.6/DETAILS
index ae1831b..e1c3b9c 100755
--- a/gnome2-libs/goffice-0.6/DETAILS
+++ b/gnome2-libs/goffice-0.6/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=LGPL
         WEB_SITE=http://www.gnome.org/
-      PATCHLEVEL=1
+      PATCHLEVEL=2
          ENTERED=20070922
         KEYWORDS="gnome2 libs"
            SHORT='GOffice shared functionality'
diff --git a/gnome2-libs/goffice-0.6/HISTORY b/gnome2-libs/goffice-0.6/HISTORY
index 0bc4853..9a0fec5 100644
--- a/gnome2-libs/goffice-0.6/HISTORY
+++ b/gnome2-libs/goffice-0.6/HISTORY
@@ -1,3 +1,8 @@
+2008-01-04 Robin Cook <rcook AT wyrms.net>
+       * DETAILS: PATCHLEVEL++
+       * PRE_BUILD: changed to patch that actually fixes the problem.
+         http://bugzilla.gnome.org/show_bug.cgi?id=506506
+
 2008-01-01 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * PRE_BUILD: fixed gtk-doc bug, until upstream fixes it properly
diff --git a/gnome2-libs/goffice-0.6/PRE_BUILD 
b/gnome2-libs/goffice-0.6/PRE_BUILD
index 9015ca2..b5c48be 100755
--- a/gnome2-libs/goffice-0.6/PRE_BUILD
+++ b/gnome2-libs/goffice-0.6/PRE_BUILD
@@ -1,8 +1,4 @@
-default_pre_build &&
+default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
 
-source $GRIMOIRE/is_depends_enabled.function &&
-
-if ! is_depends_enabled $SPELL gtk-doc; then
-  patch -p0 < $SPELL_DIRECTORY/patch-Makefile_in
-fi
+patch -p0 < $SCRIPT_DIRECTORY/gtk-doc.patch
diff --git a/gnome2-libs/goffice-0.6/gtk-doc.patch 
b/gnome2-libs/goffice-0.6/gtk-doc.patch
new file mode 100644
index 0000000..4e4e2ba
--- /dev/null
+++ b/gnome2-libs/goffice-0.6/gtk-doc.patch
@@ -0,0 +1,30 @@
+diff -ru goffice-0.6.1.orig/gtk-doc.make goffice-0.6.1/gtk-doc.make
+--- goffice-0.6.1.orig/gtk-doc.make    2007-12-20 11:11:23.000000000 +0000
++++ goffice-0.6.1/gtk-doc.make 2008-01-04 18:33:48.000000000 +0000
+@@ -5,11 +5,11 @@
+ ####################################
+ 
+ if GTK_DOC_USE_LIBTOOL
+-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) 
$(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) 
$(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+ else
+-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) 
$(CFLAGS)
+-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+ endif
+ 
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -139,8 +139,9 @@
+         done; \
+         echo '-- Installing $(srcdir)/html/index.sgml' ; \
+         $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) 
|| :; \
+-        which gtkdoc-rebase >/dev/null && \
+-          gtkdoc-rebase --relative --dest-dir=$(DESTDIR) 
--html-dir=$(DESTDIR)$(TARGET_DIR) ; \
++        if test `which gtkdoc-rebase` != ""; then \
++        gtkdoc-rebase --relative --dest-dir=$(DESTDIR) 
--html-dir=$(DESTDIR)$(TARGET_DIR) ; \
++        fi \
+       fi
+
diff --git a/gnome2-libs/goffice-0.6/patch-Makefile_in 
b/gnome2-libs/goffice-0.6/patch-Makefile_in
deleted file mode 100644
index 628e2d7..0000000
--- a/gnome2-libs/goffice-0.6/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig   2007-12-22 17:20:33.000000000 +0100
-+++ Makefile.in        2007-12-22 17:21:23.000000000 +0100
-@@ -268,7 +268,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = goffice tests pixmaps plugins po docs tools
-+SUBDIRS = goffice tests pixmaps plugins po tools
- EXTRA_DIST = README NEWS BUGS MAINTAINERS AUTHORS \
-       goffice.mk \
-       goffice-plugins.mk \