[Python-apps-team] Bug#906043: Please prefer Ayatana AppIndicator

[Mike Gabriel]

Package: kupfer
Version: _0+v319-3
Severity: wishlist
User: pkg-ayatana-devel at lists.alioth.debian.org
Usertags: ayatana-appindicator

Dear maintainer of kupfer,

find attached a .debdiff that prefers Ayatana AppIndicator support  
over Ubuntu's AppIndicator support for displaying the system tray icon  
when in AppIndicator mode (see preferences).

This contribution is part of the Ayatana Indicators shift in Debian.

For more info, see
https://lists.debian.org/debian-devel/2018/03/msg00506.html

IMPORTANT: The .debdiff lacks a small step that needs to be done manually...

mkdir -p debian/hicolor/16x16/apps/
convert -scale 16x16 auxdata/hicolor/128x128/apps/kupfer.png  
debian/hicolor/16x16/apps/kupfer.png

The convert command can be found in the imagemagick package.

Thanks,
Mike
-- 

DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
mobile: +49 (1520) 1976 148
landline: +49 (4354) 8390 139

GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22  0782 9AF4 6B30 2577 1B31
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de

-------------- next part --------------
diff -Nru kupfer-0+v319/debian/changelog kupfer-0+v319/debian/changelog
--- kupfer-0+v319/debian/changelog	2018-07-31 14:22:19.000000000 +0200
+++ kupfer-0+v319/debian/changelog	2018-08-13 16:11:30.000000000 +0200
@@ -1,3 +1,17 @@
+kupfer (0+v319-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+
+  * debian/patches:
+    + Add ayatana-appindicator.patch. Prefer building against
+      Ayatana AppIndicator shared lib.
+  * debian/hicolor/**:
+    + Additionally provide 16x16 application icon, fixes display problem
+      when kupfer is used in AppIndicator mode on i3 (which lacks AppIndicator
+      and triggers the fallback GtkStatusIcon code in AppIndicator).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 13 Aug 2018 16:11:30 +0200
+
 kupfer (0+v319-3) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru kupfer-0+v319/debian/control kupfer-0+v319/debian/control
--- kupfer-0+v319/debian/control	2018-07-31 14:22:19.000000000 +0200
+++ kupfer-0+v319/debian/control	2018-08-13 14:27:43.000000000 +0200
@@ -25,7 +25,7 @@
          ${misc:Depends},
          ${python3:Depends}
 Recommends: yelp, python3-wnck (>= 3.20)
-Suggests: python3-setproctitle, gir1.2-appindicator3-0.1
+Suggests: python3-setproctitle, gir1.2-ayatanaappindicator3-0.1
 Description: fast and lightweight desktop summoner/launcher
  Kupfer is a summoner/launcher in the style of Quicksilver or GNOME Do. It
  can search and browse your files, launch desired applications and object you
Binary files /tmp/XQgnYZooit/kupfer-0+v319/debian/hicolor/16x16/apps/kupfer.png and /tmp/oevOhei6z0/kupfer-0+v319/debian/hicolor/16x16/apps/kupfer.png differ
diff -Nru kupfer-0+v319/debian/patches/ayatana-appindicator.patch kupfer-0+v319/debian/patches/ayatana-appindicator.patch
--- kupfer-0+v319/debian/patches/ayatana-appindicator.patch	1970-01-01 01:00:00.000000000 +0100
+++ kupfer-0+v319/debian/patches/ayatana-appindicator.patch	2018-08-13 14:30:44.000000000 +0200
@@ -0,0 +1,28 @@
+--- a/kupfer/ui/browser.py
++++ b/kupfer/ui/browser.py
+@@ -11,12 +11,23 @@
+ from gi.repository import GLib, Gio, Pango
+ from gi.repository import GdkPixbuf
+ 
++# try loading Ayatana AppIndicator first
+ try:
+-    gi.require_version("AppIndicator3", "0.1")
++    gi.require_version("AyatanaAppIndicator3", "0.1")
+ except ValueError:
+     AppIndicator3 = None
+ else:
+-    from gi.repository import AppIndicator3
++    from gi.repository import AyatanaAppIndicator3 as AppIndicator3
++
++
++# if that fails, try falling back to Ubuntu's AppIndicator
++if AppIndicator3 == None:
++    try:
++        gi.require_version("AppIndicator3", "0.1")
++    except ValueError:
++        AppIndicator3 = None
++    else:
++        from gi.repository import AppIndicator3
+ 
+ import cairo
+ 
diff -Nru kupfer-0+v319/debian/patches/series kupfer-0+v319/debian/patches/series
--- kupfer-0+v319/debian/patches/series	2018-07-31 14:22:19.000000000 +0200
+++ kupfer-0+v319/debian/patches/series	2018-08-13 14:28:15.000000000 +0200
@@ -1 +1,2 @@
 fix-desktop-file.patch
+ayatana-appindicator.patch
diff -Nru kupfer-0+v319/debian/rules kupfer-0+v319/debian/rules
--- kupfer-0+v319/debian/rules	2018-07-31 14:22:19.000000000 +0200
+++ kupfer-0+v319/debian/rules	2018-08-13 16:10:22.000000000 +0200
@@ -17,6 +17,8 @@
 override_dh_auto_install:
 	./waf install --destdir=$(CURDIR)/debian/kupfer
 	install -m 0755 $(CURDIR)/build/bin/kupfer $(CURDIR)/debian/kupfer/usr/share/kupfer/kupfer-activate.sh
+	mkdir -p $(CURDIR)/debian/kupfer/usr/share/icons/hicolor/16x16/apps/
+	install -m 0644 $(CURDIR)/debian/hicolor/16x16/apps/kupfer.png $(CURDIR)/debian/kupfer/usr/share/icons/hicolor/16x16/apps/kupfer.png
 	rm -f $(CURDIR)/debian/kupfer/usr/share/kupfer/kupfer/kupfer
 	rm -f $(CURDIR)/debian/kupfer/usr/share/gnome/help/kupfer/*/license.page
 	rm -f $(CURDIR)/debian/kupfer/usr/share/kupfer/art/COPYING
diff -Nru kupfer-0+v319/debian/source/include-binaries kupfer-0+v319/debian/source/include-binaries
--- kupfer-0+v319/debian/source/include-binaries	1970-01-01 01:00:00.000000000 +0100
+++ kupfer-0+v319/debian/source/include-binaries	2018-08-13 16:09:35.000000000 +0200
@@ -0,0 +1 @@
+debian/hicolor/16x16/apps/kupfer.png
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 851 bytes
Desc: Digitale PGP-Signatur
URL: <http://alioth-lists.debian.net/pipermail/python-apps-team/attachments/20180813/9c8cbc3c/attachment.sig>