1 |
commit: 890bf2bd501ac2088077d6bf4bbde6bd4a1f482e |
2 |
Author: Dennis Schridde <devurandom <AT> gmx <DOT> net> |
3 |
AuthorDate: Sat Feb 5 20:15:40 2011 +0000 |
4 |
Commit: Dennis Schridde <devurandom <AT> gmx <DOT> net> |
5 |
CommitDate: Sat Feb 5 20:15:40 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=890bf2bd |
7 |
|
8 |
[dev-libs/libdbusmenu] Improve patches based on upstream request, revbump |
9 |
|
10 |
(Portage version: 2.2.0_alpha20/git/Linux x86_64, signed Manifest commit with key 50ED256E) |
11 |
|
12 |
--- |
13 |
.../files/libdbusmenu-0.3.14-optional-dumper.patch | 20 +++++++++++--- |
14 |
.../files/libdbusmenu-0.3.16-optional-gtk.patch | 21 +++++++++++--- |
15 |
.../files/libdbusmenu-0.3.16-optional-tests.patch | 20 +++++++++++--- |
16 |
.../files/libdbusmenu-0.3.16-optional-vala.patch | 25 +++++++++++------ |
17 |
.../files/libdbusmenu-0.3.94-optional-gtk.patch | 27 ++++++++++++++----- |
18 |
...3.16-r1.ebuild => libdbusmenu-0.3.16-r2.ebuild} | 0 |
19 |
...3.94-r1.ebuild => libdbusmenu-0.3.94-r2.ebuild} | 0 |
20 |
7 files changed, 82 insertions(+), 31 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch |
23 |
index 3edc237..3a06262 100644 |
24 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch |
25 |
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch |
26 |
@@ -1,21 +1,31 @@ |
27 |
--- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
28 |
+++ configure.ac 2010-09-20 22:05:38.292979567 +0200 |
29 |
-@@ -63,8 +63,15 @@ |
30 |
+@@ -63,8 +63,17 @@ |
31 |
|
32 |
X11_REQUIRED_VERSION=1.3 |
33 |
|
34 |
+AC_ARG_ENABLE([dumper], |
35 |
+ AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), |
36 |
-+ [enable_dumper=$enableval], enable_dumper=auto) |
37 |
++ [enable_dumper=$enableval], [enable_dumper=auto]) |
38 |
+AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"]) |
39 |
+ |
40 |
-+if test "x$enable_dumper" != "xno" ; then |
41 |
++AS_IF([test "x$enable_dumper" != "xno"],[ |
42 |
PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
43 |
- x11 >= $X11_REQUIRED_VERSION) |
44 |
-+fi |
45 |
+- x11 >= $X11_REQUIRED_VERSION) |
46 |
++ x11 >= $X11_REQUIRED_VERSION, |
47 |
++ [have_dumper=yes] |
48 |
++) |
49 |
++]) |
50 |
|
51 |
AC_SUBST(DBUSMENUDUMPER_CFLAGS) |
52 |
AC_SUBST(DBUSMENUDUMPER_LIBS) |
53 |
+@@ -193,1 +193,6 @@ |
54 |
+ |
55 |
++AS_IF([test "x$have_dumper" = "xyes"], |
56 |
++ AC_MSG_NOTICE([ Dumper: yes]), |
57 |
++ AC_MSG_NOTICE([ Dumper: no]) |
58 |
++) |
59 |
++ |
60 |
--- tools/Makefile.am.orig 2010-09-20 22:02:07.280175897 +0200 |
61 |
+++ tools/Makefile.am 2010-09-20 22:05:15.621664358 +0200 |
62 |
@@ -3,5 +3,9 @@ |
63 |
|
64 |
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch |
65 |
index dd33d4a..844fa14 100644 |
66 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch |
67 |
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch |
68 |
@@ -1,23 +1,33 @@ |
69 |
--- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
70 |
+++ configure.ac 2010-09-20 21:58:03.536293089 +0200 |
71 |
-@@ -49,10 +49,17 @@ |
72 |
+@@ -49,10 +49,19 @@ |
73 |
|
74 |
GTK_REQUIRED_VERSION=2.16 |
75 |
|
76 |
+AC_ARG_ENABLE([gtk], |
77 |
+ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), |
78 |
-+ [enable_gtk=$enableval], enable_gtk=auto) |
79 |
++ [enable_gtk=$enableval], [enable_gtk=auto]) |
80 |
+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) |
81 |
+ |
82 |
-+if test "x$enable_gtk" != "xno"; then |
83 |
++AS_IF([test "x$enable_gtk" != "xno"],[ |
84 |
PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
85 |
glib-2.0 >= $GLIB_REQUIRED_VERSION |
86 |
dbus-glib-1 >= $DBUS_REQUIRED_VERSION |
87 |
- libxml-2.0 >= $XML_REQUIRED_VERSION) |
88 |
-+fi |
89 |
+- libxml-2.0 >= $XML_REQUIRED_VERSION) |
90 |
++ libxml-2.0 >= $XML_REQUIRED_VERSION, |
91 |
++ [have_gtk=yes] |
92 |
++) |
93 |
++]) |
94 |
|
95 |
AC_SUBST(DBUSMENUGTK_CFLAGS) |
96 |
AC_SUBST(DBUSMENUGTK_LIBS) |
97 |
+@@ -193,1 +192,6 @@ |
98 |
+ |
99 |
++AS_IF([test "x$have_gtk" = "xyes"], |
100 |
++ AC_MSG_NOTICE([ Gtk: yes]), |
101 |
++ AC_MSG_NOTICE([ Gtk: no]) |
102 |
++) |
103 |
++ |
104 |
--- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
105 |
+++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 |
106 |
@@ -5,5 +5,9 @@ |
107 |
@@ -79,3 +89,4 @@ |
108 |
|
109 |
XVFB_RUN=". $(srcdir)/run-xvfb.sh" |
110 |
|
111 |
+ |
112 |
|
113 |
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch |
114 |
index a6d0536..e047cd8 100644 |
115 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch |
116 |
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch |
117 |
@@ -1,21 +1,31 @@ |
118 |
--- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
119 |
+++ configure.ac 2010-09-20 22:01:21.623107607 +0200 |
120 |
-@@ -76,8 +76,15 @@ |
121 |
+@@ -76,8 +76,17 @@ |
122 |
JSON_GLIB_REQUIRED_VERSION=0.6.0 |
123 |
GIO_UNIX_REQUIRED_VERSION=2.24 |
124 |
|
125 |
+AC_ARG_ENABLE([tests], |
126 |
+ AC_HELP_STRING([--disable-tests], [Disable tests]), |
127 |
-+ [enable_tests=$enableval], enable_tests=auto) |
128 |
++ [enable_tests=$enableval], [enable_tests=auto]) |
129 |
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) |
130 |
+ |
131 |
-+if test "x$enable_tests" != "xno" ; then |
132 |
++AS_IF([test "x$enable_tests" != "xno"],[ |
133 |
PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
134 |
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) |
135 |
-+fi |
136 |
+- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) |
137 |
++ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION, |
138 |
++ [have_tests=yes] |
139 |
++) |
140 |
++]) |
141 |
|
142 |
AC_SUBST(DBUSMENUTESTS_CFLAGS) |
143 |
AC_SUBST(DBUSMENUTESTS_LIBS) |
144 |
+@@ -193,1 +193,6 @@ |
145 |
+ |
146 |
++AS_IF([test "x$have_tests" = "xyes"], |
147 |
++ AC_MSG_NOTICE([ Tests: yes]), |
148 |
++ AC_MSG_NOTICE([ Tests: no]) |
149 |
++) |
150 |
++ |
151 |
--- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
152 |
+++ Makefile.am 2010-09-20 22:01:55.525674385 +0200 |
153 |
@@ -5,2 +5,6 @@ |
154 |
|
155 |
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch |
156 |
index 9aceb88..72fcd57 100644 |
157 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch |
158 |
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch |
159 |
@@ -6,25 +6,32 @@ |
160 |
|
161 |
+AC_ARG_ENABLE([vala], |
162 |
+ AC_HELP_STRING([--disable-vala], [Disable vala]), |
163 |
-+ [enable_vala=$enableval], enable_vala=auto) |
164 |
-+AM_CONDITIONAL([WANT_VALA], [test "x$enable_vala" != "xno"]) |
165 |
++ [enable_vala=$enableval], [enable_vala=auto]) |
166 |
+ |
167 |
-+if test "x$enable_vala" != "xno" ; then |
168 |
-+if test "x$enable_introspection" = "xno" ; then |
169 |
-+ AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) |
170 |
-+fi |
171 |
++AS_IF([test "x$enable_vala" != "xno"],[ |
172 |
++ AM_COND_IF([HAVE_INTROSPECTION],,[ |
173 |
++ AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) |
174 |
++ ]) |
175 |
AC_PATH_PROG([VALA_API_GEN], [vapigen]) |
176 |
-+fi |
177 |
++]) |
178 |
++AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) |
179 |
|
180 |
########################### |
181 |
# XSLT Processor |
182 |
+@@ -193,1 +193,6 @@ |
183 |
+ |
184 |
++AM_COND_IF([HAVE_VALA], |
185 |
++ AC_MSG_NOTICE([ Vala bindings: yes]), |
186 |
++ AC_MSG_NOTICE([ Vala bindings no]) |
187 |
++) |
188 |
++ |
189 |
--- libdbusmenu-gtk/Makefile.am.orig 2011-02-05 15:09:06.429965757 +0100 |
190 |
+++ libdbusmenu-gtk/Makefile.am 2011-02-05 15:08:14.742722310 +0100 |
191 |
@@ -131,6 +131,7 @@ |
192 |
# VAPI Files |
193 |
######################### |
194 |
|
195 |
-+if WANT_VALA |
196 |
++if HAVE_VALA |
197 |
if HAVE_INTROSPECTION |
198 |
|
199 |
vapidir = $(datadir)/vala/vapi |
200 |
@@ -40,7 +47,7 @@ |
201 |
# VAPI Files |
202 |
######################### |
203 |
|
204 |
-+if WANT_VALA |
205 |
++if HAVE_VALA |
206 |
if HAVE_INTROSPECTION |
207 |
|
208 |
vapidir = $(datadir)/vala/vapi |
209 |
|
210 |
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch |
211 |
index c19ee99..e178447 100644 |
212 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch |
213 |
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch |
214 |
@@ -1,12 +1,12 @@ |
215 |
--- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100 |
216 |
+++ configure.ac 2011-01-29 20:42:10.969923186 +0100 |
217 |
-@@ -58,29 +58,35 @@ |
218 |
+@@ -58,29 +58,39 @@ |
219 |
GTK_REQUIRED_VERSION=2.16 |
220 |
GTK3_REQUIRED_VERSION=2.91 |
221 |
|
222 |
+AC_ARG_ENABLE([gtk], |
223 |
+ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), |
224 |
-+ [enable_gtk=$enableval], enable_gtk=auto) |
225 |
++ [enable_gtk=$enableval], [enable_gtk=auto]) |
226 |
+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) |
227 |
+ |
228 |
AC_ARG_WITH([gtk], |
229 |
@@ -14,13 +14,16 @@ |
230 |
[Which version of gtk to use @<:@default=2@:>@])], |
231 |
[], |
232 |
[with_gtk=2]) |
233 |
-+AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) |
234 |
++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) |
235 |
+ |
236 |
-+if test "x$enable_gtk" != "xno" ; then |
237 |
++AS_IF([test "x$enable_gtk" != "xno"],[ |
238 |
AS_IF([test "x$with_gtk" = x3], |
239 |
[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION |
240 |
glib-2.0 >= $GLIB_REQUIRED_VERSION |
241 |
- libxml-2.0 >= $XML_REQUIRED_VERSION) |
242 |
+- libxml-2.0 >= $XML_REQUIRED_VERSION) |
243 |
++ libxml-2.0 >= $XML_REQUIRED_VERSION, |
244 |
++ [have_gtk=yes] |
245 |
++) |
246 |
- AC_SUBST(DBUSMENUGTK_CFLAGS) |
247 |
- AC_SUBST(DBUSMENUGTK_LIBS) |
248 |
AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) |
249 |
@@ -28,19 +31,29 @@ |
250 |
[test "x$with_gtk" = x2], |
251 |
[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
252 |
glib-2.0 >= $GLIB_REQUIRED_VERSION |
253 |
- libxml-2.0 >= $XML_REQUIRED_VERSION) |
254 |
+- libxml-2.0 >= $XML_REQUIRED_VERSION) |
255 |
++ libxml-2.0 >= $XML_REQUIRED_VERSION, |
256 |
++ [have_gtk=yes] |
257 |
++) |
258 |
- AC_SUBST(DBUSMENUGTK_CFLAGS) |
259 |
- AC_SUBST(DBUSMENUGTK_LIBS) |
260 |
], |
261 |
[AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] |
262 |
) |
263 |
-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) |
264 |
-+fi |
265 |
++]) |
266 |
+AC_SUBST(DBUSMENUGTK_CFLAGS) |
267 |
+AC_SUBST(DBUSMENUGTK_LIBS) |
268 |
|
269 |
########################### |
270 |
# Dependencies - dumper |
271 |
+@@ -193,1 +193,6 @@ |
272 |
+ |
273 |
++AS_IF([test "x$enable_gtk" = "xyes"], |
274 |
++ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]), |
275 |
++ AC_MSG_NOTICE([ Gtk: no]) |
276 |
++) |
277 |
++ |
278 |
--- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
279 |
+++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 |
280 |
@@ -5,5 +5,9 @@ |
281 |
|
282 |
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild |
283 |
similarity index 100% |
284 |
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild |
285 |
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild |
286 |
|
287 |
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild |
288 |
similarity index 100% |
289 |
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild |
290 |
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild |