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.14-optional-dumper.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.14-optional-dumper.patch')
| -rw-r--r-- | dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch index 3edc237a748..3a062626d26 100644 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch @@ -1,21 +1,31 @@ --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 +++ configure.ac 2010-09-20 22:05:38.292979567 +0200 -@@ -63,8 +63,15 @@ +@@ -63,8 +63,17 @@ X11_REQUIRED_VERSION=1.3 +AC_ARG_ENABLE([dumper], + AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), -+ [enable_dumper=$enableval], enable_dumper=auto) ++ [enable_dumper=$enableval], [enable_dumper=auto]) +AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"]) + -+if test "x$enable_dumper" != "xno" ; then ++AS_IF([test "x$enable_dumper" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION - x11 >= $X11_REQUIRED_VERSION) -+fi +- x11 >= $X11_REQUIRED_VERSION) ++ x11 >= $X11_REQUIRED_VERSION, ++ [have_dumper=yes] ++) ++]) AC_SUBST(DBUSMENUDUMPER_CFLAGS) AC_SUBST(DBUSMENUDUMPER_LIBS) +@@ -193,1 +193,6 @@ + ++AS_IF([test "x$have_dumper" = "xyes"], ++ AC_MSG_NOTICE([ Dumper: yes]), ++ AC_MSG_NOTICE([ Dumper: no]) ++) ++ --- tools/Makefile.am.orig 2010-09-20 22:02:07.280175897 +0200 +++ tools/Makefile.am 2010-09-20 22:05:15.621664358 +0200 @@ -3,5 +3,9 @@ |