Fri Feb 19 19:46:53 2010 UTC ()
Reference upstream bug reports.


(roy)
diff -r1.3 -r1.4 pkgsrc/devel/glib2/patches/patch-am
diff -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-an
cvs diff -r1.3 -r1.4 pkgsrc/devel/glib2/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-am 2010/02/19 11:44:56 1.3
+++ pkgsrc/devel/glib2/patches/Attic/patch-am 2010/02/19 19:46:53 1.4
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1$NetBSD: patch-am,v 1.3 2010/02/19 11:44:56 roy Exp $ 1$NetBSD: patch-am,v 1.4 2010/02/19 19:46:53 roy Exp $
2 2
3We should only check the module itself for g_module_check_init and 3We should only check the module itself for g_module_check_init and
4g_module_unload functions. 4g_module_unload functions.
5 5
6This also makes loading a module a lot faster if these functions do 6This also makes loading a module a lot faster if these functions do
7not exist and the module as a lot of dependencies. 7not exist and the module as a lot of dependencies.
8 8
 9Upstream URL
 10https://bugzilla.gnome.org/show_bug.cgi?id=610489
 11
9--- gmodule/gmodule.c 2010-02-18 19:59:34.000000000 +0000 12--- gmodule/gmodule.c 2010-02-18 19:59:34.000000000 +0000
10+++ gmodule/gmodule.c 2010-02-18 20:18:06.000000000 +0000 13+++ gmodule/gmodule.c 2010-02-18 20:18:06.000000000 +0000
11@@ -474,25 +474,33 @@ 14@@ -474,25 +474,33 @@
12 module->cp_file_name = g_locale_from_utf8 (file_name, -1, 15 module->cp_file_name = g_locale_from_utf8 (file_name, -1,
13 NULL, NULL, NULL); 16 NULL, NULL, NULL);
14 #endif 17 #endif
15- module->handle = handle; 18- module->handle = handle;
16+ /* we set RTLD_NEXT so we only load private functions from 19+ /* we set RTLD_NEXT so we only load private functions from
17+ * the module and not any dependencies */ 20+ * the module and not any dependencies */
18+ module->handle = RTLD_NEXT; 21+ module->handle = RTLD_NEXT;
19 module->ref_count = 1; 22 module->ref_count = 1;
20 module->is_resident = FALSE; 23 module->is_resident = FALSE;
21 module->unload = NULL; 24 module->unload = NULL;
cvs diff -r1.1 -r1.2 pkgsrc/devel/glib2/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-an 2010/02/19 11:44:56 1.1
+++ pkgsrc/devel/glib2/patches/Attic/patch-an 2010/02/19 19:46:53 1.2
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1$NetBSD: patch-an,v 1.1 2010/02/19 11:44:56 roy Exp $ 1$NetBSD: patch-an,v 1.2 2010/02/19 19:46:53 roy Exp $
2 2
3Use RTLD_DEFAULT if the platform defines it. 3Use RTLD_DEFAULT if the platform defines it.
4 4
 5Upstream URL
 6https://bugzilla.gnome.org/show_bug.cgi?id=610490
 7
5--- gmodule/gmodule-dl.c 2009-04-01 00:04:20.000000000 +0100 8--- gmodule/gmodule-dl.c 2009-04-01 00:04:20.000000000 +0100
6+++ gmodule/gmodule-dl.c 2010-02-19 07:13:26.000000000 +0000 9+++ gmodule/gmodule-dl.c 2010-02-19 07:13:26.000000000 +0000
7@@ -107,6 +107,9 @@ 10@@ -107,6 +107,9 @@
8 static gpointer 11 static gpointer
9 _g_module_self (void) 12 _g_module_self (void)
10 { 13 {
11+#ifdef RTLD_DEFAULT 14+#ifdef RTLD_DEFAULT
12+ return RTLD_DEFAULT; 15+ return RTLD_DEFAULT;
13+#else 16+#else
14 gpointer handle; 17 gpointer handle;
15  18
16 /* to query symbols from the program itself, special link options 19 /* to query symbols from the program itself, special link options
17@@ -118,6 +121,7 @@ 20@@ -118,6 +121,7 @@