[csw-devel] SF.net SVN: gar:[4097] csw/mgar/pkg/glib2/trunk

harpchad at users.sourceforge.net harpchad at users.sourceforge.net
Tue Mar 31 03:38:28 CEST 2009


Revision: 4097
          http://gar.svn.sourceforge.net/gar/?rev=4097&view=rev
Author:   harpchad
Date:     2009-03-31 01:38:28 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
Bump to 2.20

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

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/gsize.patch

Removed Paths:
-------------
    csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2009-03-30 21:22:37 UTC (rev 4096)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2009-03-31 01:38:28 UTC (rev 4097)
@@ -1,5 +1,5 @@
 GARNAME = glib
-GARVERSION = 2.18.4
+GARVERSION = 2.20.0
 CATEGORIES = lib
 
 DESCRIPTION = The GLib library of C routines.
@@ -19,16 +19,13 @@
 
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
-#See gnome bug 569889
-PATCHFILES = gtkdoc-rebase.patch
-#See http://defect.opensolaris.org/bz/show_bug.cgi?id=3366 for discussion on:
-PATCHFILES += glib-typedetect.patch
+PATCHFILES  = glib-typedetect.patch
 PATCHFILES += checksum-test.patch
+PATCHFILES += gsize.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu
 CONFIGURE_ARGS += --enable-static
-CONFIGURE_ARGS += --disable-gtk-doc
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
@@ -38,7 +35,7 @@
 REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv CSWsunmath
 REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv
 
-TEST_TARGET =
+TEST_TARGET = check
 
 #provided by iconv
 MERGE_EXCLUDE_FILES = .*/charset.alias

Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums	2009-03-30 21:22:37 UTC (rev 4096)
+++ csw/mgar/pkg/glib2/trunk/checksums	2009-03-31 01:38:28 UTC (rev 4097)
@@ -1,4 +1,4 @@
-ec25ed261534d870141000ab73f1a2bf  download/glib-2.18.4.tar.bz2
+05188e560dbd8bddd568e24ce10dd003  download/glib-2.20.0.tar.bz2
 8f683820d9ecab1abd9dbe81997ab9eb  download/glib-typedetect.patch
-fb144356d0918eff4ef17a2a285860bc  download/gtkdoc-rebase.patch
 f1f3c182f64be06ab57d8b01016af074  download/checksum-test.patch
+bb2fb8eef43c995fea6c08563487ace6  download/gsize.patch

Added: csw/mgar/pkg/glib2/trunk/files/gsize.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/gsize.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/gsize.patch	2009-03-31 01:38:28 UTC (rev 4097)
@@ -0,0 +1,27 @@
+--- glib-2.20.0/configure.in.o	2009-03-30 15:38:19.204628321 -0500
++++ glib-2.20.0/configure.in	2009-03-30 15:39:07.658123519 -0500
+@@ -2758,11 +2758,19 @@
+ _______EOF
+ 
+         cat >>$outfile <<_______EOF
+-typedef signed $glib_size_type_define gssize;
+-typedef unsigned $glib_size_type_define gsize;
+-#define G_GSIZE_MODIFIER $gsize_modifier
+-#define G_GSSIZE_FORMAT $gssize_format
+-#define G_GSIZE_FORMAT $gsize_format
++#if (defined (__amd64) || defined(__sparcv9))
++typedef signed long gssize;
++typedef unsigned long gsize;
++#define G_GSIZE_MODIFIER "l"
++#define G_GSSIZE_FORMAT "li"
++#define G_GSIZE_FORMAT "lu"
++#else
++typedef signed int gssize;
++typedef unsigned int gsize;
++#define G_GSIZE_MODIFIER ""
++#define G_GSSIZE_FORMAT "i"
++#define G_GSIZE_FORMAT "u"
++#endif 
+ 
+ #define G_MAXSIZE	G_MAXU$glib_msize_type
+ #define G_MINSSIZE	G_MIN$glib_msize_type

Deleted: csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch	2009-03-30 21:22:37 UTC (rev 4096)
+++ csw/mgar/pkg/glib2/trunk/files/gtkdoc-rebase.patch	2009-03-31 01:38:28 UTC (rev 4097)
@@ -1,99 +0,0 @@
-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.



More information about the devel mailing list