Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/glib/files: glib-2.37.x-external-gdbus-codegen.patch glib-2.34.0-testsuite-skip-thread4.patch glib-2.12.12-fbsd.patch glib-2.36.4-znodelete.patch
Date: Mon, 23 Dec 2013 22:38:12
Message-Id: 20131223223807.DA33B2004C@flycatcher.gentoo.org
1 eva 13/12/23 22:38:07
2
3 Modified: glib-2.34.0-testsuite-skip-thread4.patch
4 glib-2.12.12-fbsd.patch glib-2.36.4-znodelete.patch
5 Added: glib-2.37.x-external-gdbus-codegen.patch
6 Log:
7 Version bump for Gnome 3.10. Refresh patches with git headers.
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C6085806)
10
11 Revision Changes Path
12 1.2 dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch?r1=1.1&r2=1.2
17
18 Index: glib-2.34.0-testsuite-skip-thread4.patch
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- glib-2.34.0-testsuite-skip-thread4.patch 25 Sep 2012 11:40:57 -0000 1.1
25 +++ glib-2.34.0-testsuite-skip-thread4.patch 23 Dec 2013 22:38:07 -0000 1.2
26 @@ -1,15 +1,15 @@
27 -From 8a8112aad6dc98aaaf9767b31e48f5ae8fabd858 Mon Sep 17 00:00:00 2001
28 +From 4881b5d303512208b55f5bf78b91cd6a85e5034c Mon Sep 17 00:00:00 2001
29 From: Priit Laes <plaes@×××××.org>
30 Date: Tue, 3 Jul 2012 11:21:56 +0300
31 -Subject: [PATCH] Gentoo: skip over thread/thread4 test failure
32 +Subject: [PATCH 2/4] Gentoo: skip over thread/thread4 test failure
33
34 https://bugzilla.gnome.org/show_bug.cgi?id=679306
35 ---
36 - glib/tests/thread.c | 5 +++++
37 - 1 files changed, 5 insertions(+), 0 deletions(-)
38 + glib/tests/thread.c | 5 +++++
39 + 1 file changed, 5 insertions(+)
40
41 diff --git a/glib/tests/thread.c b/glib/tests/thread.c
42 -index 29b3850..ffe8087 100644
43 +index 539782e..179ec06 100644
44 --- a/glib/tests/thread.c
45 +++ b/glib/tests/thread.c
46 @@ -124,6 +124,8 @@ test_thread3 (void)
47 @@ -21,7 +21,7 @@
48 /* test that thread creation fails as expected,
49 * by setting RLIMIT_NPROC ridiculously low
50 */
51 -@@ -152,6 +154,7 @@ test_thread4 (void)
52 +@@ -158,6 +160,7 @@ test_thread4 (void)
53 g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret));
54 #endif
55 }
56 @@ -29,7 +29,7 @@
57
58 static void
59 test_thread5 (void)
60 -@@ -195,7 +198,9 @@ main (int argc, char *argv[])
61 +@@ -203,7 +206,9 @@ main (int argc, char *argv[])
62 g_test_add_func ("/thread/thread1", test_thread1);
63 g_test_add_func ("/thread/thread2", test_thread2);
64 g_test_add_func ("/thread/thread3", test_thread3);
65 @@ -40,5 +40,5 @@
66 g_test_add_func ("/thread/thread6", test_thread6);
67
68 --
69 -1.7.8.6
70 +1.8.3.2
71
72
73
74
75 1.2 dev-libs/glib/files/glib-2.12.12-fbsd.patch
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.12.12-fbsd.patch?rev=1.2&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.12.12-fbsd.patch?rev=1.2&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.12.12-fbsd.patch?r1=1.1&r2=1.2
80
81 Index: glib-2.12.12-fbsd.patch
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/files/glib-2.12.12-fbsd.patch,v
84 retrieving revision 1.1
85 retrieving revision 1.2
86 diff -u -r1.1 -r1.2
87 --- glib-2.12.12-fbsd.patch 6 Jul 2007 00:31:30 -0000 1.1
88 +++ glib-2.12.12-fbsd.patch 23 Dec 2013 22:38:07 -0000 1.2
89 @@ -1,7 +1,18 @@
90 -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
91 ---- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400
92 -+++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400
93 -@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
94 +From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001
95 +From: Daniel Gryniewicz <dang@g.o>
96 +Date: Sun, 24 Nov 2013 19:46:13 +0100
97 +Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD
98 +
99 +Gentoo bug #184301, Gnome bug #107626.
100 +---
101 + gmodule/gmodule-dl.c | 4 ++++
102 + 1 file changed, 4 insertions(+)
103 +
104 +diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
105 +index a606f17..57fc41b 100644
106 +--- a/gmodule/gmodule-dl.c
107 ++++ b/gmodule/gmodule-dl.c
108 +@@ -107,6 +107,7 @@ _g_module_open (const gchar *file_name,
109 static gpointer
110 _g_module_self (void)
111 {
112 @@ -9,7 +20,7 @@
113 gpointer handle;
114
115 /* to query symbols from the program itself, special link options
116 -@@ -117,6 +118,9 @@ _g_module_self (void)
117 +@@ -122,6 +123,9 @@ _g_module_self (void)
118 g_module_set_error (fetch_dlerror (TRUE));
119
120 return handle;
121 @@ -19,3 +30,6 @@
122 }
123
124 static void
125 +--
126 +1.8.3.2
127 +
128
129
130
131 1.2 dev-libs/glib/files/glib-2.36.4-znodelete.patch
132
133 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.36.4-znodelete.patch?rev=1.2&view=markup
134 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.36.4-znodelete.patch?rev=1.2&content-type=text/plain
135 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.36.4-znodelete.patch?r1=1.1&r2=1.2
136
137 Index: glib-2.36.4-znodelete.patch
138 ===================================================================
139 RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/files/glib-2.36.4-znodelete.patch,v
140 retrieving revision 1.1
141 retrieving revision 1.2
142 diff -u -r1.1 -r1.2
143 --- glib-2.36.4-znodelete.patch 2 Sep 2013 18:29:07 -0000 1.1
144 +++ glib-2.36.4-znodelete.patch 23 Dec 2013 22:38:07 -0000 1.2
145 @@ -1,7 +1,7 @@
146 -From 242de638a030e1fb3b467af182d985d7c3bbf185 Mon Sep 17 00:00:00 2001
147 +From 196ea5ab614e5357da48acf73a373f103e61ee0b Mon Sep 17 00:00:00 2001
148 From: Alexandre Rostovtsev <tetromino@g.o>
149 Date: Mon, 2 Sep 2013 13:59:18 -0400
150 -Subject: [PATCH] gobject: try to link with -Wl,-z,nodelete
151 +Subject: [PATCH 4/4] gobject: try to link with -Wl,-z,nodelete
152
153 Since the type system does not support reloading its data and assumes
154 that libgobject remains loaded for the lifetime of the process, we
155 @@ -14,10 +14,10 @@
156 2 files changed, 25 insertions(+)
157
158 diff --git a/configure.ac b/configure.ac
159 -index 0a63601..dd1045a 100644
160 +index 907c534..266c45d 100644
161 --- a/configure.ac
162 +++ b/configure.ac
163 -@@ -3668,6 +3668,30 @@ fi
164 +@@ -3669,6 +3669,30 @@ fi
165 AC_SUBST(GLIB_LINK_FLAGS)
166
167 dnl
168
169
170
171 1.1 dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch
172
173 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch?rev=1.1&view=markup
174 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch?rev=1.1&content-type=text/plain
175
176 Index: glib-2.37.x-external-gdbus-codegen.patch
177 ===================================================================
178 From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001
179 From: Priit Laes <plaes@×××××.org>
180 Date: Thu, 28 Feb 2013 08:28:01 +0200
181 Subject: [PATCH 3/4] Split out gdbus codegen
182
183 ---
184 configure.ac | 17 ++++++++---------
185 docs/reference/gio/Makefile.am | 3 +--
186 gio/Makefile.am | 2 +-
187 gio/tests/Makefile.am | 6 ++----
188 gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++----
189 5 files changed, 14 insertions(+), 20 deletions(-)
190
191 diff --git a/configure.ac b/configure.ac
192 index 797cb92..907c534 100644
193 --- a/configure.ac
194 +++ b/configure.ac
195 @@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH)
196 # option to specify python interpreter to use; this just sets $PYTHON, so that
197 # we will fallback to reading $PYTHON if --with-python is not given, and
198 # python.m4 will get the expected input
199 -AC_ARG_WITH(python,
200 - AS_HELP_STRING([--with-python=PATH],
201 - [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
202 - [PYTHON="$withval"], [])
203 -if test x"$PYTHON" = xyes; then
204 - AC_MSG_ERROR([--with-python option requires a path or program argument])
205 -fi
206 -AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
207 +# AC_ARG_WITH(python,
208 +# AS_HELP_STRING([--with-python=PATH],
209 +# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]),
210 +# [PYTHON="$withval"], [])
211 +# if test x"$PYTHON" = xyes; then
212 +# AC_MSG_ERROR([--with-python option requires a path or program argument])
213 +# fi
214 +# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5")
215
216
217 dnl ***********************
218 @@ -3784,7 +3784,6 @@ gobject/glib-mkenums
219 gobject/tests/Makefile
220 gthread/Makefile
221 gio/Makefile
222 -gio/gdbus-2.0/codegen/Makefile
223 gio/gdbus-2.0/codegen/config.py
224 gio/gnetworking.h
225 gio/xdgmime/Makefile
226 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
227 index 112626b..8ddcdbc 100644
228 --- a/docs/reference/gio/Makefile.am
229 +++ b/docs/reference/gio/Makefile.am
230 @@ -151,8 +151,7 @@ man_MANS += \
231 glib-compile-resources.1 \
232 gsettings.1 \
233 gresource.1 \
234 - gdbus.1 \
235 - gdbus-codegen.1
236 + gdbus.1
237
238 XSLTPROC_FLAGS = \
239 --nonet \
240 diff --git a/gio/Makefile.am b/gio/Makefile.am
241 index 717419f..808b5dd 100644
242 --- a/gio/Makefile.am
243 +++ b/gio/Makefile.am
244 @@ -1,6 +1,6 @@
245 include $(top_srcdir)/glib.mk
246
247 -SUBDIRS = gdbus-2.0/codegen
248 +SUBDIRS =
249
250 if OS_UNIX
251 SUBDIRS += xdgmime
252 diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
253 index 7224124..5c8baaa 100644
254 --- a/gio/tests/Makefile.am
255 +++ b/gio/tests/Makefile.am
256 @@ -359,10 +359,8 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
257 nodist_gdbus_test_codegen_SOURCES = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
258
259 gdbus-test-codegen.o: gdbus-test-codegen-generated.h
260 -gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
261 - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
262 - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
263 - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
264 +gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile
265 + $(AM_V_GEN) gdbus-codegen \
266 --interface-prefix org.project. \
267 --generate-c-code gdbus-test-codegen-generated \
268 --c-generate-object-manager \
269 diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
270 index d6d1412..62ef706 100644
271 --- a/gio/tests/gdbus-object-manager-example/Makefile.am
272 +++ b/gio/tests/gdbus-object-manager-example/Makefile.am
273 @@ -11,10 +11,8 @@ GDBUS_GENERATED = \
274 gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
275 $(NULL)
276
277 -$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
278 - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
279 - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
280 - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
281 +$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
282 + $(AM_V_GEN) gdbus-codegen \
283 --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
284 --c-namespace Example \
285 --c-generate-object-manager \
286 --
287 1.8.3.2
Report Message
Find on MARC Find on Google Groups