diff options
Diffstat (limited to 'dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch')
| -rw-r--r-- | dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch new file mode 100644 index 0000000..3d0fd4f --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch @@ -0,0 +1,135 @@ +commit 9fa1d7911a84e7bfbfe009567e16c89a08445ad3 +Author: Christoph Mende <mende.christoph@gmail.com> +Date: Tue May 24 18:05:37 2011 +0200 + + optional gtk + +diff --git a/Makefile.am b/Makefile.am +index 81a2cbb..a69c377 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,9 +7,13 @@ if WANT_TESTS + TESTS_SUBDIR = tests + endif + ++if WANT_LIBDBUSMENUGTK ++LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk ++endif ++ + SUBDIRS = \ + libdbusmenu-glib \ +- libdbusmenu-gtk \ ++ $(LIBDBUSMENUGTK_SUBDIR) \ + tools \ + $(TESTS_SUBDIR) \ + docs \ +diff --git a/configure.ac b/configure.ac +index 9e742c2..a7fa7f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,27 +58,37 @@ AC_SUBST(DBUSMENUGLIB_LIBS) + GTK_REQUIRED_VERSION=2.16 + GTK3_REQUIRED_VERSION=2.91 + ++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"]) ++ + AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk], + [Which version of gtk to use @<:@default=2@:>@])], + [], + [with_gtk=2]) ++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) ++ ++AS_IF([test "x$enable_gtk" != "xno"],[ + AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION +- glib-2.0 >= $GLIB_REQUIRED_VERSION) +- AC_SUBST(DBUSMENUGTK_CFLAGS) +- AC_SUBST(DBUSMENUGTK_LIBS) ++ glib-2.0 >= $GLIB_REQUIRED_VERSION, ++ [have_gtk=yes] ++) + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION +- glib-2.0 >= $GLIB_REQUIRED_VERSION) +- AC_SUBST(DBUSMENUGTK_CFLAGS) +- AC_SUBST(DBUSMENUGTK_LIBS) ++ glib-2.0 >= $GLIB_REQUIRED_VERSION, ++ [have_gtk=yes] ++) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] + ) +-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ++]) ++AC_SUBST(DBUSMENUGTK_CFLAGS) ++AC_SUBST(DBUSMENUGTK_LIBS) + + ########################### + # Dependencies - dumper +@@ -228,3 +238,8 @@ AS_IF([test "x$have_tests" = "xyes"], + AC_MSG_NOTICE([ Tests: no]) + ) + ++AS_IF([test "x$enable_gtk" = "xyes"], ++ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]), ++ AC_MSG_NOTICE([ Gtk: no]) ++) ++ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index a2c0716..32e12ff 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -13,13 +13,17 @@ TESTS = \ + 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 \ + test-gtk-parser-test ++endif + + # The Python test only work on the system copy of + # dbusmenu, so while they can be usefule they're not +@@ -41,20 +45,24 @@ check_PROGRAMS = \ + 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 \ + test-gtk-parser ++endif + + XVFB_RUN=". $(srcdir)/run-xvfb.sh" + |