[csw-devel] SF.net SVN: gar:[21428] csw/mgar/pkg/glib2/branches/glib2-2-36
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Wed Jul 3 13:40:17 CEST 2013
Revision: 21428
http://gar.svn.sourceforge.net/gar/?rev=21428&view=rev
Author: slowfranklin
Date: 2013-07-03 11:40:15 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
glib2/branches/glib2-2-36: Ensure the OpenCSW XML catalog is used, enable manpage generation which also makes the path fixup unneccessary, some reordering, fix one patch and disable another test
Modified Paths:
--------------
csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile
csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch
Added Paths:
-----------
csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch
Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile
===================================================================
--- csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-03 06:09:28 UTC (rev 21427)
+++ csw/mgar/pkg/glib2/branches/glib2-2-36/Makefile 2013-07-03 11:40:15 UTC (rev 21428)
@@ -26,6 +26,15 @@
DISTFILES += changelog.CSW
DISTFILES += set-ulimit-for-build-test
+BUILD_DEP_PKGS = CSWggettext-dev CSWlibiconv-dev CSWlibffi-dev
+BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus CSWlibgamin-dev CSWgamin
+BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev CSWdskutl
+# To make the tests working
+BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo
+# This is used to adjust paths in documentation
+BUILD_DEP_PKGS += CSWgsed
+BUILD_DEP_PKGS += CSWlibz-dev
+
#
# Build patches
#
@@ -85,6 +94,7 @@
# needs further investigtion, cf http://osdir.com/ml/freedesktop.dbus/2005-10/msg00058.html
PATCHFILES += 0036-Disable-failing-gdbus-external-auth-tests.patch
PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch
+PATCHFILES_5.11 += 0038-Disable-appinfo-launch-test-fails-on-s11x86.patch
PATCHFILES += $(PATCHFILES_$(GAROSREL))
@@ -145,6 +155,8 @@
# Those are ok: hardcoded search paths which have added /opt/csw
CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.3600.3
CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.3600.3
+# libgio uses the mime info for determining the type of files
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo
CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3
CHECKPKG_OVERRIDES_CSWlibgio2-0-0_sparc += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.3600.3
CHECKPKG_OVERRIDES_CSWlibgio2-0-0_i386 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.3600.3
@@ -231,15 +243,6 @@
PKGFILES_CSWglib2-doc = .*/gtk-doc.*
-BUILD_DEP_PKGS = CSWggettext-dev CSWlibiconv-dev CSWlibffi-dev
-BUILD_DEP_PKGS += CSWlibdbus-dev CSWdbus CSWlibgamin-dev CSWgamin
-BUILD_DEP_PKGS += CSWpy-gobject CSWpkgconfig CSWlibpcre-dev CSWdskutl
-# To make the tests working
-BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo
-# This is used to adjust paths in documentation
-BUILD_DEP_PKGS += CSWgsed
-BUILD_DEP_PKGS += CSWlibz-dev
-
# -xO4 is necessary on sparc so that function inlining happens as expected
EXTRA_CFLAGS = -std=gnu99 # -xO4 -features=extensions -xc99 -D_XPG6
EXTRA_LDFLAGS = -lsocket
@@ -260,6 +263,9 @@
CONFIGURE_ARGS += --with-threads=posix
CONFIGURE_ARGS += --disable-compile-warnings
CONFIGURE_ARGS += --disable-maintainer-mode
+CONFIGURE_ARGS += --with-xml-catalog=/etc/opt/csw/xml/catalog
+# ensure Docbook stuff is found for manpages, otherwise let configure fail
+CONFIGURE_ARGS += --enable-man
# we must set the config shell to bash so configure sticks that
# as SHELL variable in the generated Makefiles. That's what make
@@ -282,9 +288,6 @@
# Do we support gdb?
MERGE_EXCLUDE_FILES += .*/gdb .*/gdb/.*
-# libgio uses the mime info for determining the type of files
-CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += surplus-dependency|CSWsharedmimeinfo
-
include gar/category.mk
# We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out
@@ -309,19 +312,20 @@
fi
# This is in place to fix paths that make checkpkg complain
- @echo "=== Fixing paths in documentation ==="
- for d in gio glib gobject ; do \
- DOCBASEDIR="$(PKGROOT)/$(datadir)/gtk-doc/html/$$d/" ; \
- if [ -d "$$DOCBASEDIR" ] ; then \
- for f in $$DOCBASEDIR/*.html ; do \
- echo "Adjusting path in $$f" ; \
- /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \
- mv $$f.tmp $$f ; \
- done ; \
- fi ; \
- done
- for f in $(PKGROOT)$(mandir)/man[123456789]/* ; do \
- echo "Adjusting path in $$f" ; \
- /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \
- mv $$f.tmp $$f ; \
- done ; \
+# @echo "=== Fixing paths in documentation ==="
+# for d in gio glib gobject ; do \
+# DOCBASEDIR="$(PKGROOT)/$(datadir)/gtk-doc/html/$$d/" ; \
+# if [ -d "$$DOCBASEDIR" ] ; then \
+# for f in $$DOCBASEDIR/*.html ; do \
+# echo "Adjusting path in $$f" ; \
+# /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \
+# mv $$f.tmp $$f ; \
+# done ; \
+# fi ; \
+# done
+# for f in $(PKGROOT)$(mandir)/man[123456789]/* ; do \
+# echo "Adjusting path in $$f" ; \
+# /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \
+# mv $$f.tmp $$f ; \
+# done ; \
+#
Modified: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch
===================================================================
--- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch 2013-07-03 06:09:28 UTC (rev 21427)
+++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0021-Disable-buffered-input-stream-set-buffer-size-test.patch 2013-07-03 11:40:15 UTC (rev 21428)
@@ -1,25 +1,24 @@
-From a161b66db29770aec53ab43c0fa3e5c270f2d083 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Sun, 26 Aug 2012 19:21:25 +0200
+From 980885deda881e8c2a4ba9a7e4fc87d4f79d3406 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Wed, 3 Jul 2013 08:17:16 +0200
Subject: [PATCH] Disable buffered-input-stream/set-buffer-size test
---
- gio/tests/buffered-input-stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ gio/tests/buffered-input-stream.c | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/gio/tests/buffered-input-stream.c b/gio/tests/buffered-input-stream.c
-index 8515351..3357fc8 100644
+index ef865fc..99f2856 100644
--- a/gio/tests/buffered-input-stream.c
+++ b/gio/tests/buffered-input-stream.c
-@@ -293,7 +293,7 @@ main (int argc,
+@@ -540,7 +540,6 @@ main (int argc,
g_test_add_func ("/buffered-input-stream/peek", test_peek);
g_test_add_func ("/buffered-input-stream/peek-buffer", test_peek_buffer);
- g_test_add_func ("/buffered-input-stream/set-buffer-size", test_set_buffer_size);
-+/* g_test_add_func ("/buffered-input-stream/set-buffer-size", test_set_buffer_size);*/
g_test_add_func ("/buffered-input-stream/read-byte", test_read_byte);
g_test_add_func ("/buffered-input-stream/read", test_read);
- g_test_add_func ("/buffered-input-stream/skip", test_skip);
+ g_test_add_func ("/buffered-input-stream/read-async", test_read_async);
--
-1.7.11.3
+1.8.3.1
Added: csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch
===================================================================
--- csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch (rev 0)
+++ csw/mgar/pkg/glib2/branches/glib2-2-36/files/0038-Disable-appinfo-launch-test-fails-on-s11x86.patch 2013-07-03 11:40:15 UTC (rev 21428)
@@ -0,0 +1,24 @@
+From 726ffacab6d5e08c36fb53b9bc654485ccaf5023 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Wed, 3 Jul 2013 08:06:57 +0200
+Subject: [PATCH] Disable /appinfo/launch test, fails on s11x86
+
+---
+ gio/tests/appinfo.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gio/tests/appinfo.c b/gio/tests/appinfo.c
+index 6507f4b..212c419 100644
+--- a/gio/tests/appinfo.c
++++ b/gio/tests/appinfo.c
+@@ -432,7 +432,6 @@ main (int argc, char *argv[])
+
+ g_test_add_func ("/appinfo/basic", test_basic);
+ g_test_add_func ("/appinfo/text", test_text);
+- g_test_add_func ("/appinfo/launch", test_launch);
+ g_test_add_func ("/appinfo/show-in", test_show_in);
+ g_test_add_func ("/appinfo/commandline", test_commandline);
+ g_test_add_func ("/appinfo/launch-context", test_launch_context);
+--
+1.8.3.1
+
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