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

Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libdbusmenu/files: libdbusmenu-0.3.14-fix-aclocal.patch libdbusmenu-0.3.16-decouple-testapp.patch libdbusmenu-0.3.14-optional-dumper.patch libdbusmenu-0.3.16-optional-gtk.patch libdbusmenu-0.3.16-parallel-make.patch libdbusmenu-0.3.16-optional-tests.patch
Date: Sat, 29 Jan 2011 15:58:22
Message-Id: 20110129155813.BBE4820054@flycatcher.gentoo.org
1 tampakrap 11/01/29 15:58:13
2
3 Added: libdbusmenu-0.3.14-fix-aclocal.patch
4 libdbusmenu-0.3.16-decouple-testapp.patch
5 libdbusmenu-0.3.14-optional-dumper.patch
6 libdbusmenu-0.3.16-optional-gtk.patch
7 libdbusmenu-0.3.16-parallel-make.patch
8 libdbusmenu-0.3.16-optional-tests.patch
9 Log:
10 Version bump, fix tests, support USE=introspection. Ebuild and patches by Dennis Schridde, bug 352470 and bug 315217
11
12 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
13
14 Revision Changes Path
15 1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch?rev=1.1&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch?rev=1.1&content-type=text/plain
19
20 Index: libdbusmenu-0.3.14-fix-aclocal.patch
21 ===================================================================
22 --- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200
23 +++ Makefile.am 2010-09-20 22:21:12.976592367 +0200
24 @@ -1,3 +1,5 @@
25 +ACLOCAL_AMFLAGS = -I m4
26 +
27 EXTRA_DIST = \
28 COPYING.2.1 \
29 COPYING-GPL3 \
30
31
32
33 1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch?rev=1.1&content-type=text/plain
37
38 Index: libdbusmenu-0.3.16-decouple-testapp.patch
39 ===================================================================
40 --- tools/testapp/Makefile.am.orig 2011-01-29 13:42:00.984605528 +0100
41 +++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100
42 @@ -12,6 +13,4 @@
43
44 dbusmenu_testapp_LDADD = \
45 $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
46 - $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \
47 - $(DBUSMENUGTK_LIBS) \
48 $(DBUSMENUTESTS_LIBS)
49
50
51
52 1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch?rev=1.1&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch?rev=1.1&content-type=text/plain
56
57 Index: libdbusmenu-0.3.14-optional-dumper.patch
58 ===================================================================
59 --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200
60 +++ configure.ac 2010-09-20 22:05:38.292979567 +0200
61 @@ -63,8 +63,15 @@
62
63 X11_REQUIRED_VERSION=1.3
64
65 +AC_ARG_ENABLE([dumper],
66 + AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]),
67 + [enable_dumper=$enableval], enable_dumper=auto)
68 +AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"])
69 +
70 +if test "x$enable_dumper" != "xno" ; then
71 PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
72 x11 >= $X11_REQUIRED_VERSION)
73 +fi
74
75 AC_SUBST(DBUSMENUDUMPER_CFLAGS)
76 AC_SUBST(DBUSMENUDUMPER_LIBS)
77 --- tools/Makefile.am.orig 2010-09-20 22:02:07.280175897 +0200
78 +++ tools/Makefile.am 2010-09-20 22:05:15.621664358 +0200
79 @@ -3,5 +3,9 @@
80
81 -libexec_PROGRAMS = dbusmenu-dumper
82 +libexec_PROGRAMS =
83 +
84 +if WANT_DBUSMENUDUMPER
85 +libexec_PROGRAMS += dbusmenu-dumper
86 +endif
87
88 libexec_SCRIPTS = dbusmenu-bench
89
90
91
92
93 1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch?rev=1.1&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch?rev=1.1&content-type=text/plain
97
98 Index: libdbusmenu-0.3.16-optional-gtk.patch
99 ===================================================================
100 --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200
101 +++ configure.ac 2010-09-20 21:58:03.536293089 +0200
102 @@ -49,10 +49,17 @@
103
104 GTK_REQUIRED_VERSION=2.16
105
106 +AC_ARG_ENABLE([gtk],
107 + AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
108 + [enable_gtk=$enableval], enable_gtk=auto)
109 +AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
110 +
111 +if test "x$enable_gtk" != "xno"; then
112 PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION
113 glib-2.0 >= $GLIB_REQUIRED_VERSION
114 dbus-glib-1 >= $DBUS_REQUIRED_VERSION
115 libxml-2.0 >= $XML_REQUIRED_VERSION)
116 +fi
117
118 AC_SUBST(DBUSMENUGTK_CFLAGS)
119 AC_SUBST(DBUSMENUGTK_LIBS)
120 --- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200
121 +++ Makefile.am 2010-09-20 21:59:23.492035983 +0200
122 @@ -5,10 +5,13 @@
123
124 SUBDIRS = \
125 libdbusmenu-glib \
126 - libdbusmenu-gtk \
127 tools \
128 tests \
129 docs \
130 po
131
132 +if WANT_LIBDBUSMENUGTK
133 +SUBDIRS += libdbusmenu-gtk
134 +endif
135 +
136 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
137 --- tests/Makefile.am.orig 2011-01-29 14:37:11.863805482 +0100
138 +++ tests/Makefile.am 2011-01-29 14:38:48.910883303 +0100
139 @@ -11,12 +11,16 @@
140 test-glib-proxy \
141 test-glib-simple-items \
142 test-glib-submenu \
143 - test-json \
144 + test-json
145 +
146 +if WANT_LIBDBUSMENUGTK
147 +TESTS += \
148 test-gtk-objects-test \
149 test-gtk-label \
150 test-gtk-shortcut \
151 test-gtk-reorder \
152 test-gtk-submenu
153 +endif
154
155 check_PROGRAMS = \
156 glib-server-nomenu \
157 @@ -30,19 +34,23 @@
158 test-glib-proxy-client \
159 test-glib-proxy-server \
160 test-glib-proxy-proxy \
161 - test-gtk-objects \
162 test-glib-submenu-client \
163 test-glib-submenu-server \
164 + test-glib-simple-items \
165 + test-json-client \
166 + test-json-server
167 +
168 +if WANT_LIBDBUSMENUGTK
169 +check_PROGRAMS += \
170 + test-gtk-objects \
171 test-gtk-label-client \
172 test-gtk-label-server \
173 test-gtk-shortcut-client \
174 test-gtk-shortcut-server \
175 - test-glib-simple-items \
176 test-gtk-reorder-server \
177 - test-json-client \
178 - test-json-server \
179 test-gtk-submenu-server \
180 test-gtk-submenu-client
181 +endif
182
183 XVFB_RUN=". $(srcdir)/run-xvfb.sh"
184
185
186
187
188 1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch
189
190 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch?rev=1.1&view=markup
191 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch?rev=1.1&content-type=text/plain
192
193 Index: libdbusmenu-0.3.16-parallel-make.patch
194 ===================================================================
195 --- Makefile.am.orig 2011-01-29 13:49:42.828302898 +0100
196 +++ Makefile.am 2011-01-29 13:50:45.096371768 +0100
197 @@ -21,4 +21,8 @@
198
199 +libdbusmenu-gtk: libdbusmenu-glib
200 +tests: libdbusmenu-gtk
201 +tools: libdbusmenu-gtk
202 +
203 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
204
205 dist-hook:
206
207
208
209 1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
210
211 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch?rev=1.1&view=markup
212 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch?rev=1.1&content-type=text/plain
213
214 Index: libdbusmenu-0.3.16-optional-tests.patch
215 ===================================================================
216 --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200
217 +++ configure.ac 2010-09-20 22:01:21.623107607 +0200
218 @@ -76,8 +76,15 @@
219 JSON_GLIB_REQUIRED_VERSION=0.6.0
220 GIO_UNIX_REQUIRED_VERSION=2.24
221
222 +AC_ARG_ENABLE([tests],
223 + AC_HELP_STRING([--disable-tests], [Disable tests]),
224 + [enable_tests=$enableval], enable_tests=auto)
225 +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
226 +
227 +if test "x$enable_tests" != "xno" ; then
228 PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
229 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
230 +fi
231
232 AC_SUBST(DBUSMENUTESTS_CFLAGS)
233 AC_SUBST(DBUSMENUTESTS_LIBS)
234 --- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200
235 +++ Makefile.am 2010-09-20 22:01:55.525674385 +0200
236 @@ -9,6 +9,9 @@
237 tools \
238 - tests \
239 docs \
240 po
241
242 +if WANT_TESTS
243 +SUBDIRS += tests
244 +endif
245 +
246 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
247 --- tools/testapp/Makefile.am.orig 2011-01-29 13:42:00.984605528 +0100
248 +++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100
249 @@ -1,5 +1,9 @@
250
251 -libexec_PROGRAMS = dbusmenu-testapp
252 +libexec_PROGRAMS =
253 +
254 +if WANT_TESTS
255 +libexec_PROGRAMS += dbusmenu-testapp
256 +endif
257
258 dbusmenu_testapp_SOURCES = \
259 main.c
Report Message
Find on MARC Find on Google Groups