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.16-optional-tests.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.16-optional-tests.patch')
| -rw-r--r-- | dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch index a6d05369f15..e047cd83bfc 100644 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch @@ -1,21 +1,31 @@ --- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 +++ configure.ac 2010-09-20 22:01:21.623107607 +0200 -@@ -76,8 +76,15 @@ +@@ -76,8 +76,17 @@ JSON_GLIB_REQUIRED_VERSION=0.6.0 GIO_UNIX_REQUIRED_VERSION=2.24 +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Disable tests]), -+ [enable_tests=$enableval], enable_tests=auto) ++ [enable_tests=$enableval], [enable_tests=auto]) +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) + -+if test "x$enable_tests" != "xno" ; then ++AS_IF([test "x$enable_tests" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) -+fi +- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ++ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION, ++ [have_tests=yes] ++) ++]) AC_SUBST(DBUSMENUTESTS_CFLAGS) AC_SUBST(DBUSMENUTESTS_LIBS) +@@ -193,1 +193,6 @@ + ++AS_IF([test "x$have_tests" = "xyes"], ++ AC_MSG_NOTICE([ Tests: yes]), ++ AC_MSG_NOTICE([ Tests: no]) ++) ++ --- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 +++ Makefile.am 2010-09-20 22:01:55.525674385 +0200 @@ -5,2 +5,6 @@ |