From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8BAA858973 for ; Sun, 24 Jan 2016 09:23:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE715E088B; Sun, 24 Jan 2016 09:22:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3919FE088B for ; Sun, 24 Jan 2016 09:22:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8E5434087F for ; Sun, 24 Jan 2016 09:22:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A4AD102E for ; Sun, 24 Jan 2016 09:22:55 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1453627337.b4d9f2580ecc35ed4f3b07eca904ec078bc9fcff.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-panel/files/, mate-base/mate-panel/ X-VCS-Repository: repo/gentoo X-VCS-Files: mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild X-VCS-Directories: mate-base/mate-panel/ mate-base/mate-panel/files/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: b4d9f2580ecc35ed4f3b07eca904ec078bc9fcff X-VCS-Branch: master Date: Sun, 24 Jan 2016 09:22:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b2191e07-30a1-4f2e-a0f9-6d36f8c5af04 X-Archives-Hash: 141d5c5e715a6f034bceca9c3358e9c0 commit: b4d9f2580ecc35ed4f3b07eca904ec078bc9fcff Author: Gokturk Yuksek binghamton edu> AuthorDate: Sat Jan 3 21:13:00 2015 +0000 Commit: NP Hardass gentoo org> CommitDate: Sun Jan 24 09:22:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4d9f258 mate-base/mate-panel: fix compilation failure with networkmanager #570266 mate-panel-1.8.1 fails to compile with >=net-misc/networkmanager-1.0.8 due to a missing include directive ('-I'). Substitute network manager CFLAGS and LIBS supplied by the pkgconfig macro in configure.ac and use it for applets/clock. Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=570266 Upstream-PR-URL: https://github.com/mate-desktop/mate-panel/pull/388 Package-Manager: portage-2.2.24 Signed-off-by: NP-Hardass gentoo.org> ...mate-panel-1.8.1-fix-networkmanager-flags.patch | 53 ++++++++++++++++++++++ mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild | 5 +- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch b/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch new file mode 100644 index 0000000..f677269 --- /dev/null +++ b/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch @@ -0,0 +1,53 @@ +From f03dff4c416d417238dcd625a24ea85e380e599c Mon Sep 17 00:00:00 2001 +From: Gokturk Yuksek +Date: Sun, 3 Jan 2016 03:17:40 -0500 +Subject: [PATCH 1/1] applets/clock: add missing pkgconfig flags for + NetworkManager + +mate-panel-1.8 fails to compile with NetworkManager >=1.0.8 due to a +missing include directive ('-I'). Substitute network manager CFLAGS +and LIBS supplied by the pkgconfig macro in configure.ac and use it +for applets/clock. + +Signed-off-by: Gokturk Yuksek +--- + applets/clock/Makefile.am | 2 ++ + configure.ac | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am +index 950ecdd..bfb6b45 100644 +--- a/applets/clock/Makefile.am ++++ b/applets/clock/Makefile.am +@@ -39,6 +39,7 @@ CLOCK_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(LIBMATE_PANEL_APPLET_CFLAGS) \ + $(CLOCK_CFLAGS) \ ++ $(NETWORK_MANAGER_CFLAGS) \ + -I$(srcdir)/../../libmate-panel-applet \ + -I$(top_builddir)/libmate-panel-applet \ + -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +@@ -51,6 +52,7 @@ CLOCK_LDADD = \ + ../../libmate-panel-applet/libmate-panel-applet-4.la \ + $(CLOCK_LIBS) \ + $(LIBMATE_PANEL_APPLET_LIBS) \ ++ $(NETWORK_MANAGER_LIBS) \ + libsystem-timezone.la \ + -lm + +diff --git a/configure.ac b/configure.ac +index af5a422..6d1389e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -156,6 +156,8 @@ else + fi + if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then + AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled]) ++ AC_SUBST(NETWORK_MANAGER_CFLAGS) ++ AC_SUBST(NETWORK_MANAGER_LIBS) + fi + + # Make it possible to compile the applets in-process +-- +2.4.10 + diff --git a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild index 6bef441..5acf34d 100644 --- a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild +++ b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -60,7 +60,8 @@ src_prepare() { # Disable python check. sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die - epatch "${FILESDIR}/${P}-update_marco_wm_name.patch" + epatch "${FILESDIR}/${P}-update_marco_wm_name.patch" \ + "${FILESDIR}/${P}-fix-networkmanager-flags.patch" epatch_user