[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/
commit: 0778a51ae1cc7db7aaffb790a5225e644cd98f3f Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Aug 11 10:44:36 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Aug 11 10:44:46 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0778a51a dev-libs/libdbusmenu: drop werror, bug #691260 Closes: https://bugs.gentoo.org/691260 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Sergei Trofimovich gentoo.org> .../files/libdbusmenu-16.04.0-werror.patch | 37 ++ dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild| 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-werror.patch b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-werror.patch new file mode 100644 index 000..aaa61785b3b --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-werror.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/691260 + +--- a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am +@@ -68,3 +68,3 @@ libdbusmenu_glib_la_CFLAGS = \ + $(COVERAGE_CFLAGS) \ +- -Wall -Werror -Wno-error=deprecated-declarations \ ++ -Wall -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\"" +--- a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am +@@ -68,3 +68,3 @@ libdbusmenu_gtk_la_CFLAGS = \ + -I$(top_srcdir) \ +- -Wall -Werror -Wno-error=deprecated-declarations \ ++ -Wall -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" +--- a/tests/Makefile.am b/tests/Makefile.am +@@ -105,3 +105,3 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b + DBUSMENU_GLIB_TEST_CFLAGS = \ +- -Wall -Werror \ ++ -Wall \ + -DG_DISABLE_DEPRECATED \ +--- a/tools/Makefile.am b/tools/Makefile.am +@@ -18,3 +18,3 @@ dbusmenu_dumper_CFLAGS = \ + $(DBUSMENUDUMPER_CFLAGS) \ +- -Wall -Werror ++ -Wall + +--- a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am +@@ -14,3 +14,3 @@ dbusmenu_testapp_CFLAGS = \ + $(DBUSMENUGLIB_CFLAGS) \ +- -Wall -Werror ++ -Wall + diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild index a5112080a49..d2da6965ec8 100644 --- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild +++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -59,6 +59,7 @@ src_prepare() { python_fix_shebang tools eapply "${FILESDIR}/${P}-configure-fix.patch" + eapply "${FILESDIR}/${P}-werror.patch" eapply_user eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/
commit: c9e18266ca78374d98ca3c1c24aed191764b53c1 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 6 16:08:30 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Aug 6 16:09:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e18266 dev-libs/libdbusmenu: Fix building w/ USE=-test .../files/libdbusmenu-16.04.0-configure-fix.patch | 35 ++ dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild| 6 ++-- 2 files changed, 39 insertions(+), 2 deletions(-) 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 new file mode 100644 index 000..a5787781090 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch @@ -0,0 +1,35 @@ +From 4b79b41a25cc1e2c4355738b4bed6c73b919ffee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=+Date: Sun, 6 Aug 2017 17:55:45 +0200 +Subject: [PATCH] configure: Fix HAVE_VALGRIND not being defined when tests are + disabled + +If --disable-tests is used, configure fails with the following error: + + configure: error: conditional "HAVE_VALGRIND" was never defined. + Usually this means the macro was only invoked conditionally. + +This is because AM_CONDITIONAL for it is called inside the 'if' for +tests being enabled. Move it just below that block to ensure that it's +defined unconditionally. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ace54d1..cbd38a6 100644 +--- a/configure.ac b/configure.ac +@@ -120,8 +120,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION + [have_tests=yes] + ) + PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no) +-AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) + ]) ++AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) + + AC_SUBST(DBUSMENUTESTS_CFLAGS) + AC_SUBST(DBUSMENUTESTS_LIBS) +-- +2.14.0 + diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild index 5b4dc1f1df4..131d663ca80 100644 --- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild +++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild @@ -8,8 +8,8 @@ VALA_USE_DEPEND=vapigen PYTHON_COMPAT=( python2_7 ) VIRTUALX_REQUIRED=manual -inherit flag-o-matic multilib-minimal python-single-r1 vala virtualx \ - xdg-utils +inherit autotools flag-o-matic multilib-minimal python-single-r1 vala \ + virtualx xdg-utils DESCRIPTION="Library to pass menu structure across DBus" HOMEPAGE="https://launchpad.net/dbusmenu; @@ -57,7 +57,9 @@ src_prepare() { fi python_fix_shebang tools + eapply "${FILESDIR}/${P}-configure-fix.patch" eapply_user + eautoreconf } multilib_src_configure() {