1 |
commit: 3ac8f4cc84f91a0e13c382c6b7f8f866709d0376 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 30 18:12:53 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Aug 30 18:12:53 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3ac8f4cc |
7 |
|
8 |
dev-libs/glib: 2.29.16-r1 → 2.29.18 |
9 |
|
10 |
Version bump, now with a new wallclock API. |
11 |
|
12 |
--- |
13 |
...h => glib-2.29.18-external-gdbus-codegen.patch} | 50 +++++++++++--------- |
14 |
...{glib-2.29.16-r1.ebuild => glib-2.29.18.ebuild} | 4 +- |
15 |
dev-libs/glib/glib-9999.ebuild | 4 +- |
16 |
3 files changed, 31 insertions(+), 27 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch |
19 |
similarity index 61% |
20 |
rename from dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch |
21 |
rename to dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch |
22 |
index 6f38bf8..abec0dd 100644 |
23 |
--- a/dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch |
24 |
+++ b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch |
25 |
@@ -1,4 +1,4 @@ |
26 |
-From 995d2ce4854fd95079f87ba20307c092398cfca3 Mon Sep 17 00:00:00 2001 |
27 |
+From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001 |
28 |
From: Alexandre Rostovtsev <tetromino@×××××.com> |
29 |
Date: Wed, 24 Aug 2011 21:35:59 -0400 |
30 |
Subject: [PATCH] Use an external gdbus-codegen package |
31 |
@@ -7,12 +7,12 @@ Subject: [PATCH] Use an external gdbus-codegen package |
32 |
configure.ac | 4 +--- |
33 |
docs/reference/gio/Makefile.am | 3 +-- |
34 |
gio/Makefile.am | 2 +- |
35 |
- gio/tests/Makefile.am | 2 +- |
36 |
- gio/tests/gdbus-object-manager-example/Makefile.am | 2 +- |
37 |
- 5 files changed, 5 insertions(+), 8 deletions(-) |
38 |
+ gio/tests/Makefile.am | 4 +--- |
39 |
+ gio/tests/gdbus-object-manager-example/Makefile.am | 4 +--- |
40 |
+ 5 files changed, 5 insertions(+), 12 deletions(-) |
41 |
|
42 |
diff --git a/configure.ac b/configure.ac |
43 |
-index 5ef55ce..3f16710 100644 |
44 |
+index dc23b8b..0bb0c4a 100644 |
45 |
--- a/configure.ac |
46 |
+++ b/configure.ac |
47 |
@@ -365,7 +365,7 @@ fi |
48 |
@@ -24,12 +24,12 @@ index 5ef55ce..3f16710 100644 |
49 |
|
50 |
|
51 |
dnl *********************** |
52 |
-@@ -3841,8 +3841,6 @@ gobject/tests/Makefile |
53 |
+@@ -3858,8 +3858,6 @@ gobject/tests/Makefile |
54 |
gthread/Makefile |
55 |
gthread/tests/Makefile |
56 |
gio/Makefile |
57 |
--gio/gdbus-codegen/Makefile |
58 |
--gio/gdbus-codegen/config.py |
59 |
+-gio/gdbus-2.0/codegen/Makefile |
60 |
+-gio/gdbus-2.0/codegen/config.py |
61 |
gio/xdgmime/Makefile |
62 |
gio/inotify/Makefile |
63 |
gio/libasyncns/Makefile |
64 |
@@ -48,44 +48,48 @@ index 9eb0fce..511aec9 100644 |
65 |
if ENABLE_MAN |
66 |
|
67 |
diff --git a/gio/Makefile.am b/gio/Makefile.am |
68 |
-index 0a127a6..d4a08e5 100644 |
69 |
+index 7803bb2..d4a08e5 100644 |
70 |
--- a/gio/Makefile.am |
71 |
+++ b/gio/Makefile.am |
72 |
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl |
73 |
|
74 |
NULL = |
75 |
|
76 |
--SUBDIRS = gdbus-codegen |
77 |
+-SUBDIRS = gdbus-2.0/codegen |
78 |
+SUBDIRS = |
79 |
|
80 |
if OS_UNIX |
81 |
SUBDIRS += libasyncns xdgmime |
82 |
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
83 |
-index 45cbe37..5370aa1 100644 |
84 |
+index a85ea4f..8fbe8ec 100644 |
85 |
--- a/gio/tests/Makefile.am |
86 |
+++ b/gio/tests/Makefile.am |
87 |
-@@ -260,7 +260,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd) |
88 |
+@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd) |
89 |
|
90 |
if OS_UNIX |
91 |
gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml |
92 |
-- $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \ |
93 |
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
94 |
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
95 |
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
96 |
+ $(AM_V_GEN) gdbus-codegen \ |
97 |
- --interface-prefix org.project. \ |
98 |
- --generate-c-code gdbus-test-codegen-generated \ |
99 |
- --c-generate-object-manager \ |
100 |
+ --interface-prefix org.project. \ |
101 |
+ --generate-c-code gdbus-test-codegen-generated \ |
102 |
+ --c-generate-object-manager \ |
103 |
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
104 |
-index 3ca56c6..52e7f3d 100644 |
105 |
+index 5e6eb9a..8b16926 100644 |
106 |
--- a/gio/tests/gdbus-object-manager-example/Makefile.am |
107 |
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
108 |
-@@ -22,7 +22,7 @@ GDBUS_GENERATED = \ |
109 |
+@@ -22,9 +22,7 @@ GDBUS_GENERATED = \ |
110 |
$(NULL) |
111 |
|
112 |
$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml |
113 |
-- $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \ |
114 |
+- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
115 |
+- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
116 |
+- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
117 |
+ $(AM_V_GEN) gdbus-codegen \ |
118 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
119 |
- --c-namespace Example \ |
120 |
- --c-generate-object-manager \ |
121 |
+ --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
122 |
+ --c-namespace Example \ |
123 |
+ --c-generate-object-manager \ |
124 |
-- |
125 |
-1.7.6 |
126 |
+1.7.6.1 |
127 |
|
128 |
|
129 |
diff --git a/dev-libs/glib/glib-2.29.16-r1.ebuild b/dev-libs/glib/glib-2.29.18.ebuild |
130 |
similarity index 98% |
131 |
rename from dev-libs/glib/glib-2.29.16-r1.ebuild |
132 |
rename to dev-libs/glib/glib-2.29.18.ebuild |
133 |
index f439e87..d9a1261 100644 |
134 |
--- a/dev-libs/glib/glib-2.29.16-r1.ebuild |
135 |
+++ b/dev-libs/glib/glib-2.29.18.ebuild |
136 |
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND} |
137 |
~app-text/docbook-xml-dtd-4.1.2 ) |
138 |
systemtap? ( >=dev-util/systemtap-1.3 ) |
139 |
test? ( |
140 |
- dev-util/gdbus-codegen |
141 |
+ >=dev-util/gdbus-codegen-2.29.18 |
142 |
>=sys-apps/dbus-1.2.14 ) |
143 |
!<dev-util/gtk-doc-1.15-r2" |
144 |
PDEPEND="introspection? ( dev-libs/gobject-introspection ) |
145 |
@@ -88,7 +88,7 @@ src_prepare() { |
146 |
fi |
147 |
|
148 |
# gdbus-codegen is a separate package |
149 |
- epatch "${FILESDIR}/${PN}-2.29.16-external-gdbus-codegen.patch" |
150 |
+ epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch" |
151 |
|
152 |
# disable pyc compiling |
153 |
ln -sfn $(type -P true) py-compile |
154 |
|
155 |
diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild |
156 |
index f439e87..d9a1261 100644 |
157 |
--- a/dev-libs/glib/glib-9999.ebuild |
158 |
+++ b/dev-libs/glib/glib-9999.ebuild |
159 |
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND} |
160 |
~app-text/docbook-xml-dtd-4.1.2 ) |
161 |
systemtap? ( >=dev-util/systemtap-1.3 ) |
162 |
test? ( |
163 |
- dev-util/gdbus-codegen |
164 |
+ >=dev-util/gdbus-codegen-2.29.18 |
165 |
>=sys-apps/dbus-1.2.14 ) |
166 |
!<dev-util/gtk-doc-1.15-r2" |
167 |
PDEPEND="introspection? ( dev-libs/gobject-introspection ) |
168 |
@@ -88,7 +88,7 @@ src_prepare() { |
169 |
fi |
170 |
|
171 |
# gdbus-codegen is a separate package |
172 |
- epatch "${FILESDIR}/${PN}-2.29.16-external-gdbus-codegen.patch" |
173 |
+ epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch" |
174 |
|
175 |
# disable pyc compiling |
176 |
ln -sfn $(type -P true) py-compile |