diff options
| author | Dennis Schridde <devurandom@gmx.net> | 2011-01-29 15:04:31 +0100 |
|---|---|---|
| committer | Dennis Schridde <devurandom@gmx.net> | 2011-01-29 15:14:34 +0100 |
| commit | 93dd42ddc7bd66fe85e0506bdf2df7a59233269f (patch) | |
| tree | 3c036225455aa9966325356d30b3b76db7fd225f /dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch | |
| parent | 811a8511494484addf1354ed3b4438f6166fbbbf (diff) | |
| download | kde-93dd42ddc7bd66fe85e0506bdf2df7a59233269f.tar.gz kde-93dd42ddc7bd66fe85e0506bdf2df7a59233269f.tar.bz2 kde-93dd42ddc7bd66fe85e0506bdf2df7a59233269f.zip | |
[dev-libs/libdbusmenu-0.3.16] Version bump, fix tests, support USE=introspection
CC-Bug: 352470
Bug: 315217
Diffstat (limited to 'dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch')
| -rw-r--r-- | dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch | 85 |
1 files changed, 85 insertions, 0 deletions
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 new file mode 100644 index 00000000000..7fdc051c765 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch @@ -0,0 +1,85 @@ +--- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 ++++ configure.ac 2010-09-20 21:58:03.536293089 +0200 +@@ -49,10 +49,17 @@ + + GTK_REQUIRED_VERSION=2.16 + ++AC_ARG_ENABLE([gtk], ++ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), ++ [enable_gtk=$enableval], enable_gtk=auto) ++AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) ++ ++if test "x$enable_gtk" != "xno"; then + PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION + libxml-2.0 >= $XML_REQUIRED_VERSION) ++fi + + AC_SUBST(DBUSMENUGTK_CFLAGS) + AC_SUBST(DBUSMENUGTK_LIBS) +--- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 ++++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 +@@ -5,10 +5,13 @@ + + SUBDIRS = \ + libdbusmenu-glib \ +- libdbusmenu-gtk \ + tools \ + tests \ + docs \ + po + ++if WANT_LIBDBUSMENUGTK ++SUBDIRS += libdbusmenu-gtk ++endif ++ + DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc +--- tests/Makefile.am.orig 2011-01-29 14:37:11.863805482 +0100 ++++ tests/Makefile.am 2011-01-29 14:38:48.910883303 +0100 +@@ -11,12 +11,16 @@ + test-glib-proxy \ + test-glib-simple-items \ + test-glib-submenu \ +- test-json \ ++ test-json ++ ++if WANT_LIBDBUSMENUGTK ++TESTS += \ + test-gtk-objects-test \ + test-gtk-label \ + test-gtk-shortcut \ + test-gtk-reorder \ + test-gtk-submenu ++endif + + check_PROGRAMS = \ + glib-server-nomenu \ +@@ -30,19 +34,23 @@ + test-glib-proxy-client \ + test-glib-proxy-server \ + test-glib-proxy-proxy \ +- test-gtk-objects \ + test-glib-submenu-client \ + test-glib-submenu-server \ ++ test-glib-simple-items \ ++ test-json-client \ ++ test-json-server ++ ++if WANT_LIBDBUSMENUGTK ++check_PROGRAMS += \ ++ test-gtk-objects \ + test-gtk-label-client \ + test-gtk-label-server \ + test-gtk-shortcut-client \ + test-gtk-shortcut-server \ +- test-glib-simple-items \ + test-gtk-reorder-server \ +- test-json-client \ +- test-json-server \ + test-gtk-submenu-server \ + test-gtk-submenu-client ++endif + + XVFB_RUN=". $(srcdir)/run-xvfb.sh" + |