Package: mate-indicator-applet Version: 1.18.0-1 Severity: wishlist Tags: upstream patch User: pkg-ayatana-de...@lists.alioth.debian.org Usertags: ayatanaindicators
Attached is the patch for building MATE's Indicator Applet against Ayatana Indicators. light+love Mike -- System Information: Debian Release: 9.1 APT prefers stable APT policy: (990, 'stable'), (500, 'stable-updates') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages mate-indicator-applet depends on: ii libatk1.0-0 2.22.0-1 ii libc6 2.24-11+deb9u1 ii libcairo-gobject2 1.14.8-1 ii libcairo2 1.14.8-1 ii libgdk-pixbuf2.0-0 2.36.5-2+deb9u1 ii libglib2.0-0 2.50.3-2 ii libgtk-3-0 3.22.11-1 ii libindicator3-7 0.5.0-3+b1 ii libmate-panel-applet-4-1 1.16.2-1 ii libpango-1.0-0 1.40.5-1 ii libpangocairo-1.0-0 1.40.5-1 ii libx11-6 2:1.6.4-3 ii mate-indicator-applet-common 1.18.0-1 ii mate-panel 1.16.2-1 mate-indicator-applet recommends no packages. mate-indicator-applet suggests no packages. -- no debconf information
diff -Nru mate-indicator-applet-1.18.1/debian/changelog mate-indicator-applet-1.18.1/debian/changelog --- mate-indicator-applet-1.18.1/debian/changelog 2017-10-30 14:11:23.000000000 +0100 +++ mate-indicator-applet-1.18.1/debian/changelog 2017-10-30 14:19:40.000000000 +0100 @@ -1,3 +1,13 @@ +mate-indicator-applet (1.18.1-2) UNRELEASED; urgency=medium + + * debian/patches: + + Add 1001_AyatanaIndicators-support.patch. Switch to Ayatana Indicators. + * debian/control: + + Switch to Ayatana Indicators (libido -> libayatana-ido, libindicator -> + libayatana-indicator). + + -- Mike Gabriel <sunwea...@debian.org> Mon, 30 Oct 2017 14:19:40 +0100 + mate-indicator-applet (1.18.1-1) unstable; urgency=medium [ Martin Wimpress ] diff -Nru mate-indicator-applet-1.18.1/debian/control mate-indicator-applet-1.18.1/debian/control --- mate-indicator-applet-1.18.1/debian/control 2017-07-27 23:20:22.000000000 +0200 +++ mate-indicator-applet-1.18.1/debian/control 2017-10-30 14:19:24.000000000 +0100 @@ -11,8 +11,8 @@ dpkg-dev (>= 1.16.1.1), intltool, libgtk-3-dev, - libido3-0.1-dev, - libindicator3-dev, + libayatana-ido3-0.1-dev, + libayatana-indicator3-dev, libmate-panel-applet-dev (>= 1.18), libtool, libx11-dev, diff -Nru mate-indicator-applet-1.18.1/debian/patches/2001_AyatanaIndicators-support.patch mate-indicator-applet-1.18.1/debian/patches/2001_AyatanaIndicators-support.patch --- mate-indicator-applet-1.18.1/debian/patches/2001_AyatanaIndicators-support.patch 1970-01-01 01:00:00.000000000 +0100 +++ mate-indicator-applet-1.18.1/debian/patches/2001_AyatanaIndicators-support.patch 2017-10-30 14:18:58.000000000 +0100 @@ -0,0 +1,123 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ + GTK_REQUIRED_VERSION=3.14.0 + PANEL_REQUIRED_VERSION=1.17.0 + INDICATOR_REQUIRED_VERSION=0.3.90 +-INDICATOR_NG_VERSION=12.10.2 ++INDICATOR_NG_VERSION=0.6.0 + + PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION + x11 +@@ -37,16 +37,16 @@ + AC_SUBST(APPLET_CFLAGS) + AC_SUBST(APPLET_LIBS) + +-PKG_CHECK_EXISTS(indicator3-0.4 >= $INDICATOR_NG_VERSION, ++PKG_CHECK_EXISTS(ayatana-indicator3-0.4 >= $INDICATOR_NG_VERSION, + [have_indicator_ng="yes"], + [have_indicator_ng="no"]) + + if test "x$have_indicator_ng" = "xyes"; then +- PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_NG_VERSION +- libido3-0.1 >= 13.10, ++ PKG_CHECK_MODULES(INDICATOR, ayatana-indicator3-0.4 >= $INDICATOR_NG_VERSION ++ libayatana-ido3-0.4 >= 0.4.0, + [AC_DEFINE(HAVE_INDICATOR_NG, 1, "New style indicators support")]) + else +- PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION) ++ PKG_CHECK_MODULES(INDICATOR, ayatana-indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION) + fi + + AC_SUBST(INDICATOR_CFLAGS) +@@ -64,11 +64,11 @@ + ########################### + + if test "x$with_localinstall" = "xyes"; then +- INDICATORDIR="${libdir}/indicators/2/" +- INDICATORICONSDIR="${datadir}/indicator-applet/icons/" ++ INDICATORDIR="${libdir}/ayatana-indicators3/7/" ++ INDICATORICONSDIR="${datadir}/libayatana-indicator/icons/" + else +- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` +- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4` ++ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator3-0.4` ++ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ayatana-indicator3-0.4` + fi + + AC_SUBST(INDICATORDIR) +--- 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" +@@ -573,19 +573,19 @@ + gint count = 0; + while ((name = g_dir_read_name(dir)) != NULL) { + #ifdef INDICATOR_APPLET_APPMENU +- if (g_strcmp0(name, "libappmenu.so")) { ++ if (g_strcmp0(name, "libayatana-appmenu.so")) { + continue; + } + #else +- if (!g_strcmp0(name, "libappmenu.so")) { ++ if (!g_strcmp0(name, "libayatana-appmenu.so")) { + continue; + } + #endif + #ifdef INDICATOR_APPLET +- if (!g_strcmp0(name, "libme.so")) { ++ if (!g_strcmp0(name, "libayatana-me.so")) { + continue; + } +- if (!g_strcmp0(name, "libdatetime.so")) { ++ if (!g_strcmp0(name, "libayatana-datetime.so")) { + continue; + } + #endif +@@ -602,7 +602,7 @@ + + #if HAVE_INDICATOR_NG + +-#define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators" ++#define INDICATOR_SERVICE_DIR "/usr/share/ayatana/indicators" + + static void + load_indicators_from_indicator_files (GtkWidget *menubar, gint *indicators_loaded) +@@ -630,19 +630,19 @@ + g_free (filename); + + #ifdef INDICATOR_APPLET_APPMENU +- if (g_strcmp0(name, "com.canonical.indicator.appmenu")) { ++ if (g_strcmp0(name, "org.ayatana.indicator.appmenu")) { + continue; + } + #else +- if (!g_strcmp0(name, "com.canonical.indicator.appmenu")) { ++ if (!g_strcmp0(name, "org.ayatana.indicator.appmenu")) { + continue; + } + #endif + #ifdef INDICATOR_APPLET +- if (!g_strcmp0(name, "com.canonical.indicator.me")) { ++ if (!g_strcmp0(name, "org.ayatana.indicator.me")) { + continue; + } +- if (!g_strcmp0(name, "com.canonical.indicator.datetime")) { ++ if (!g_strcmp0(name, "org.ayatana.indicator.datetime")) { + continue; + } + #endif diff -Nru mate-indicator-applet-1.18.1/debian/patches/series mate-indicator-applet-1.18.1/debian/patches/series --- mate-indicator-applet-1.18.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ mate-indicator-applet-1.18.1/debian/patches/series 2017-10-24 20:15:09.000000000 +0200 @@ -0,0 +1 @@ +2001_AyatanaIndicators-support.patch