[arch-commits] Commit in syncthing-gtk/trunk (PKGBUILD fix-statusicon.patch)

[Jaroslav Lichtblau]

    Date: Monday, February 19, 2018 @ 18:52:18
  Author: jlichtblau
Revision: 296404

upgpkg: syncthing-gtk 1:0.9.3-1 - new upstream release

Modified:
  syncthing-gtk/trunk/PKGBUILD
Deleted:
  syncthing-gtk/trunk/fix-statusicon.patch

----------------------+
 PKGBUILD             |   23 +++++++++--------------
 fix-statusicon.patch |   23 -----------------------
 2 files changed, 9 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-19 18:36:05 UTC (rev 296403)
+++ PKGBUILD	2018-02-19 18:52:18 UTC (rev 296404)
@@ -1,11 +1,11 @@
 # $Id$
-# Maintainer: Martin Wimpress <code at flexion.org>
 # Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Martin Wimpress <code at flexion.org>
 # Contributor: kozec <kozec at kozec dot com>
 
 pkgname=syncthing-gtk
-pkgver=0.9.2.7
-pkgrel=5
+pkgver=0.9.3
+pkgrel=1
 epoch=1
 pkgdesc='GTK3 based GUI and notification area icon for Syncthing'
 arch=('any')
@@ -18,11 +18,9 @@
             'python2-nautilus: file manager integration for Nautilus'
             'nemo-python: file manager integration for Nemo')
 source=($pkgname-$pkgver.tar.gz::https://github.com/syncthing/$pkgname/archive/v$pkgver.tar.gz
-        fix-statusicon.patch
         kde-statusicon.patch
         fix-icon-path.patch)
-sha256sums=('a500665ce2ebd04cf0f51e0b65690dddc258bc495a74b6311604fefe9f3e16ef'
-            '5e9d4f89fb503d8761f435ebd03dbb126c0d5df8f00e4fd405fbdd8e5fb4a47c'
+sha256sums=('c5eaf6d80ad0479f8e8d59c65d6ab4f9c96325175704a15bbb10e5fb8bb4988a'
             '109d8c970045e60251fc64865f05322b23a0995ee6725be02905941cb3a1ae0d'
             '34b752396db02668016c2c2a57b475f4ade9533f50fb682db6f8a9d239a84653')
 
@@ -29,9 +27,6 @@
 prepare() {
   cd $pkgname-$pkgver
 
-  # Fix invisible tray icon
-  patch -Np1 -i ../fix-statusicon.patch
-
   # Enable Gtk.StatusIcon in KDE
   patch -Np1 -i ../kde-statusicon.patch
 
@@ -46,11 +41,11 @@
 
 package() {
   cd $pkgname-$pkgver
-  python2 setup.py install --root="$pkgdir" --optimize=1
+  python2 setup.py install --root="${pkgdir}" --optimize=1
 
   # Move filemanager extensions into their right place (FS#57123)
-  mkdir -p "$pkgdir"/usr/share/{caja,nautilus,nemo}-python/extensions/
-  mv "$pkgdir"/usr/share/syncthing-gtk/syncthing-plugin-caja.py "$pkgdir"/usr/share/caja-python/extensions/
-  mv "$pkgdir"/usr/share/syncthing-gtk/syncthing-plugin-nautilus.py "$pkgdir"/usr/share/nautilus-python/extensions/
-  mv "$pkgdir"/usr/share/syncthing-gtk/syncthing-plugin-nemo.py "$pkgdir"/usr/share/nemo-python/extensions/
+  mkdir -p "${pkgdir}"/usr/share/{caja,nautilus,nemo}-python/extensions/
+  mv "${pkgdir}"/usr/share/syncthing-gtk/syncthing-plugin-caja.py "${pkgdir}"/usr/share/caja-python/extensions/
+  mv "${pkgdir}"/usr/share/syncthing-gtk/syncthing-plugin-nautilus.py "${pkgdir}"/usr/share/nautilus-python/extensions/
+  mv "${pkgdir}"/usr/share/syncthing-gtk/syncthing-plugin-nemo.py "${pkgdir}"/usr/share/nemo-python/extensions/
 }

Deleted: fix-statusicon.patch
===================================================================
--- fix-statusicon.patch	2018-02-19 18:36:05 UTC (rev 296403)
+++ fix-statusicon.patch	2018-02-19 18:52:18 UTC (rev 296404)
@@ -1,23 +0,0 @@
-From a6f6d11d42de34d0f6519c349f19217e269f6f56 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Fri, 26 Jan 2018 11:40:06 +0100
-Subject: [PATCH] Fix invisible tray icon
-
-It should call set_from_icon_name() instead of set_from_file(), otherwise it tries to set the icon from an invalid path.
----
- syncthing_gtk/statusicon.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/syncthing_gtk/statusicon.py b/syncthing_gtk/statusicon.py
-index dc784ea..5f19ee9 100644
---- a/syncthing_gtk/statusicon.py
-+++ b/syncthing_gtk/statusicon.py
-@@ -240,7 +240,7 @@ def set(self, icon=None, text=None):
- 	def _on_embedded_change(self, *args):
- 		# Without an icon update at this point GTK might consider the icon embedded and visible even through
- 		# it can't actually be seen...
--		self._tray.set_from_file(self._get_icon())
-+		self._tray.set_from_icon_name(self._get_icon())
- 		
- 		# An invisible tray icon will never be embedded but it also should not be replaced
- 		# by a fallback icon