Attachment #421722 for bug #570266

View | Details | Raw Unified | Return to bug 570266
Collapse All | Expand All




From f03dff4c416d417238dcd625a24ea85e380e599c Mon Sep 17 00:00:00 2001
From: Gokturk Yuksek <gokturk@binghamton.edu>
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 <gokturk@binghamton.edu>
---
 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


Lines 1-4 Link Here

(-)a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild (-3 / +3 lines)
1	# Copyright 1999-2015 Gentoo Foundation	1	# Copyright 1999-2016 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Id$	3	# $Id$
4		4
Lines 60-66 src_prepare() { Link Here
60	# Disable python check.	60	# Disable python check.
61	sed -e '/AM_PATH_PYTHON/d' -i configure.ac \|\| die	61	sed -e '/AM_PATH_PYTHON/d' -i configure.ac \|\| die
62		62
63	epatch "${FILESDIR}/${P}-update_marco_wm_name.patch"	63	epatch "${FILESDIR}/${P}-update_marco_wm_name.patch" \
		64	"${FILESDIR}/${P}-fix-networkmanager-flags.patch"
64		65
65	epatch_user	66	epatch_user
66		67
67	-

Return to bug 570266

Line 0 Link Here

(-)a/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch (+53 lines)
	1	From f03dff4c416d417238dcd625a24ea85e380e599c Mon Sep 17 00:00:00 2001
	2	From: Gokturk Yuksek <gokturk@binghamton.edu>
	3	Date: Sun, 3 Jan 2016 03:17:40 -0500
	4	Subject: [PATCH 1/1] applets/clock: add missing pkgconfig flags for
	5	NetworkManager
	6
	7	mate-panel-1.8 fails to compile with NetworkManager >=1.0.8 due to a
	8	missing include directive ('-I'). Substitute network manager CFLAGS
	9	and LIBS supplied by the pkgconfig macro in configure.ac and use it
	10	for applets/clock.
	11
	12	Signed-off-by: Gokturk Yuksek <gokturk@binghamton.edu>
	13	---
	14	applets/clock/Makefile.am \| 2 ++
	15	configure.ac \| 2 ++
	16	2 files changed, 4 insertions(+)
	17
	18	diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
	19	index 950ecdd..bfb6b45 100644
	20	--- a/applets/clock/Makefile.am
	21	+++ b/applets/clock/Makefile.am
	22	@@ -39,6 +39,7 @@ CLOCK_CPPFLAGS = \
	23	$(AM_CPPFLAGS) \
	24	$(LIBMATE_PANEL_APPLET_CFLAGS) \
	25	$(CLOCK_CFLAGS) \
	26	+ $(NETWORK_MANAGER_CFLAGS) \
	27	-I$(srcdir)/../../libmate-panel-applet \
	28	-I$(top_builddir)/libmate-panel-applet \
	29	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
	30	@@ -51,6 +52,7 @@ CLOCK_LDADD = \
	31	../../libmate-panel-applet/libmate-panel-applet-4.la \
	32	$(CLOCK_LIBS) \
	33	$(LIBMATE_PANEL_APPLET_LIBS) \
	34	+ $(NETWORK_MANAGER_LIBS) \
	35	libsystem-timezone.la \
	36	-lm
	37
	38	diff --git a/configure.ac b/configure.ac
	39	index af5a422..6d1389e 100644
	40	--- a/configure.ac
	41	+++ b/configure.ac
	42	@@ -156,6 +156,8 @@ else
	43	fi
	44	if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then
	45	AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled])
	46	+ AC_SUBST(NETWORK_MANAGER_CFLAGS)
	47	+ AC_SUBST(NETWORK_MANAGER_LIBS)
	48	fi
	49
	50	# Make it possible to compile the applets in-process
	51	--
	52	2.4.10
	53