[csw-devel] SF.net SVN: gar:[14777] csw/mgar/pkg/glib2/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Jun 10 14:19:35 CEST 2011
Revision: 14777
http://gar.svn.sourceforge.net/gar/?rev=14777&view=rev
Author: dmichelsen
Date: 2011-06-10 12:19:34 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
glib2: Update to 2.29.6, tests still failing
Modified Paths:
--------------
csw/mgar/pkg/glib2/trunk/Makefile
csw/mgar/pkg/glib2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch
Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile 2011-06-10 10:41:01 UTC (rev 14776)
+++ csw/mgar/pkg/glib2/trunk/Makefile 2011-06-10 12:19:34 UTC (rev 14777)
@@ -1,5 +1,5 @@
NAME = glib
-VERSION = 2.25.10
+VERSION = 2.29.6
CATEGORIES = lib
DESCRIPTION = The GLib library of C routines.
@@ -9,21 +9,15 @@
has been split off as of the developers' version 1.1.0.
endef
-PACKAGES = CSWglib2 CSWglib2devel
-CATALOGNAME_CSWglib2 = glib2
-CATALOGNAME_CSWglib2devel = glib2_devel
-SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME
-SPKG_DESC_CSWglib2devel = Low level core compatibility library for GTK+ and GNOME development
-
MASTER_SITES = $(GNOME_MIRROR)
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES = glib-typedetect.patch
+#PATCHFILES = glib-typedetect.patch
# PATCHFILES += FIXED_STR.patch
-PATCHFILES += gsize.patch
+#PATCHFILES += gsize.patch
# PATCHFILES += gconverter.patch
-PATCHFILES += CMSG_LEN.patch
+#PATCHFILES += CMSG_LEN.patch
# Bug reported upstream:
# https://bugzilla.gnome.org/show_bug.cgi?id=612300
@@ -32,38 +26,50 @@
PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch
PATCHFILES += 0001-Replace-.-not-understood-by-Sun-Studio.patch
+# Use patch unless this is fixed:
+# https://bugzilla.gnome.org/show_bug.cgi?id=652272
+PATCHFILES += 0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch
+
+PACKAGES += CSWglib2
+SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME
+RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv
+RUNTIME_DEP_PKGS_CSWglib2 += CSWzlib
+# No package split yet
+CHECKPKG_OVERRIDES_CSWglib2 += non-uniform-lib-versions-in-package
+
+PACKAGES += CSWglib2-dev
+SPKG_DESC_CSWglib2-dev = Low level core compatibility library for GTK+ and GNOME development
+RUNTIME_DEP_PKGS_CSWglib2-dev += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWglib2-dev += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWglib2-dev += CSWgamin
+RUNTIME_DEP_PKGS_CSWglib2-dev += CSWglib2
+RUNTIME_DEP_PKGS_CSWglib2-dev += CSWiconv
+RUNTIME_DEP_PKGS_CSWglib2-dev += CSWpython
+RUNTIME_DEP_PKGS_CSWglib2-dev += CSWzlib
+OBSOLETED_BY_CSWglib2-dev = CSWglib2devel
+CATALOGNAME_CSWglib2devel = glib2_devel_stub
+
# We don't need it and if defined the test breaks
LD_OPTIONS =
EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+EXTRA_CFLAGS = -features=extensions
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-libiconv=gnu
CONFIGURE_ARGS += --enable-static
# DTrace compilation fails for 64 bit, disable for now
-CONFIGURE_ARGS += --disable-dtrace
+#CONFIGURE_ARGS += --disable-dtrace
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
BUILD64 = 1
-NOISAEXEC = 1
BUILD_DEP_PKGS = CSWggettext
-RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv
-RUNTIME_DEP_PKGS_CSWglib2 += CSWzlib
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWgamin
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWglib2
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWiconv
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWperl
-
# Some tests fail, they may be harmless, disable for now, but check later!
-SKIPTEST ?= 1
-TEST_TARGET = check
+# SKIPTEST ?= 1
#provided by iconv
MERGE_EXCLUDE_FILES = .*/charset.alias
Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums 2011-06-10 10:41:01 UTC (rev 14776)
+++ csw/mgar/pkg/glib2/trunk/checksums 2011-06-10 12:19:34 UTC (rev 14777)
@@ -1,7 +1 @@
-39b575a4c1dd2234a88d755a13332458 0001-Make-sure-we-have-the-include-for-major-minor.patch
-77188ce430577f5db01ba9d73aed5bcd 0001-Replace-.-not-understood-by-Sun-Studio.patch
-9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch
-f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch
-cdbe09f15536b526e19f06893e9b64ef glib-2.25.10.tar.bz2
-8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch
-bb2fb8eef43c995fea6c08563487ace6 gsize.patch
+178638858de315a472d45dfa3dd19299 glib-2.29.6.tar.bz2
Added: csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0003-Do-not-unconditionally-use-gcc-specific-Wstrict-alia.patch 2011-06-10 12:19:34 UTC (rev 14777)
@@ -0,0 +1,39 @@
+From bb52d09f8b2ad163779b4610dd94d6c48ce95544 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 10 Jun 2011 12:27:34 +0200
+Subject: [PATCH] Do not unconditionally use gcc-specific -Wstrict-aliasing
+
+---
+ glib/tests/Makefile.am | 2 +-
+ glib/tests/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
+index 513e3cf..fc1c1dc 100644
+--- a/glib/tests/Makefile.am
++++ b/glib/tests/Makefile.am
+@@ -182,7 +182,7 @@ unix_nothreads_SOURCES = unix.c
+ unix_nothreads_LDADD = $(progs_ldadd)
+
+ noinst_PROGRAMS += atomic
+-atomic_CFLAGS = -Wstrict-aliasing=2 $(INCLUDES)
++atomic_CFLAGS = $(INCLUDES)
+ atomic_LDADD = $(progs_ldadd)
+
+ TEST_PROGS += bitlock
+diff --git a/glib/tests/Makefile.in b/glib/tests/Makefile.in
+index 70d437f..2ee851a 100644
+--- a/glib/tests/Makefile.in
++++ b/glib/tests/Makefile.in
+@@ -633,7 +633,7 @@ sort_LDADD = $(progs_ldadd)
+ @OS_UNIX_TRUE at unix_LDADD = $(progs_ldadd)
+ @OS_UNIX_TRUE at unix_nothreads_SOURCES = unix.c
+ @OS_UNIX_TRUE at unix_nothreads_LDADD = $(progs_ldadd)
+- at OS_UNIX_TRUE@atomic_CFLAGS = -Wstrict-aliasing=2 $(INCLUDES)
++ at OS_UNIX_TRUE@atomic_CFLAGS = $(INCLUDES)
+ @OS_UNIX_TRUE at atomic_LDADD = $(progs_ldadd)
+ @OS_UNIX_TRUE at bitlock_LDADD = $(progs_ldadd)
+
+--
+1.7.5.4
+
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