[mate-indicator-applet] 02/03: debian/patches: Improve 2001_AyatanaIndicators-support.patch. Make sure INDICATORDIR in configure.ac is set correctly, depending on what Indicator implementation we build against.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository mate-indicator-applet.

commit d74a648d05007089caefd6ee48f5aa5fda2fc856
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 6 21:58:18 2017 +0000

    debian/patches: Improve 2001_AyatanaIndicators-support.patch. Make sure INDICATORDIR in configure.ac is set correctly, depending on what Indicator implementation we build against.
---
 .../patches/2001_AyatanaIndicators-support.patch   | 45 ++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/debian/patches/2001_AyatanaIndicators-support.patch b/debian/patches/2001_AyatanaIndicators-support.patch
index 443b70b..f174fe0 100644
--- a/debian/patches/2001_AyatanaIndicators-support.patch
+++ b/debian/patches/2001_AyatanaIndicators-support.patch
@@ -23,9 +23,7 @@
 -                 [have_indicator_ng="yes"],
 -                 [have_indicator_ng="no"])
 +# Which Indicator implementation shall we use?
- 
--if test "x$have_indicator_ng" = "xyes"; then
--    PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_NG_VERSION
++
 +###
 +### Look for Ubuntu Indicators first
 +###
@@ -37,7 +35,9 @@
 +PKG_CHECK_EXISTS(indicator3-0.4 >= $UBUNTU_INDICATOR_NG_VERSION,
 +                 [have_ubuntuindicator_ng="yes"],
 +                 [have_ubuntuindicator_ng="no"])
-+
+ 
+-if test "x$have_indicator_ng" = "xyes"; then
+-    PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_NG_VERSION
 +if test "x$have_ubuntuindicator_ng" = "xyes"; then
 +    PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $UBUNTU_INDICATOR_NG_VERSION
                        libido3-0.1 >= 13.10,
@@ -45,7 +45,8 @@
 +elif test "x$have_ubuntuindicator" = "xyes"; then
 +    PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $UBUNTU_INDICATOR_REQUIRED_VERSION)
 +
-+else
+ else
+-    PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION)
 +
 +    ###
 +    ### If we lack Ubuntu Indicators, look for Ayatana Indicators, alternatively.
@@ -72,12 +73,42 @@
 +    AC_DEFINE(HAVE_AYATANA_INDICATORS, 1, "Ayatana Indicators Support")
 +elif test "x$have_ubuntuindicator" == "xyes"; then
 +    AC_DEFINE(HAVE_UBUNTU_INDICATORS, 1, "Ubuntu Indicators Support")
- else
--    PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION)
++else
 +    AC_MSG_ERROR([Either Ayatana Indicators or Ubuntu Indicators are required to build mate-indicator-applet.])
  fi
  
  AC_SUBST(INDICATOR_CFLAGS)
+@@ -63,12 +107,24 @@
+ # Indicator Info
+ ###########################
+ 
+-if test "x$with_localinstall" = "xyes"; then
+-	INDICATORDIR="${libdir}/indicators/2/"
+-	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
+-else
+-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
++if test "x$have_ubuntuindicator" = "xyes"; then
++	if test "x$with_localinstall" = "xyes"; then
++		INDICATORDIR="${libdir}/indicators3/7/"
++		INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
++	else
++		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
++		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
++	fi
++fi
++
++if test "x$have_ayatanaindicator" = "xyes"; then
++	if test "x$with_localinstall" = "xyes"; then
++		INDICATORDIR="${libdir}/ayatana-indicators3/7/"
++		INDICATORICONSDIR="${datadir}/ayatana-indicator-applet/icons/"
++	else
++		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator3-0.4`
++		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ayatana-indicator3-0.4`
++	fi
+ fi
+ 
+ AC_SUBST(INDICATORDIR)
 --- a/src/applet-main.c
 +++ b/src/applet-main.c
 @@ -28,22 +28,69 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-indicator-applet.git