mate-extra/mate-indicator-applet: Fix configure.ac for indicator-ng #593680

Package-Manager: portage-2.3.0

diff --git a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch b/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
new file mode 100644 (file)
index 0000000..b9ae4fc
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
@@ -0,0 +1,30 @@
+From 06f6db28648cdeff02cc07f9a7f1410b228450a4 Mon Sep 17 00:00:00 2001
+From: monsta <monsta@inbox.ru>
+Date: Wed, 14 Sep 2016 18:20:25 +0300
+Subject: [PATCH] check for libindicator 12.10.2 for new style indicators
+ support
+
+fixes build on Gentoo which has 12.10.1 - turned out this version
+had no indicator-ng yet.
+
+note that (as of now) 12.10.2 isn't officially released upstream,
+and Ubuntu has post-12.10.1 repo snapshot packaged and labeled as
+12.10.2. however, that snapshot already has 12.10.2 version in .pc
+file, so the build works with it.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5e9c505..9b4dafc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,7 +46,7 @@ case "$with_gtk" in
+ esac
+ 
+ INDICATOR_REQUIRED_VERSION=0.3.90
+-INDICATOR_NG_VERSION=12.10
++INDICATOR_NG_VERSION=12.10.2
+ INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
+ 
+ PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION

diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
similarity index 91%
rename from mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1.ebuild
rename to mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
index 005272549324c072ad494ea9902bd8b4b30f2526..605c790c1d8ed8a63542c89718b57a0ac2147505 100644 (file)
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${COMMON_DEPEND}
        >=dev-util/intltool-0.35.0
        virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-indicator-ng-configure-fix.patch" )
+
 src_configure() {
        mate_src_configure \
                --with-gtk=$(usex gtk3 3.0 2.0)