Revision: 2947
http://gar.svn.sourceforge.net/gar/?rev=2947&view=rev
Author: harpchad
Date: 2009-01-30 21:25:04 +0000 (Fri, 30 Jan 2009)
Log Message:
-----------
- update to glib 2.18.4
- add 64-bit support
- build with gar v2
Modified Paths:
--------------
csw/mgar/pkg/glib2/trunk/Makefile
csw/mgar/pkg/glib2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/glib2/trunk/files/
csw/mgar/pkg/glib2/trunk/files/CSWglib2.gspec
csw/mgar/pkg/glib2/trunk/files/CSWglib2devel.gspec
csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch
Property Changed:
----------------
csw/mgar/pkg/glib2/trunk/
Property changes on: csw/mgar/pkg/glib2/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile 2009-01-30 21:09:32 UTC (rev 2946)
+++ csw/mgar/pkg/glib2/trunk/Makefile 2009-01-30 21:25:04 UTC (rev 2947)
@@ -1,5 +1,5 @@
-GARNAME = glib2
-GARVERSION = 2.4.0
+GARNAME = glib
+GARVERSION = 2.18.4
CATEGORIES = lib
DESCRIPTION = The GLib library of C routines.
@@ -9,22 +9,31 @@
has been split off as of the developers' version 1.1.0.
endef
-MASTER_SITES = ftp://ftp.gtk.org/pub/gtk/v2.4/
+MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES = glib-$(GARVERSION).tar.bz2
-WORKSRC = $(WORKDIR)/glib-$(GARVERSION)
+DISTFILES = $(call admfiles,CSWglib2,)
+DISTFILES += $(call admfiles,CSWglib2devel,)
+DISTFILES += $(GARNAME)-$(GARVERSION).tar.bz2
+#See gnome bug 569889
+PATCHFILES = gtkdoc-rebase.patch
+
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --enable-debug=yes
+CONFIGURE_ARGS += --with-libiconv=gnu
+CONFIGURE_ARGS += --enable-static
+CONFIGURE_ARGS += --disable-gtk-doc
-TEST_TARGET = check
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
-# Bug #136867 (child-watch)
-TEST_SCRIPTS =
+BUILD64 = 1
+NO_ISAEXEC = 1
+REQUIRED_PKGS_CSWglib2 = CSWggettext CSWiconv CSWsunmath
+REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettext CSWiconv
+
+TEST_TARGET =
+
+PKGFILES_CSWglib2 = $(PKGFILES_RT)
+PKGFILES_CSWglib2 += /opt/csw/share/locale/.*
+
include gar/category.mk
-
-# For some reason, autoconf drops the ball on this one...
-post-install:
- @( cd $(DESTDIR)$(bindir) ; \
- $(PERL) -i -plne '$$. == 1 && s{#!\s+}{#!$(PERL) }' glib-mkenums )
Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums 2009-01-30 21:09:32 UTC (rev 2946)
+++ csw/mgar/pkg/glib2/trunk/checksums 2009-01-30 21:25:04 UTC (rev 2947)
@@ -1 +1,4 @@
-0f5f4896782ec7ab6ea8c7c1d9958114 download/glib-2.4.0.tar.bz2
+fdfb028f9224b8e9926163aae0e97d3f download/CSWglib2.gspec
+716c7eda9a4edd22c1f648396a60b646 download/CSWglib2devel.gspec
+ec25ed261534d870141000ab73f1a2bf download/glib-2.18.4.tar.bz2
+fb144356d0918eff4ef17a2a285860bc download/gtkdoc-rebase.patch
Added: csw/mgar/pkg/glib2/trunk/files/CSWglib2.gspec
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/CSWglib2.gspec
(rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/CSWglib2.gspec 2009-01-30 21:25:04 UTC
(rev 2947)
@@ -0,0 +1,4 @@
+%var bitname glib2
+%var pkgname CSWglib2
+%include url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Added: csw/mgar/pkg/glib2/trunk/files/CSWglib2devel.gspec
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/CSWglib2devel.gspec
(rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/CSWglib2devel.gspec 2009-01-30 21:25:04 UTC
(rev 2947)
@@ -0,0 +1,4 @@
+%var bitname glib2_devel
+%var pkgname CSWglib2devel
+%include url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Added: csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch
(rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch 2009-01-30 21:25:04 UTC
(rev 2947)
@@ -0,0 +1,99 @@
+diff -rud glib-2.18.4.o/docs/reference/gio/Makefile.in
glib-2.18.4/docs/reference/gio/Makefile.in
+--- glib-2.18.4.o/docs/reference/gio/Makefile.in 2009-01-09
10:42:52.000000000 -0600
++++ glib-2.18.4/docs/reference/gio/Makefile.in 2009-01-30 13:53:08.907638618
-0600
+@@ -739,8 +739,8 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
+ fi
+
+ uninstall-local:
+@@ -769,8 +769,8 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -rud glib-2.18.4.o/docs/reference/glib/Makefile.in
glib-2.18.4/docs/reference/glib/Makefile.in
+--- glib-2.18.4.o/docs/reference/glib/Makefile.in 2009-01-09
10:42:52.000000000 -0600
++++ glib-2.18.4/docs/reference/glib/Makefile.in 2009-01-30
13:52:27.443248125 -0600
+@@ -771,8 +771,8 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
+ fi
+
+ uninstall-local:
+@@ -801,8 +801,8 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+
+diff -rud glib-2.18.4.o/docs/reference/gobject/Makefile.in
glib-2.18.4/docs/reference/gobject/Makefile.in
+--- glib-2.18.4.o/docs/reference/gobject/Makefile.in 2009-01-09
10:42:52.000000000 -0600
++++ glib-2.18.4/docs/reference/gobject/Makefile.in 2009-01-30
13:53:41.314802722 -0600
+@@ -754,8 +754,8 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
+ fi
+
+ uninstall-local:
+@@ -784,8 +784,8 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+
+diff -rud glib-2.18.4.o/gtk-doc.make glib-2.18.4/gtk-doc.make
+--- glib-2.18.4.o/gtk-doc.make 2009-01-09 11:08:20.000000000 -0600
++++ glib-2.18.4/gtk-doc.make 2009-01-30 13:54:08.204190136 -0600
+@@ -157,8 +157,8 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --relative --dest-dir=$(DESTDIR)
--html-dir=$${installdir} ; \
+ fi
+
+ uninstall-local:
+@@ -190,7 +190,7 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ #! which gtkdoc-rebase >/dev/null 2>&1 || \
++ #gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
