| 1 |
tampakrap 11/02/07 09:56:46 |
| 2 |
|
| 3 |
Modified: libdbusmenu-0.3.14-optional-dumper.patch |
| 4 |
libdbusmenu-0.3.16-optional-gtk.patch |
| 5 |
libdbusmenu-0.3.16-optional-tests.patch |
| 6 |
Added: libdbusmenu-0.3.16-optional-vala.patch |
| 7 |
libdbusmenu-0.3.94-decouple-testapp.patch |
| 8 |
libdbusmenu-0.3.94-optional-gtk.patch |
| 9 |
libdbusmenu-0.3.94-fix-introspection.patch |
| 10 |
libdbusmenu-0.3.16-fix-introspection.patch |
| 11 |
Log: |
| 12 |
Revision bump, improved patches, fix tests, bug 315217, ebuild and patches by Dennis Schridde |
| 13 |
|
| 14 |
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64) |
| 15 |
|
| 16 |
Revision Changes Path |
| 17 |
1.2 dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch |
| 18 |
|
| 19 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch?rev=1.2&view=markup |
| 20 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch?rev=1.2&content-type=text/plain |
| 21 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch?r1=1.1&r2=1.2 |
| 22 |
|
| 23 |
Index: libdbusmenu-0.3.14-optional-dumper.patch |
| 24 |
=================================================================== |
| 25 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch,v |
| 26 |
retrieving revision 1.1 |
| 27 |
retrieving revision 1.2 |
| 28 |
diff -u -r1.1 -r1.2 |
| 29 |
--- libdbusmenu-0.3.14-optional-dumper.patch 29 Jan 2011 15:58:13 -0000 1.1 |
| 30 |
+++ libdbusmenu-0.3.14-optional-dumper.patch 7 Feb 2011 09:56:46 -0000 1.2 |
| 31 |
@@ -1,21 +1,31 @@ |
| 32 |
--- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
| 33 |
+++ configure.ac 2010-09-20 22:05:38.292979567 +0200 |
| 34 |
-@@ -63,8 +63,15 @@ |
| 35 |
+@@ -63,8 +63,17 @@ |
| 36 |
|
| 37 |
X11_REQUIRED_VERSION=1.3 |
| 38 |
|
| 39 |
+AC_ARG_ENABLE([dumper], |
| 40 |
+ AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), |
| 41 |
-+ [enable_dumper=$enableval], enable_dumper=auto) |
| 42 |
++ [enable_dumper=$enableval], [enable_dumper=auto]) |
| 43 |
+AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"]) |
| 44 |
+ |
| 45 |
-+if test "x$enable_dumper" != "xno" ; then |
| 46 |
++AS_IF([test "x$enable_dumper" != "xno"],[ |
| 47 |
PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
| 48 |
- x11 >= $X11_REQUIRED_VERSION) |
| 49 |
-+fi |
| 50 |
+- x11 >= $X11_REQUIRED_VERSION) |
| 51 |
++ x11 >= $X11_REQUIRED_VERSION, |
| 52 |
++ [have_dumper=yes] |
| 53 |
++) |
| 54 |
++]) |
| 55 |
|
| 56 |
AC_SUBST(DBUSMENUDUMPER_CFLAGS) |
| 57 |
AC_SUBST(DBUSMENUDUMPER_LIBS) |
| 58 |
+@@ -193,1 +193,6 @@ |
| 59 |
+ |
| 60 |
++AS_IF([test "x$have_dumper" = "xyes"], |
| 61 |
++ AC_MSG_NOTICE([ Dumper: yes]), |
| 62 |
++ AC_MSG_NOTICE([ Dumper: no]) |
| 63 |
++) |
| 64 |
++ |
| 65 |
--- tools/Makefile.am.orig 2010-09-20 22:02:07.280175897 +0200 |
| 66 |
+++ tools/Makefile.am 2010-09-20 22:05:15.621664358 +0200 |
| 67 |
@@ -3,5 +3,9 @@ |
| 68 |
@@ -29,3 +39,30 @@ |
| 69 |
|
| 70 |
libexec_SCRIPTS = dbusmenu-bench |
| 71 |
|
| 72 |
+--- tests/Makefile.am.orig 2011-02-07 00:01:11.066461559 +0100 |
| 73 |
++++ tests/Makefile.am 2011-02-07 00:02:33.487751202 +0100 |
| 74 |
+@@ -10,6 +10,10 @@ |
| 75 |
+ test-glib-properties \ |
| 76 |
+ test-glib-proxy \ |
| 77 |
+ test-glib-simple-items \ |
| 78 |
+- test-glib-submenu \ |
| 79 |
++ test-glib-submenu |
| 80 |
++ |
| 81 |
++if WANT_DBUSMENUDUMPER |
| 82 |
++TESTS += \ |
| 83 |
+ test-json |
| 84 |
++endif |
| 85 |
+ |
| 86 |
+@@ -36,7 +40,11 @@ |
| 87 |
+ test-glib-proxy-proxy \ |
| 88 |
+ test-glib-submenu-client \ |
| 89 |
+ test-glib-submenu-server \ |
| 90 |
+- test-glib-simple-items \ |
| 91 |
++ test-glib-simple-items |
| 92 |
++ |
| 93 |
++if WANT_DBUSMENUDUMPER |
| 94 |
++check_PROGRAMS += \ |
| 95 |
+ test-json-client \ |
| 96 |
+ test-json-server |
| 97 |
++endif |
| 98 |
+ |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.2 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch?rev=1.2&view=markup |
| 105 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch?rev=1.2&content-type=text/plain |
| 106 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch?r1=1.1&r2=1.2 |
| 107 |
|
| 108 |
Index: libdbusmenu-0.3.16-optional-gtk.patch |
| 109 |
=================================================================== |
| 110 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch,v |
| 111 |
retrieving revision 1.1 |
| 112 |
retrieving revision 1.2 |
| 113 |
diff -u -r1.1 -r1.2 |
| 114 |
--- libdbusmenu-0.3.16-optional-gtk.patch 29 Jan 2011 15:58:13 -0000 1.1 |
| 115 |
+++ libdbusmenu-0.3.16-optional-gtk.patch 7 Feb 2011 09:56:46 -0000 1.2 |
| 116 |
@@ -1,40 +1,46 @@ |
| 117 |
--- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
| 118 |
+++ configure.ac 2010-09-20 21:58:03.536293089 +0200 |
| 119 |
-@@ -49,10 +49,17 @@ |
| 120 |
+@@ -49,10 +49,19 @@ |
| 121 |
|
| 122 |
GTK_REQUIRED_VERSION=2.16 |
| 123 |
|
| 124 |
+AC_ARG_ENABLE([gtk], |
| 125 |
+ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), |
| 126 |
-+ [enable_gtk=$enableval], enable_gtk=auto) |
| 127 |
++ [enable_gtk=$enableval], [enable_gtk=auto]) |
| 128 |
+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) |
| 129 |
+ |
| 130 |
-+if test "x$enable_gtk" != "xno"; then |
| 131 |
++AS_IF([test "x$enable_gtk" != "xno"],[ |
| 132 |
PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
| 133 |
glib-2.0 >= $GLIB_REQUIRED_VERSION |
| 134 |
dbus-glib-1 >= $DBUS_REQUIRED_VERSION |
| 135 |
- libxml-2.0 >= $XML_REQUIRED_VERSION) |
| 136 |
-+fi |
| 137 |
+- libxml-2.0 >= $XML_REQUIRED_VERSION) |
| 138 |
++ libxml-2.0 >= $XML_REQUIRED_VERSION, |
| 139 |
++ [have_gtk=yes] |
| 140 |
++) |
| 141 |
++]) |
| 142 |
|
| 143 |
AC_SUBST(DBUSMENUGTK_CFLAGS) |
| 144 |
AC_SUBST(DBUSMENUGTK_LIBS) |
| 145 |
+@@ -193,1 +192,6 @@ |
| 146 |
+ |
| 147 |
++AS_IF([test "x$have_gtk" = "xyes"], |
| 148 |
++ AC_MSG_NOTICE([ Gtk: yes]), |
| 149 |
++ AC_MSG_NOTICE([ Gtk: no]) |
| 150 |
++) |
| 151 |
++ |
| 152 |
--- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
| 153 |
+++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 |
| 154 |
-@@ -5,10 +5,13 @@ |
| 155 |
+@@ -5,5 +5,9 @@ |
| 156 |
|
| 157 |
++if WANT_LIBDBUSMENUGTK |
| 158 |
++LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk |
| 159 |
++endif |
| 160 |
++ |
| 161 |
SUBDIRS = \ |
| 162 |
libdbusmenu-glib \ |
| 163 |
- libdbusmenu-gtk \ |
| 164 |
++ $(LIBDBUSMENUGTK_SUBDIR) \ |
| 165 |
tools \ |
| 166 |
- tests \ |
| 167 |
- docs \ |
| 168 |
- po |
| 169 |
- |
| 170 |
-+if WANT_LIBDBUSMENUGTK |
| 171 |
-+SUBDIRS += libdbusmenu-gtk |
| 172 |
-+endif |
| 173 |
-+ |
| 174 |
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc |
| 175 |
--- tests/Makefile.am.orig 2011-01-29 14:37:11.863805482 +0100 |
| 176 |
+++ tests/Makefile.am 2011-01-29 14:38:48.910883303 +0100 |
| 177 |
@@ -11,12 +11,16 @@ |
| 178 |
@@ -83,3 +89,4 @@ |
| 179 |
|
| 180 |
XVFB_RUN=". $(srcdir)/run-xvfb.sh" |
| 181 |
|
| 182 |
+ |
| 183 |
|
| 184 |
|
| 185 |
|
| 186 |
1.2 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch |
| 187 |
|
| 188 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch?rev=1.2&view=markup |
| 189 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch?rev=1.2&content-type=text/plain |
| 190 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch?r1=1.1&r2=1.2 |
| 191 |
|
| 192 |
Index: libdbusmenu-0.3.16-optional-tests.patch |
| 193 |
=================================================================== |
| 194 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch,v |
| 195 |
retrieving revision 1.1 |
| 196 |
retrieving revision 1.2 |
| 197 |
diff -u -r1.1 -r1.2 |
| 198 |
--- libdbusmenu-0.3.16-optional-tests.patch 29 Jan 2011 15:58:13 -0000 1.1 |
| 199 |
+++ libdbusmenu-0.3.16-optional-tests.patch 7 Feb 2011 09:56:46 -0000 1.2 |
| 200 |
@@ -1,34 +1,45 @@ |
| 201 |
--- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
| 202 |
+++ configure.ac 2010-09-20 22:01:21.623107607 +0200 |
| 203 |
-@@ -76,8 +76,15 @@ |
| 204 |
+@@ -76,8 +76,17 @@ |
| 205 |
JSON_GLIB_REQUIRED_VERSION=0.6.0 |
| 206 |
GIO_UNIX_REQUIRED_VERSION=2.24 |
| 207 |
|
| 208 |
+AC_ARG_ENABLE([tests], |
| 209 |
+ AC_HELP_STRING([--disable-tests], [Disable tests]), |
| 210 |
-+ [enable_tests=$enableval], enable_tests=auto) |
| 211 |
++ [enable_tests=$enableval], [enable_tests=auto]) |
| 212 |
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) |
| 213 |
+ |
| 214 |
-+if test "x$enable_tests" != "xno" ; then |
| 215 |
++AS_IF([test "x$enable_tests" != "xno"],[ |
| 216 |
PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
| 217 |
- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) |
| 218 |
-+fi |
| 219 |
+- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) |
| 220 |
++ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION, |
| 221 |
++ [have_tests=yes] |
| 222 |
++) |
| 223 |
++]) |
| 224 |
|
| 225 |
AC_SUBST(DBUSMENUTESTS_CFLAGS) |
| 226 |
AC_SUBST(DBUSMENUTESTS_LIBS) |
| 227 |
+@@ -193,1 +193,6 @@ |
| 228 |
+ |
| 229 |
++AS_IF([test "x$have_tests" = "xyes"], |
| 230 |
++ AC_MSG_NOTICE([ Tests: yes]), |
| 231 |
++ AC_MSG_NOTICE([ Tests: no]) |
| 232 |
++) |
| 233 |
++ |
| 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 |
+@@ -5,2 +5,6 @@ |
| 242 |
|
| 243 |
+if WANT_TESTS |
| 244 |
-+SUBDIRS += tests |
| 245 |
++TESTS_SUBDIR = tests |
| 246 |
+endif |
| 247 |
+ |
| 248 |
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc |
| 249 |
+ SUBDIRS = \ |
| 250 |
+@@ -9,3 +9,3 @@ |
| 251 |
+ tools \ |
| 252 |
+- tests \ |
| 253 |
++ $(TESTS_SUBDIR) \ |
| 254 |
+ docs \ |
| 255 |
--- tools/testapp/Makefile.am.orig 2011-01-29 13:42:00.984605528 +0100 |
| 256 |
+++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100 |
| 257 |
@@ -1,5 +1,9 @@ |
| 258 |
|
| 259 |
|
| 260 |
|
| 261 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch |
| 262 |
|
| 263 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch?rev=1.1&view=markup |
| 264 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch?rev=1.1&content-type=text/plain |
| 265 |
|
| 266 |
Index: libdbusmenu-0.3.16-optional-vala.patch |
| 267 |
=================================================================== |
| 268 |
--- configure.ac.orig 2011-02-05 15:01:31.212827464 +0100 |
| 269 |
+++ configure.ac 2011-02-05 15:13:08.310031260 +0100 |
| 270 |
@@ -143,7 +143,17 @@ |
| 271 |
# Vala API Generation |
| 272 |
########################### |
| 273 |
|
| 274 |
+AC_ARG_ENABLE([vala], |
| 275 |
+ AC_HELP_STRING([--disable-vala], [Disable vala]), |
| 276 |
+ [enable_vala=$enableval], [enable_vala=auto]) |
| 277 |
+ |
| 278 |
+AS_IF([test "x$enable_vala" != "xno"],[ |
| 279 |
+ AM_COND_IF([HAVE_INTROSPECTION],,[ |
| 280 |
+ AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) |
| 281 |
+ ]) |
| 282 |
AC_PATH_PROG([VALA_API_GEN], [vapigen]) |
| 283 |
+]) |
| 284 |
+AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) |
| 285 |
|
| 286 |
########################### |
| 287 |
# XSLT Processor |
| 288 |
@@ -193,1 +193,6 @@ |
| 289 |
|
| 290 |
+AM_COND_IF([HAVE_VALA], |
| 291 |
+ AC_MSG_NOTICE([ Vala bindings: yes]), |
| 292 |
+ AC_MSG_NOTICE([ Vala bindings no]) |
| 293 |
+) |
| 294 |
+ |
| 295 |
--- libdbusmenu-gtk/Makefile.am.orig 2011-02-05 15:09:06.429965757 +0100 |
| 296 |
+++ libdbusmenu-gtk/Makefile.am 2011-02-05 15:08:14.742722310 +0100 |
| 297 |
@@ -131,6 +131,7 @@ |
| 298 |
# VAPI Files |
| 299 |
######################### |
| 300 |
|
| 301 |
+if HAVE_VALA |
| 302 |
if HAVE_INTROSPECTION |
| 303 |
|
| 304 |
vapidir = $(datadir)/vala/vapi |
| 305 |
@@ -154,4 +155,5 @@ |
| 306 |
CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir |
| 307 |
|
| 308 |
endif |
| 309 |
+endif |
| 310 |
|
| 311 |
--- libdbusmenu-glib/Makefile.am.orig 2011-02-05 15:08:49.613538681 +0100 |
| 312 |
+++ libdbusmenu-glib/Makefile.am 2011-02-05 15:06:23.826443241 +0100 |
| 313 |
@@ -165,6 +165,7 @@ |
| 314 |
# VAPI Files |
| 315 |
######################### |
| 316 |
|
| 317 |
+if HAVE_VALA |
| 318 |
if HAVE_INTROSPECTION |
| 319 |
|
| 320 |
vapidir = $(datadir)/vala/vapi |
| 321 |
@@ -176,4 +177,5 @@ |
| 322 |
CLEANFILES += $(vapi_DATA) |
| 323 |
|
| 324 |
endif |
| 325 |
+endif |
| 326 |
|
| 327 |
|
| 328 |
|
| 329 |
|
| 330 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch |
| 331 |
|
| 332 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch?rev=1.1&view=markup |
| 333 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch?rev=1.1&content-type=text/plain |
| 334 |
|
| 335 |
Index: libdbusmenu-0.3.94-decouple-testapp.patch |
| 336 |
=================================================================== |
| 337 |
--- tools/testapp/Makefile.am.orig 2011-01-29 20:50:54.266939219 +0100 |
| 338 |
+++ tools/testapp/Makefile.am 2011-01-29 20:51:16.185268917 +0100 |
| 339 |
@@ -1,10 +1,4 @@ |
| 340 |
|
| 341 |
-if USE_GTK3 |
| 342 |
-VER=3 |
| 343 |
-else |
| 344 |
-VER= |
| 345 |
-endif |
| 346 |
- |
| 347 |
libexec_PROGRAMS = |
| 348 |
|
| 349 |
if WANT_TESTS |
| 350 |
@@ -22,6 +16,4 @@ |
| 351 |
|
| 352 |
dbusmenu_testapp_LDADD = \ |
| 353 |
$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ |
| 354 |
- $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ |
| 355 |
- $(DBUSMENUGTK_LIBS) \ |
| 356 |
$(DBUSMENUTESTS_LIBS) |
| 357 |
|
| 358 |
|
| 359 |
|
| 360 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch |
| 361 |
|
| 362 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch?rev=1.1&view=markup |
| 363 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch?rev=1.1&content-type=text/plain |
| 364 |
|
| 365 |
Index: libdbusmenu-0.3.94-optional-gtk.patch |
| 366 |
=================================================================== |
| 367 |
--- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100 |
| 368 |
+++ configure.ac 2011-01-29 20:42:10.969923186 +0100 |
| 369 |
@@ -58,29 +58,39 @@ |
| 370 |
GTK_REQUIRED_VERSION=2.16 |
| 371 |
GTK3_REQUIRED_VERSION=2.91 |
| 372 |
|
| 373 |
+AC_ARG_ENABLE([gtk], |
| 374 |
+ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), |
| 375 |
+ [enable_gtk=$enableval], [enable_gtk=auto]) |
| 376 |
+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) |
| 377 |
+ |
| 378 |
AC_ARG_WITH([gtk], |
| 379 |
[AS_HELP_STRING([--with-gtk], |
| 380 |
[Which version of gtk to use @<:@default=2@:>@])], |
| 381 |
[], |
| 382 |
[with_gtk=2]) |
| 383 |
+AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) |
| 384 |
+ |
| 385 |
+AS_IF([test "x$enable_gtk" != "xno"],[ |
| 386 |
AS_IF([test "x$with_gtk" = x3], |
| 387 |
[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION |
| 388 |
glib-2.0 >= $GLIB_REQUIRED_VERSION |
| 389 |
- libxml-2.0 >= $XML_REQUIRED_VERSION) |
| 390 |
+ libxml-2.0 >= $XML_REQUIRED_VERSION, |
| 391 |
+ [have_gtk=yes] |
| 392 |
+) |
| 393 |
- AC_SUBST(DBUSMENUGTK_CFLAGS) |
| 394 |
- AC_SUBST(DBUSMENUGTK_LIBS) |
| 395 |
AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) |
| 396 |
], |
| 397 |
[test "x$with_gtk" = x2], |
| 398 |
[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
| 399 |
glib-2.0 >= $GLIB_REQUIRED_VERSION |
| 400 |
- libxml-2.0 >= $XML_REQUIRED_VERSION) |
| 401 |
+ libxml-2.0 >= $XML_REQUIRED_VERSION, |
| 402 |
+ [have_gtk=yes] |
| 403 |
+) |
| 404 |
- AC_SUBST(DBUSMENUGTK_CFLAGS) |
| 405 |
- AC_SUBST(DBUSMENUGTK_LIBS) |
| 406 |
], |
| 407 |
[AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] |
| 408 |
) |
| 409 |
-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) |
| 410 |
+]) |
| 411 |
+AC_SUBST(DBUSMENUGTK_CFLAGS) |
| 412 |
+AC_SUBST(DBUSMENUGTK_LIBS) |
| 413 |
|
| 414 |
########################### |
| 415 |
# Dependencies - dumper |
| 416 |
@@ -193,1 +193,6 @@ |
| 417 |
|
| 418 |
+AS_IF([test "x$enable_gtk" = "xyes"], |
| 419 |
+ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]), |
| 420 |
+ AC_MSG_NOTICE([ Gtk: no]) |
| 421 |
+) |
| 422 |
+ |
| 423 |
--- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
| 424 |
+++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 |
| 425 |
@@ -5,5 +5,9 @@ |
| 426 |
|
| 427 |
+if WANT_LIBDBUSMENUGTK |
| 428 |
+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk |
| 429 |
+endif |
| 430 |
+ |
| 431 |
SUBDIRS = \ |
| 432 |
libdbusmenu-glib \ |
| 433 |
- libdbusmenu-gtk \ |
| 434 |
+ $(LIBDBUSMENUGTK_SUBDIR) \ |
| 435 |
tools \ |
| 436 |
--- tests/Makefile.am.orig 2011-01-29 20:47:16.721588701 +0100 |
| 437 |
+++ tests/Makefile.am 2011-01-29 20:45:10.116455527 +0100 |
| 438 |
@@ -11,13 +11,17 @@ |
| 439 |
test-glib-proxy \ |
| 440 |
test-glib-simple-items \ |
| 441 |
test-glib-submenu \ |
| 442 |
- test-json \ |
| 443 |
+ test-json |
| 444 |
+ |
| 445 |
+if WANT_LIBDBUSMENUGTK |
| 446 |
+TESTS += \ |
| 447 |
test-gtk-objects-test \ |
| 448 |
test-gtk-label \ |
| 449 |
test-gtk-shortcut \ |
| 450 |
test-gtk-reorder \ |
| 451 |
test-gtk-submenu \ |
| 452 |
test-gtk-parser-test |
| 453 |
+endif |
| 454 |
|
| 455 |
check_PROGRAMS = \ |
| 456 |
glib-server-nomenu \ |
| 457 |
@@ -31,20 +35,24 @@ |
| 458 |
test-glib-proxy-client \ |
| 459 |
test-glib-proxy-server \ |
| 460 |
test-glib-proxy-proxy \ |
| 461 |
- test-gtk-objects \ |
| 462 |
test-glib-submenu-client \ |
| 463 |
test-glib-submenu-server \ |
| 464 |
+ test-glib-simple-items \ |
| 465 |
+ test-json-client \ |
| 466 |
+ test-json-server |
| 467 |
+ |
| 468 |
+if WANT_LIBDBUSMENUGTK |
| 469 |
+check_PROGRAMS += \ |
| 470 |
+ test-gtk-objects \ |
| 471 |
test-gtk-label-client \ |
| 472 |
test-gtk-label-server \ |
| 473 |
test-gtk-shortcut-client \ |
| 474 |
test-gtk-shortcut-server \ |
| 475 |
- test-glib-simple-items \ |
| 476 |
test-gtk-reorder-server \ |
| 477 |
- test-json-client \ |
| 478 |
- test-json-server \ |
| 479 |
test-gtk-submenu-server \ |
| 480 |
test-gtk-submenu-client \ |
| 481 |
test-gtk-parser |
| 482 |
+endif |
| 483 |
|
| 484 |
XVFB_RUN=". $(srcdir)/run-xvfb.sh" |
| 485 |
|
| 486 |
|
| 487 |
|
| 488 |
|
| 489 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch |
| 490 |
|
| 491 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch?rev=1.1&view=markup |
| 492 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch?rev=1.1&content-type=text/plain |
| 493 |
|
| 494 |
Index: libdbusmenu-0.3.94-fix-introspection.patch |
| 495 |
=================================================================== |
| 496 |
--- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:16:34.481082458 +0100 |
| 497 |
+++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:20:31.703396315 +0100 |
| 498 |
@@ -138,7 +138,7 @@ |
| 499 |
|
| 500 |
introspection_sources = $(libdbusmenu_glibinclude_HEADERS) |
| 501 |
|
| 502 |
-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la |
| 503 |
+Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la |
| 504 |
Dbusmenu_Glib_0_4_gir_INCLUDES = \ |
| 505 |
GObject-2.0 |
| 506 |
Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir) |
| 507 |
|
| 508 |
|
| 509 |
|
| 510 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch |
| 511 |
|
| 512 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch?rev=1.1&view=markup |
| 513 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch?rev=1.1&content-type=text/plain |
| 514 |
|
| 515 |
Index: libdbusmenu-0.3.16-fix-introspection.patch |
| 516 |
=================================================================== |
| 517 |
--- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:38:38.713641727 +0100 |
| 518 |
+++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:38:44.917448353 +0100 |
| 519 |
@@ -123,7 +123,7 @@ |
| 520 |
|
| 521 |
introspection_sources = $(libdbusmenu_glibinclude_HEADERS) |
| 522 |
|
| 523 |
-Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la |
| 524 |
+Dbusmenu-Glib-0.2.gir: libdbusmenu-glib.la |
| 525 |
Dbusmenu_Glib_0_2_gir_INCLUDES = \ |
| 526 |
GObject-2.0 |
| 527 |
Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) |
Archives