Source Mage code commit list

[Arwed von Merkatz <v.merkatz AT gmx.net>]

On Sat, Jan 05, 2008 at 05:40:08PM -0600, Vlad Glagolev wrote:
> GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
> 
>  gnome2-libs/goffice-0.6/DETAILS       |    4 +--
>  gnome2-libs/goffice-0.6/HISTORY       |    3 ++
>  gnome2-libs/goffice-0.6/gtk-doc.patch |   37 
> ++++++++++++++++++++++++++++++----
>  3 files changed, 38 insertions(+), 6 deletions(-)
> 
> New commits:
> commit 0f48d81b0554e2b726e71f4608478481eb541442
> Author: Vlad Glagolev <stealth AT sourcemage.org>
> Commit: Vlad Glagolev <stealth AT sourcemage.org>
> 
>     goffice-0.6: made it really compileable
> 
> commit 273ed393cb2a832eadd017a01acb7f753d16b24b
> Author: Vlad Glagolev <stealth AT sourcemage.org>
> Commit: Vlad Glagolev <stealth AT sourcemage.org>
> 
>     Revert "goffice-0.6: made it compileable"
>     
>     This reverts commit c27185561374d4abbf8e81b5e1b68bc5bcf6b530.
> 

You changed the patch in a way that requires a different patch command
(-p1 instead of -p0), right now it fails to find the files to patch:
Unpacking source file goffice-0.6.1.tar.bz2 for spell goffice-0.6.
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:      
--------------------------            
|--- goffice-0.6.1.orig/docs/reference/Makefile.in      2007-12-20
11:11:28.0000
00000 +0000                           
|+++ goffice-0.6.1.orig/docs/reference/Makefile.in      2008-01-04
18:33:52.0000
00000 +0000                           
--------------------------            
File to patch:                        
Skip this patch? [y]                  
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 32
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- goffice-0.6.1.orig/gtk-doc.make    2007-12-20 11:11:23.000000000
+0000
|+++ goffice-0.6.1.orig/gtk-doc.make    2008-01-04 18:33:48.000000000
+0000
--------------------------
File to patch:


> diff --git a/gnome2-libs/goffice-0.6/DETAILS 
> b/gnome2-libs/goffice-0.6/DETAILS
> index e1c3b9c..c51bec1 100755
> --- a/gnome2-libs/goffice-0.6/DETAILS
> +++ b/gnome2-libs/goffice-0.6/DETAILS
> @@ -7,10 +7,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
>        SOURCE_GPG=gurus.gpg:$SOURCE.sig
>        LICENSE[0]=LGPL
>          WEB_SITE=http://www.gnome.org/
> -      PATCHLEVEL=2
> +      PATCHLEVEL=3
>           ENTERED=20070922
>          KEYWORDS="gnome2 libs"
> -           SHORT='GOffice shared functionality'
> +           SHORT="GOffice shared functionality"
>  cat << EOF
>  GOffice shared functionality.
>  EOF
> diff --git a/gnome2-libs/goffice-0.6/HISTORY 
> b/gnome2-libs/goffice-0.6/HISTORY
> index 9a0fec5..2b2a52a 100644
> --- a/gnome2-libs/goffice-0.6/HISTORY
> +++ b/gnome2-libs/goffice-0.6/HISTORY
> @@ -1,3 +1,6 @@
> +2008-01-06 Vlad Glagolev <stealth AT sourcemage.org>
> +     * DETAILS: PATCHLEVEL++, fixed the patch
> +
>  2008-01-04 Robin Cook <rcook AT wyrms.net>
>       * DETAILS: PATCHLEVEL++
>       * PRE_BUILD: changed to patch that actually fixes the problem.
> diff --git a/gnome2-libs/goffice-0.6/gtk-doc.patch 
> b/gnome2-libs/goffice-0.6/gtk-doc.patch
> index ebcb03d..f4c161a 100644
> --- a/gnome2-libs/goffice-0.6/gtk-doc.patch
> +++ b/gnome2-libs/goffice-0.6/gtk-doc.patch
> @@ -1,6 +1,35 @@
> ---- gtk-doc.make.orig        2007-12-20 14:11:23.000000000 +0300
> -+++ gtk-doc.make     2008-01-06 02:12:55.195415011 +0300
> -@@ -5,11 +5,11 @@
> +--- goffice-0.6.1.orig/docs/reference/Makefile.in    2007-12-20 
> 11:11:28.000000000 +0000
> ++++ goffice-0.6.1.orig/docs/reference/Makefile.in    2008-01-04 
> 18:33:52.000000000 +0000
> +@@ -288,10 +288,10 @@ 
> + expand_content_files = 
> + GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(GOFFICE_CFLAGS)
> + GTKDOC_LIBS = $(top_builddir)/goffice/libgoffice-@GOFFICE_API_VER@.la 
> $(GOFFICE_LIBS)
> +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) 
> $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
> +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) 
> $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
> +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) 
> $(AM_LDFLAGS) $(LDFLAGS)
> +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) 
> $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
> ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) 
> $(CFLAGS)
> ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) 
> $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
> ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) 
> $(LDFLAGS)
> ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) 
> $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
> + 
> + # We set GPATH here; this gives us semantics for GNU make
> + # which are more like other make's VPATH, when it comes to
> +@@ -588,8 +588,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
> + 
> + uninstall-local:
> +--- goffice-0.6.1.orig/gtk-doc.make  2007-12-20 11:11:23.000000000 +0000
> ++++ goffice-0.6.1.orig/gtk-doc.make  2008-01-04 18:33:48.000000000 +0000
> +@@ -5,11 +5,11 @@ 
>   ####################################
>   
>   if GTK_DOC_USE_LIBTOOL
> @@ -16,7 +45,7 @@
>   endif
>   
>   # We set GPATH here; this gives us semantics for GNU make
> -@@ -139,8 +139,9 @@
> +@@ -139,8 +139,9 @@ 
>         done; \
>         echo '-- Installing $(srcdir)/html/index.sgml' ; \
>         $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) 
> || :; \
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit

-- 
Arwed v. Merkatz                              Source Mage GNU/Linux developer
                                                    http://www.sourcemage.org