[mate-indicator-applet] 02/02: debian/patches: Add 2001_AyatanaIndicators-support.patch. Build against Ayatana Indicators rather than Ubuntu Indicators.

Mike Gabriel sunweaver at debian.org
Sun May 28 00:41:27 UTC 2017


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

sunweaver pushed a commit to branch feature/ayatanaindicators
in repository mate-indicator-applet.

commit beabce529fb7aa392f228cb2f2ed8cbe17779608
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 28 02:39:58 2017 +0200

    debian/patches: Add 2001_AyatanaIndicators-support.patch. Build against Ayatana Indicators rather than Ubuntu Indicators.
---
 .../patches/2001_AyatanaIndicators-support.patch   | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 41 insertions(+)

diff --git a/debian/patches/2001_AyatanaIndicators-support.patch b/debian/patches/2001_AyatanaIndicators-support.patch
new file mode 100644
index 0000000..a8f7bc5
--- /dev/null
+++ b/debian/patches/2001_AyatanaIndicators-support.patch
@@ -0,0 +1,40 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,8 +46,8 @@
+ esac
+ 
+ INDICATOR_REQUIRED_VERSION=0.3.90
+-INDICATOR_NG_VERSION=12.10.2
+-INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
++INDICATOR_NG_VERSION=0.6.0
++INDICATOR_PKG=ayatana-indicator$INDICATOR_API_VERSION-0.4
+ 
+ PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
+                           x11
+@@ -63,7 +63,7 @@
+ 
+ if test "x$with_gtk" = "x3.0" && test "x$have_indicator_ng" = "xyes"; then
+     PKG_CHECK_MODULES(INDICATOR, $INDICATOR_PKG >= $INDICATOR_NG_VERSION
+-                      libido3-0.1 >= 13.10,
++                      libayatana-ido3-0.4 >= 0.4.0,
+                       [AC_DEFINE(HAVE_INDICATOR_NG, 1, "New style indicators support")])
+ else
+     PKG_CHECK_MODULES(INDICATOR, $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION)
+--- a/src/applet-main.c
++++ b/src/applet-main.c
+@@ -28,12 +28,12 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ 
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ 
+ /* For new style indicators */
+ #if HAVE_INDICATOR_NG
+-#include <libido/libido.h>
+-#include <libindicator/indicator-ng.h>
++#include <libayatana-ido/libayatana-ido.h>
++#include <libayatana-indicator/indicator-ng.h>
+ #endif
+ 
+ #include "tomboykeybinder.h"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..144ae70
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_AyatanaIndicators-support.patch

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



More information about the pkg-mate-commits mailing list