Package: mate-polkit
Version: 1.16.0-2
Severity: wishlist
Tags: patch upstream
User: pkg-ayatana-de...@lists.alioth.debian.org
Usertags: ayatanaindicators

Hi,

attached is the patch to switch over to Ayatana Indicators. This patch
also enables AppIndicator support in the code which, however, also
disables the xembed code path.

This should be improved upstream. Ideally, mate-polkit attempts to place
an Indicator icon into the indicator-renderer and if that fails it falls
back to gtk_status_icon (xembed API).

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-polkit depends on:
ii  accountsservice        0.6.43-1
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  libpango-1.0-0         1.40.5-1
ii  libpangocairo-1.0-0    1.40.5-1
ii  libpolkit-agent-1-0    0.105-18
ii  libpolkit-gobject-1-0  0.105-18
ii  mate-polkit-common     1.16.0-2
ii  policykit-1            0.105-18

mate-polkit recommends no packages.

mate-polkit suggests no packages.

-- no debconf information
diff -Nru mate-polkit-1.18.1/debian/changelog 
mate-polkit-1.18.1/debian/changelog
--- mate-polkit-1.18.1/debian/changelog 2017-07-24 15:28:52.000000000 +0200
+++ mate-polkit-1.18.1/debian/changelog 2017-10-30 14:39:28.000000000 +0100
@@ -1,3 +1,15 @@
+mate-polkit (1.18.1-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    + Add 1001_switch-to-ayatana-indicators.patch. Switch to Ayatana 
Indicators.
+  * debian/control:
+    + Switch from libappindicator3-dev to libayatana-appindicator3-dev.
+  * debian/rules:
+    + Set configure option --enable-appindicator to auto (which enables
+      the AppIndicator code path).
+
+ -- Mike Gabriel <sunwea...@debian.org>  Mon, 30 Oct 2017 14:39:28 +0100
+
 mate-polkit (1.18.1-1) unstable; urgency=medium
 
   [ Aron Xu ]
diff -Nru mate-polkit-1.18.1/debian/control mate-polkit-1.18.1/debian/control
--- mate-polkit-1.18.1/debian/control   2017-07-24 15:28:52.000000000 +0200
+++ mate-polkit-1.18.1/debian/control   2017-10-30 14:31:58.000000000 +0100
@@ -11,7 +11,7 @@
                dpkg-dev (>= 1.16.1.1),
                gobject-introspection,
                gtk-doc-tools,
-               libappindicator3-dev,
+               libayatana-appindicator3-dev,
                libgirepository1.0-dev,
                libgtk-3-dev (>= 3.14),
                libpolkit-agent-1-dev,
diff -Nru 
mate-polkit-1.18.1/debian/patches/1001_switch-to-ayatana-indicators.patch 
mate-polkit-1.18.1/debian/patches/1001_switch-to-ayatana-indicators.patch
--- mate-polkit-1.18.1/debian/patches/1001_switch-to-ayatana-indicators.patch   
1970-01-01 01:00:00.000000000 +0100
+++ mate-polkit-1.18.1/debian/patches/1001_switch-to-ayatana-indicators.patch   
2017-10-30 14:38:36.000000000 +0100
@@ -0,0 +1,44 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,10 +148,10 @@
+ AM_CONDITIONAL([HAVE_ACCOUNTSSERVICE], [test "x$enable_accountsservice" = 
xyes])
+ 
+ # Application indicator
+-APPINDICATOR_PKG=appindicator3-0.1
++APPINDICATOR_PKG=ayatana-appindicator3-0.1
+ 
+ AC_ARG_ENABLE([appindicator],
+-            
AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for 
application indicators]),
++            
AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for 
Ayatana Indicators]),
+             [enable_appindicator=$enableval],
+             [enable_appindicator="auto"])
+ 
+@@ -165,7 +165,7 @@
+ if test "x$enable_appindicator" = "xyes"; then
+       PKG_CHECK_MODULES(APPINDICATOR,
+                         [$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
+-                        [AC_DEFINE(HAVE_APPINDICATOR, 1, [Have 
AppIndicator])])
++                        [AC_DEFINE(HAVE_APPINDICATOR, 1, [Have Ayatana 
AppIndicator])])
+ fi
+ 
+ AM_CONDITIONAL(HAVE_APPINDICATOR, test "x$enable_appindicator" = "xyes")
+@@ -247,7 +247,7 @@
+         cppflags:                   ${CPPFLAGS}
+ 
+         Accountsservice:            ${enable_accountsservice}
+-        Application indicator:      ${enable_appindicator}
++        Ayatana AppIndicator:       ${enable_appindicator}
+         Maintainer mode:            ${USE_MAINTAINER_MODE}
+         Building api docs:          ${enable_gtk_doc}
+         GObject Introspection:      ${enable_introspection}
+--- a/src/main.c
++++ b/src/main.c
+@@ -30,7 +30,7 @@
+ #include <polkitagent/polkitagent.h>
+ 
+ #ifdef HAVE_APPINDICATOR
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+ 
+ #include "polkitmatelistener.h"
diff -Nru mate-polkit-1.18.1/debian/patches/series 
mate-polkit-1.18.1/debian/patches/series
--- mate-polkit-1.18.1/debian/patches/series    1970-01-01 01:00:00.000000000 
+0100
+++ mate-polkit-1.18.1/debian/patches/series    2017-10-30 14:29:26.000000000 
+0100
@@ -0,0 +1 @@
+1001_switch-to-ayatana-indicators.patch
diff -Nru mate-polkit-1.18.1/debian/rules mate-polkit-1.18.1/debian/rules
--- mate-polkit-1.18.1/debian/rules     2017-07-24 15:28:52.000000000 +0200
+++ mate-polkit-1.18.1/debian/rules     2017-10-30 14:38:07.000000000 +0100
@@ -20,6 +20,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-silent-rules \
                              --localstatedir=/var \
+                             --enable-appindicator=auto \
                              --libdir=/usr/lib/$(shell dpkg-architecture 
-qDEB_BUILD_MULTIARCH) \
                              --includedir=/usr/include/$(shell 
dpkg-architecture -qDEB_BUILD_MULTIARCH) \
                              --libexecdir=/usr/lib/$(shell dpkg-architecture 
-qDEB_BUILD_MULTIARCH)/polkit-mate \

Reply via email to