[csw-devel] SF.net SVN: gar:[9205] csw/mgar/pkg/glib/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Mar 16 15:41:58 CET 2010
Revision: 9205
http://gar.svn.sourceforge.net/gar/?rev=9205&view=rev
Author: dmichelsen
Date: 2010-03-16 14:41:58 +0000 (Tue, 16 Mar 2010)
Log Message:
-----------
glib: Add modulation and split off devel
Modified Paths:
--------------
csw/mgar/pkg/glib/trunk/Makefile
csw/mgar/pkg/glib/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
Modified: csw/mgar/pkg/glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile 2010-03-16 14:10:14 UTC (rev 9204)
+++ csw/mgar/pkg/glib/trunk/Makefile 2010-03-16 14:41:58 UTC (rev 9205)
@@ -5,6 +5,8 @@
EXTRA_MODULATORS = GARVERSION
MODULATIONS_GARVERSION = 1.2.10 1.3.15
+SKIP_MODULATIONS = isa-sparcv9-garversion-1.2.10 isa-amd64-garversion-1.2.10
+
DESCRIPTION = Utility library commonly associated with GNOME programs
define BLURB
GLib is a library containing many useful C routines for things such as trees,
@@ -16,15 +18,28 @@
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
-DEP_PKGS = CSWggettextrt CSWiconv
+PACKAGES = CSWglib CSWglibdevel
+CATALOGNAME_CSWglib = glib
+CATALOGNAME_CSWglibdevel = glib_devel
+
+SPKG_DESC_CSWglib = $(DESCRIPTION)
+SPKG_DESC_CSWglibdevel = Development files for glib
+
+RUNTIME_DEP_PKGS_CSWglib = CSWggettextrt CSWiconv
+RUNTIME_DEP_PKGS_CSWglibdevel = CSWglib
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWglib)
+
# glib 1.x doesn't seem to be 64 bit clean
-#BUILD64 = 1
-#NOISAEXEC = 1
+BUILD64 = 1
+NOISAEXEC = 1
# Only needed for 1.3.x
-SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog
+SGML_CATALOG_FILES = /etc/opt/csw/sgml/catalog
EXTRA_BUILD_EXPORT-1.3.15 = SGML_CATALOG_FILES
EXTRA_BUILD_EXPORTS = $(EXTRA_BUILD_EXPORT-$(GARVERSION))
@@ -33,9 +48,23 @@
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+# There are three possible harmless tests failing for 1.3.15 64 bit, so skip for now
+TEST_SCRIPTS_isa-default-garversion-1.2.10 = $(WORKSRC)/Makefile
+TEST_SCRIPTS_isa-default-garversion-1.3.15 = $(WORKSRC)/Makefile
+TEST_SCRIPTS = $(call modulationvalue,TEST_SCRIPTS)
+
TEST_TARGET = check
#provided by iconv
MERGE_EXCLUDE_FILES = .*/charset.alias
+MERGE_SCRIPTS_isa-default-garversion-1.2.10 = copy-only
+MERGE_DIRS_isa-default-garversion-1.2.10 = $(libdir)
+MERGE_SCRIPTS_isa-default-garversion-1.3.15 = copy-all
+MERGE_DIRS_isa-extra-garversion-1.3.15 = $(libdir)
+MERGE_SCRIPTS_isa-extra-garversion-1.3.15 = copy-relocated-only
+
+PKGFILES_CSWglibdevel = $(PKGFILES_DEVEL)
+PKGFILES_CSWglibdevel += $(sharedstatedir)/gtk-doc/.*
+
include gar/category.mk
Modified: csw/mgar/pkg/glib/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib/trunk/checksums 2010-03-16 14:10:14 UTC (rev 9204)
+++ csw/mgar/pkg/glib/trunk/checksums 2010-03-16 14:41:58 UTC (rev 9205)
@@ -1,2 +1,3 @@
+59acd3287366b4313eab0eaed5db1459 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
6fe30dad87c77b91b632def29dd69ef9 glib-1.2.10.tar.gz
cf44901e30edebe13b32da1bee852193 glib-1.3.15.tar.gz
Added: csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
===================================================================
--- csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch (rev 0)
+++ csw/mgar/pkg/glib/trunk/files/0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch 2010-03-16 14:41:58 UTC (rev 9205)
@@ -0,0 +1,67 @@
+From 10920de07030b7407cd5ff9a243e02083a96a2fb Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 15 Mar 2010 16:02:12 +0100
+Subject: [PATCH] gtkdoc-mkhtml returns 1 on warnings
+
+---
+ docs/reference/glib/Makefile.am | 2 +-
+ docs/reference/glib/Makefile.in | 2 +-
+ docs/reference/gobject/Makefile.am | 2 +-
+ docs/reference/gobject/Makefile.in | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
+index e44a3c2..14f9cb1 100644
+--- a/docs/reference/glib/Makefile.am
++++ b/docs/reference/glib/Makefile.am
+@@ -148,7 +148,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo '*** Building HTML ***'
+ rm -rf $(srcdir)/html
+ mkdir $(srcdir)/html
+- cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo '-- Fixing Crossreferences'
+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+diff --git a/docs/reference/glib/Makefile.in b/docs/reference/glib/Makefile.in
+index 35b867f..3581cae 100644
+--- a/docs/reference/glib/Makefile.in
++++ b/docs/reference/glib/Makefile.in
+@@ -400,7 +400,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ @ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***'
+ @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html
+ @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html
+- at ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ at ENABLE_GTK_DOC_TRUE@ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences'
+ @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
+index 2462df3..e8fe488 100644
+--- a/docs/reference/gobject/Makefile.am
++++ b/docs/reference/gobject/Makefile.am
+@@ -126,7 +126,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo '*** Building HTML ***'
+ rm -rf $(srcdir)/html
+ mkdir $(srcdir)/html
+- cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo '-- Fixing Crossreferences'
+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+diff --git a/docs/reference/gobject/Makefile.in b/docs/reference/gobject/Makefile.in
+index 6182c8d..0cb73aa 100644
+--- a/docs/reference/gobject/Makefile.in
++++ b/docs/reference/gobject/Makefile.in
+@@ -375,7 +375,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ @ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***'
+ @ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html
+ @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html
+- at ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ at ENABLE_GTK_DOC_TRUE@ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @ENABLE_GTK_DOC_TRUE@ @echo '-- Fixing Crossreferences'
+ @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+--
+1.7.0
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list