[csw-devel] SF.net SVN: gar:[9363] csw/mgar/pkg/glib/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9363
          http://gar.svn.sourceforge.net/gar/?rev=9363&view=rev
Author:   dmichelsen
Date:     2010-03-25 13:34:37 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
glib: Add more patches

Modified Paths:
--------------
    csw/mgar/pkg/glib/trunk/Makefile
    csw/mgar/pkg/glib/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch

Modified: csw/mgar/pkg/glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile	2010-03-25 13:29:11 UTC (rev 9362)
+++ csw/mgar/pkg/glib/trunk/Makefile	2010-03-25 13:34:37 UTC (rev 9363)
@@ -18,9 +18,11 @@
 SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz)
 DISTFILES  = $(SOURCEFILES)
 NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES))
-PATCHFILES_isa-i386-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
-PATCHFILES_isa-sparcv8-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
-PATCHFILES_isa-sparcv9-garversion-1.3.15 = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
+PATCHFILES-1.3.15  = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
+PATCHFILES-1.3.15 += 0002-Don-t-break-when-index.sgml-is-not-there.patch
+PATCHFILES_isa-i386-garversion-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-sparcv8-garversion-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-sparcv9-garversion-1.3.15 = $(PATCHFILES-1.3.15)
 
 PACKAGES = CSWglib CSWglibdevel
 

Modified: csw/mgar/pkg/glib/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib/trunk/checksums	2010-03-25 13:29:11 UTC (rev 9362)
+++ csw/mgar/pkg/glib/trunk/checksums	2010-03-25 13:34:37 UTC (rev 9363)
@@ -1,3 +1,4 @@
 59acd3287366b4313eab0eaed5db1459  0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
+7566b5dfaf32ab71ca081aa0e597f1fb  0002-Don-t-break-when-index.sgml-is-not-there.patch
 6fe30dad87c77b91b632def29dd69ef9  glib-1.2.10.tar.gz
 cf44901e30edebe13b32da1bee852193  glib-1.3.15.tar.gz

Added: csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch
===================================================================
--- csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch	                        (rev 0)
+++ csw/mgar/pkg/glib/trunk/files/0002-Don-t-break-when-index.sgml-is-not-there.patch	2010-03-25 13:34:37 UTC (rev 9363)
@@ -0,0 +1,39 @@
+From 135d620b4b3884a20a37f50b2e10554e763f41cf Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 24 Mar 2010 17:57:23 +0100
+Subject: [PATCH] Don't break when index.sgml is not there
+
+---
+ docs/reference/glib/Makefile.am |    2 +-
+ docs/reference/glib/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
+index 14f9cb1..cf79f05 100644
+--- a/docs/reference/glib/Makefile.am
++++ b/docs/reference/glib/Makefile.am
+@@ -174,7 +174,7 @@ install-data-local:
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
++	  if [ -f $(srcdir)/html/index.sgml ]; then $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); fi; \
+ 	fi)
+ 
+ #
+diff --git a/docs/reference/glib/Makefile.in b/docs/reference/glib/Makefile.in
+index 3581cae..69df35c 100644
+--- a/docs/reference/glib/Makefile.in
++++ b/docs/reference/glib/Makefile.in
+@@ -425,7 +425,7 @@ install-data-local:
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
++	  if [ -f $(srcdir)/html/index.sgml ]; then $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); fi; \
+ 	fi)
+ 
+ #
+-- 
+1.7.0
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.