[arch-commits] Commit in syncthing-gtk/repos/community-any (4 files)

Jaroslav Lichtblau jlichtblau at archlinux.org
Sat Sep 29 19:28:49 UTC 2018


    Date: Saturday, September 29, 2018 @ 19:28:48
  Author: jlichtblau
Revision: 388018

archrelease: copy trunk to community-any

Added:
  syncthing-gtk/repos/community-any/PKGBUILD
    (from rev 388017, syncthing-gtk/trunk/PKGBUILD)
  syncthing-gtk/repos/community-any/kde-statusicon.patch
    (from rev 388017, syncthing-gtk/trunk/kde-statusicon.patch)
Deleted:
  syncthing-gtk/repos/community-any/PKGBUILD
  syncthing-gtk/repos/community-any/kde-statusicon.patch

----------------------+
 PKGBUILD             |   79 +++++++++++++++++++++----------------------
 kde-statusicon.patch |   88 ++++++++++++++++++++++++-------------------------
 2 files changed, 83 insertions(+), 84 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-29 19:28:24 UTC (rev 388017)
+++ PKGBUILD	2018-09-29 19:28:48 UTC (rev 388018)
@@ -1,40 +0,0 @@
-# $Id$
-# 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.4
-pkgrel=1
-epoch=1
-pkgdesc='GTK3 based GUI and notification area icon for Syncthing'
-arch=('any')
-url='https://github.com/syncthing/syncthing-gtk'
-license=('GPL2')
-depends=('syncthing>=0.14.48' 'gtk3' 'libnotify' 'python2-bcrypt'
-        'python2-cairo' 'python2-dateutil' 'python2-gobject')
-makedepends=('python2-setuptools')
-optdepends=('python2-caja: file manager integration for Caja'
-            '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
-        kde-statusicon.patch)
-sha256sums=('586dc60460973c2664cee9f0fe6360b635a5b04278924f61c4bc9041723549f2'
-            '109d8c970045e60251fc64865f05322b23a0995ee6725be02905941cb3a1ae0d')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Enable Gtk.StatusIcon in KDE
-  patch -Np1 -i ../kde-statusicon.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-}

Copied: syncthing-gtk/repos/community-any/PKGBUILD (from rev 388017, syncthing-gtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-29 19:28:48 UTC (rev 388018)
@@ -0,0 +1,39 @@
+# 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.4.2
+pkgrel=1
+epoch=1
+pkgdesc='GTK3 based GUI and notification area icon for Syncthing'
+arch=('any')
+url='https://github.com/syncthing/syncthing-gtk'
+license=('GPL2')
+depends=('syncthing>=0.14.50' 'gtk3' 'libnotify' 'python2-bcrypt'
+        'python2-cairo' 'python2-dateutil' 'python2-gobject')
+makedepends=('python2-setuptools')
+optdepends=('python2-caja: file manager integration for Caja'
+            '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
+        kde-statusicon.patch)
+sha256sums=('9b0a25cd89217f07bcc1f6ed75c54351b71e8471a0aa6843754af5b2c54ac49e'
+            '109d8c970045e60251fc64865f05322b23a0995ee6725be02905941cb3a1ae0d')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Enable Gtk.StatusIcon in KDE
+  patch -Np1 -i ../kde-statusicon.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}

Deleted: kde-statusicon.patch
===================================================================
--- kde-statusicon.patch	2018-09-29 19:28:24 UTC (rev 388017)
+++ kde-statusicon.patch	2018-09-29 19:28:48 UTC (rev 388018)
@@ -1,44 +0,0 @@
-From be3d197db4c7f7b06c88fa7457f27bb7741cd016 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 19:18:34 +0100
-Subject: [PATCH] Enable Gtk.StatusIcon in KDE
-
----
- syncthing_gtk/statusicon.py | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/syncthing_gtk/statusicon.py b/syncthing_gtk/statusicon.py
-index 5f19ee9..b4f7d10 100644
---- a/syncthing_gtk/statusicon.py
-+++ b/syncthing_gtk/statusicon.py
-@@ -26,7 +26,7 @@
- # StatusIconKDE4 | excellent       | usable³   | very good⁵ | usable³    | usable³              | excellent           | excellent |
- # StatusIconQt5  | very good (KF5) | -         | -          | -          | -                    | -                   | -         |
- # StatusIconAppI | good²           | none      | excellent  | none       | none                 | excellent           | good²     |
--# StatusIconGTK3 | none            | excellent | none       | very good¹ | very good¹           | none                | good⁴     |
-+# StatusIconGTK3 | good            | excellent | none       | very good¹ | very good¹           | none                | good⁴     |
- #
- # Notes:
- #  - StatusIconQt5:
-@@ -211,12 +211,6 @@ def __init__(self, *args, **kwargs):
- 				# Unity fakes SysTray support but actually hides all icons...
- 				raise NotImplementedError
- 		
--			if IS_KDE:
--				# While the GTK backend works fine on KDE 4, the StatusIconKDE4 backend will achieve better
--				# results and should be available on any standard KDE 4 installation
--				# (since several KDE applications depend on it)
--				raise NotImplementedError
--		
- 		self._tray = Gtk.StatusIcon()
- 		
- 		self._tray.connect("activate", self._on_click)
-@@ -246,7 +240,7 @@ def _on_embedded_change(self, *args):
- 		# by a fallback icon
- 		is_embedded = self._tray.is_embedded() or not self._tray.get_visible()
- 		# On some desktops, above check fails but tray is always visible
--		is_embedded = is_embedded or IS_LXQT or IS_CINNAMON
-+		is_embedded = is_embedded or IS_KDE or IS_LXQT or IS_CINNAMON
- 		if is_embedded != self.get_property("active"):
- 			self.set_property("active", is_embedded)
- 	

Copied: syncthing-gtk/repos/community-any/kde-statusicon.patch (from rev 388017, syncthing-gtk/trunk/kde-statusicon.patch)
===================================================================
--- kde-statusicon.patch	                        (rev 0)
+++ kde-statusicon.patch	2018-09-29 19:28:48 UTC (rev 388018)
@@ -0,0 +1,44 @@
+From be3d197db4c7f7b06c88fa7457f27bb7741cd016 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 19:18:34 +0100
+Subject: [PATCH] Enable Gtk.StatusIcon in KDE
+
+---
+ syncthing_gtk/statusicon.py | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/syncthing_gtk/statusicon.py b/syncthing_gtk/statusicon.py
+index 5f19ee9..b4f7d10 100644
+--- a/syncthing_gtk/statusicon.py
++++ b/syncthing_gtk/statusicon.py
+@@ -26,7 +26,7 @@
+ # StatusIconKDE4 | excellent       | usable³   | very good⁵ | usable³    | usable³              | excellent           | excellent |
+ # StatusIconQt5  | very good (KF5) | -         | -          | -          | -                    | -                   | -         |
+ # StatusIconAppI | good²           | none      | excellent  | none       | none                 | excellent           | good²     |
+-# StatusIconGTK3 | none            | excellent | none       | very good¹ | very good¹           | none                | good⁴     |
++# StatusIconGTK3 | good            | excellent | none       | very good¹ | very good¹           | none                | good⁴     |
+ #
+ # Notes:
+ #  - StatusIconQt5:
+@@ -211,12 +211,6 @@ def __init__(self, *args, **kwargs):
+ 				# Unity fakes SysTray support but actually hides all icons...
+ 				raise NotImplementedError
+ 		
+-			if IS_KDE:
+-				# While the GTK backend works fine on KDE 4, the StatusIconKDE4 backend will achieve better
+-				# results and should be available on any standard KDE 4 installation
+-				# (since several KDE applications depend on it)
+-				raise NotImplementedError
+-		
+ 		self._tray = Gtk.StatusIcon()
+ 		
+ 		self._tray.connect("activate", self._on_click)
+@@ -246,7 +240,7 @@ def _on_embedded_change(self, *args):
+ 		# by a fallback icon
+ 		is_embedded = self._tray.is_embedded() or not self._tray.get_visible()
+ 		# On some desktops, above check fails but tray is always visible
+-		is_embedded = is_embedded or IS_LXQT or IS_CINNAMON
++		is_embedded = is_embedded or IS_KDE or IS_LXQT or IS_CINNAMON
+ 		if is_embedded != self.get_property("active"):
+ 			self.set_property("active", is_embedded)
+ 	



More information about the arch-commits mailing list