diff options
| author | Dennis Schridde <devurandom@gmx.net> | 2011-02-05 21:15:40 +0100 |
|---|---|---|
| committer | Dennis Schridde <devurandom@gmx.net> | 2011-02-05 21:15:40 +0100 |
| commit | 890bf2bd501ac2088077d6bf4bbde6bd4a1f482e (patch) | |
| tree | 558a5a1b7e32dfb50b90dd0989f638df8b9e7422 /dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch | |
| parent | 3dbe97632b44e3ceedc4d198c3c3b409c3fd96ea (diff) | |
| download | kde-890bf2bd501ac2088077d6bf4bbde6bd4a1f482e.tar.gz kde-890bf2bd501ac2088077d6bf4bbde6bd4a1f482e.tar.bz2 kde-890bf2bd501ac2088077d6bf4bbde6bd4a1f482e.zip | |
[dev-libs/libdbusmenu] Improve patches based on upstream request, revbump
(Portage version: 2.2.0_alpha20/git/Linux x86_64, signed Manifest commit with key 50ED256E)
Diffstat (limited to 'dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch')
| -rw-r--r-- | dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch | 27 |
1 files changed, 20 insertions, 7 deletions
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 index c19ee998026..e178447f7ae 100644 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch @@ -1,12 +1,12 @@ --- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100 +++ configure.ac 2011-01-29 20:42:10.969923186 +0100 -@@ -58,29 +58,35 @@ +@@ -58,29 +58,39 @@ 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) ++ [enable_gtk=$enableval], [enable_gtk=auto]) +AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) + AC_ARG_WITH([gtk], @@ -14,13 +14,16 @@ [Which version of gtk to use @<:@default=2@:>@])], [], [with_gtk=2]) -+AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) + -+if test "x$enable_gtk" != "xno" ; then ++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 - libxml-2.0 >= $XML_REQUIRED_VERSION) +- libxml-2.0 >= $XML_REQUIRED_VERSION) ++ libxml-2.0 >= $XML_REQUIRED_VERSION, ++ [have_gtk=yes] ++) - AC_SUBST(DBUSMENUGTK_CFLAGS) - AC_SUBST(DBUSMENUGTK_LIBS) AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) @@ -28,19 +31,29 @@ [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION) +- libxml-2.0 >= $XML_REQUIRED_VERSION) ++ libxml-2.0 >= $XML_REQUIRED_VERSION, ++ [have_gtk=yes] ++) - AC_SUBST(DBUSMENUGTK_CFLAGS) - AC_SUBST(DBUSMENUGTK_LIBS) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) -AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) -+fi ++]) +AC_SUBST(DBUSMENUGTK_CFLAGS) +AC_SUBST(DBUSMENUGTK_LIBS) ########################### # Dependencies - dumper +@@ -193,1 +193,6 @@ + ++AS_IF([test "x$enable_gtk" = "xyes"], ++ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]), ++ AC_MSG_NOTICE([ Gtk: no]) ++) ++ --- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 +++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 @@ -5,5 +5,9 @@ |