[csw-devel] SF.net SVN: gar:[7926] csw/mgar/pkg/glib2/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sat Jan 9 16:03:59 CET 2010
Revision: 7926
http://gar.svn.sourceforge.net/gar/?rev=7926&view=rev
Author: wahwah
Date: 2010-01-09 15:03:58 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
glib2: Version bump to 2.23.1, unfortunately at least one test fails
Modified Paths:
--------------
csw/mgar/pkg/glib2/trunk/Makefile
csw/mgar/pkg/glib2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch
csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch
csw/mgar/pkg/glib2/trunk/files/gconverter.patch
Removed Paths:
-------------
csw/mgar/pkg/glib2/trunk/files/checksum-test.patch
Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile 2010-01-09 14:02:03 UTC (rev 7925)
+++ csw/mgar/pkg/glib2/trunk/Makefile 2010-01-09 15:03:58 UTC (rev 7926)
@@ -1,5 +1,5 @@
GARNAME = glib
-GARVERSION = 2.20.0
+GARVERSION = 2.23.1
CATEGORIES = lib
DESCRIPTION = The GLib library of C routines.
@@ -20,8 +20,10 @@
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
PATCHFILES = glib-typedetect.patch
-PATCHFILES += checksum-test.patch
+PATCHFILES += FIXED_STR.patch
PATCHFILES += gsize.patch
+PATCHFILES += gconverter.patch
+PATCHFILES += CMSG_LEN.patch
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-libiconv=gnu
@@ -32,10 +34,18 @@
BUILD64 = 1
NO_ISAEXEC = 1
-REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv
-REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv
+REQUIRED_PKGS_CSWglib2 += CSWggettextrt
+REQUIRED_PKGS_CSWglib2 += CSWiconv
+REQUIRED_PKGS_CSWglib2 += CSWzlib
+REQUIRED_PKGS_CSWglib2devel += CSWfam
+REQUIRED_PKGS_CSWglib2devel += CSWggettextrt
+REQUIRED_PKGS_CSWglib2devel += CSWglib2
+REQUIRED_PKGS_CSWglib2devel += CSWiconv
+REQUIRED_PKGS_CSWglib2devel += CSWpython
+REQUIRED_PKGS_CSWglib2devel += CSWzlib
TEST_TARGET = check
+SKIPTEST ?= 0
#provided by iconv
MERGE_EXCLUDE_FILES = .*/charset.alias
@@ -43,4 +53,6 @@
PKGFILES_CSWglib2 = $(PKGFILES_RT)
PKGFILES_CSWglib2 += /opt/csw/share/locale/.*
+EXTRA_LDFLAGS = -lsocket
+
include gar/category.mk
Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums 2010-01-09 14:02:03 UTC (rev 7925)
+++ csw/mgar/pkg/glib2/trunk/checksums 2010-01-09 15:03:58 UTC (rev 7926)
@@ -1,4 +1,6 @@
-05188e560dbd8bddd568e24ce10dd003 download/glib-2.20.0.tar.bz2
-8f683820d9ecab1abd9dbe81997ab9eb download/glib-typedetect.patch
-f1f3c182f64be06ab57d8b01016af074 download/checksum-test.patch
-bb2fb8eef43c995fea6c08563487ace6 download/gsize.patch
+9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch
+f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch
+ed4a6616a70705b56babe709787431d4 gconverter.patch
+fb637f6122690254097d0b6d470f6ed3 glib-2.23.1.tar.bz2
+8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch
+bb2fb8eef43c995fea6c08563487ace6 gsize.patch
Added: csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch 2010-01-09 15:03:58 UTC (rev 7926)
@@ -0,0 +1,25 @@
+--- glib-2.23.1/gio/gio.h.orig 2010-01-09 15:33:51.097448405 +0100
++++ glib-2.23.1/gio/gio.h 2010-01-09 15:34:37.201482946 +0100
+@@ -97,6 +97,22 @@
+ #include <gio/gzlibcompressor.h>
+ #include <gio/gzlibdecompressor.h>
+
++#ifndef CMSG_ALIGN
++# ifdef __sun__
++# define CMSG_ALIGN _CMSG_DATA_ALIGN
++# else
++# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1))
++# endif
++#endif
++
++#ifndef CMSG_SPACE
++# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len))
++#endif
++
++#ifndef CMSG_LEN
++# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len))
++#endif
++
+ #undef __GIO_GIO_H_INSIDE__
+
+ #endif /* __G_IO_H__ */
Copied: csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch (from rev 7923, csw/mgar/pkg/glib2/trunk/files/checksum-test.patch)
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch 2010-01-09 15:03:58 UTC (rev 7926)
@@ -0,0 +1,11 @@
+--- glib-2.18.4/tests/checksum-test.c.o 2009-02-04 19:53:27.782844898 -0600
++++ glib-2.18.4/tests/checksum-test.c 2009-02-04 21:22:05.475677071 -0600
+@@ -18,7 +18,7 @@
+ * string is intentionally more than twice that length.
+ */
+
+-#define FIXED_STR "The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"
++const char FIXED_STR[] = {"The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"};
+ #define FIXED_LEN (strlen (FIXED_STR))
+
+ const char *MD5_sums[] = {
Deleted: csw/mgar/pkg/glib2/trunk/files/checksum-test.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/checksum-test.patch 2010-01-09 14:02:03 UTC (rev 7925)
+++ csw/mgar/pkg/glib2/trunk/files/checksum-test.patch 2010-01-09 15:03:58 UTC (rev 7926)
@@ -1,11 +0,0 @@
---- glib-2.18.4/tests/checksum-test.c.o 2009-02-04 19:53:27.782844898 -0600
-+++ glib-2.18.4/tests/checksum-test.c 2009-02-04 21:22:05.475677071 -0600
-@@ -18,7 +18,7 @@
- * string is intentionally more than twice that length.
- */
-
--#define FIXED_STR "The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"
-+const char FIXED_STR[] = {"The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"};
- #define FIXED_LEN (strlen (FIXED_STR))
-
- const char *MD5_sums[] = {
Added: csw/mgar/pkg/glib2/trunk/files/gconverter.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/gconverter.patch (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/gconverter.patch 2010-01-09 15:03:58 UTC (rev 7926)
@@ -0,0 +1,11 @@
+--- glib-2.23.1/gio/gconverter.c.orig 2010-01-09 14:52:05.980181068 +0100
++++ glib-2.23.1/gio/gconverter.c 2010-01-09 14:52:36.590266103 +0100
+@@ -227,7 +227,7 @@
+
+ iface = G_CONVERTER_GET_IFACE (converter);
+
+- return (* iface->reset) (converter);
++ /* return (* iface->reset) (converter); */
+ }
+
+ #define __G_CONVERTER_C__
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