| 1 |
commit: c9e18266ca78374d98ca3c1c24aed191764b53c1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 6 16:08:30 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 6 16:09:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e18266 |
| 7 |
|
| 8 |
dev-libs/libdbusmenu: Fix building w/ USE=-test |
| 9 |
|
| 10 |
.../files/libdbusmenu-16.04.0-configure-fix.patch | 35 ++++++++++++++++++++++ |
| 11 |
dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild | 6 ++-- |
| 12 |
2 files changed, 39 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch |
| 15 |
new file mode 100644 |
| 16 |
index 00000000000..a5787781090 |
| 17 |
--- /dev/null |
| 18 |
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch |
| 19 |
@@ -0,0 +1,35 @@ |
| 20 |
+From 4b79b41a25cc1e2c4355738b4bed6c73b919ffee Mon Sep 17 00:00:00 2001 |
| 21 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 22 |
+Date: Sun, 6 Aug 2017 17:55:45 +0200 |
| 23 |
+Subject: [PATCH] configure: Fix HAVE_VALGRIND not being defined when tests are |
| 24 |
+ disabled |
| 25 |
+ |
| 26 |
+If --disable-tests is used, configure fails with the following error: |
| 27 |
+ |
| 28 |
+ configure: error: conditional "HAVE_VALGRIND" was never defined. |
| 29 |
+ Usually this means the macro was only invoked conditionally. |
| 30 |
+ |
| 31 |
+This is because AM_CONDITIONAL for it is called inside the 'if' for |
| 32 |
+tests being enabled. Move it just below that block to ensure that it's |
| 33 |
+defined unconditionally. |
| 34 |
+--- |
| 35 |
+ configure.ac | 2 +- |
| 36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 37 |
+ |
| 38 |
+diff --git a/configure.ac b/configure.ac |
| 39 |
+index ace54d1..cbd38a6 100644 |
| 40 |
+--- a/configure.ac |
| 41 |
++++ b/configure.ac |
| 42 |
+@@ -120,8 +120,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
| 43 |
+ [have_tests=yes] |
| 44 |
+ ) |
| 45 |
+ PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no) |
| 46 |
+-AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) |
| 47 |
+ ]) |
| 48 |
++AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) |
| 49 |
+ |
| 50 |
+ AC_SUBST(DBUSMENUTESTS_CFLAGS) |
| 51 |
+ AC_SUBST(DBUSMENUTESTS_LIBS) |
| 52 |
+-- |
| 53 |
+2.14.0 |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild |
| 57 |
index 5b4dc1f1df4..131d663ca80 100644 |
| 58 |
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild |
| 59 |
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild |
| 60 |
@@ -8,8 +8,8 @@ VALA_USE_DEPEND=vapigen |
| 61 |
PYTHON_COMPAT=( python2_7 ) |
| 62 |
VIRTUALX_REQUIRED=manual |
| 63 |
|
| 64 |
-inherit flag-o-matic multilib-minimal python-single-r1 vala virtualx \ |
| 65 |
- xdg-utils |
| 66 |
+inherit autotools flag-o-matic multilib-minimal python-single-r1 vala \ |
| 67 |
+ virtualx xdg-utils |
| 68 |
|
| 69 |
DESCRIPTION="Library to pass menu structure across DBus" |
| 70 |
HOMEPAGE="https://launchpad.net/dbusmenu" |
| 71 |
@@ -57,7 +57,9 @@ src_prepare() { |
| 72 |
fi |
| 73 |
python_fix_shebang tools |
| 74 |
|
| 75 |
+ eapply "${FILESDIR}/${P}-configure-fix.patch" |
| 76 |
eapply_user |
| 77 |
+ eautoreconf |
| 78 |
} |
| 79 |
|
| 80 |
multilib_src_configure() { |
Archives