Date: Monday, April 2, 2018 @ 17:02:33
Author: jlichtblau
Revision: 313896
archrelease: copy trunk to community-any
Added:
syncthing-gtk/repos/community-any/PKGBUILD
(from rev 313894, syncthing-gtk/trunk/PKGBUILD)
syncthing-gtk/repos/community-any/kde-statusicon.patch
(from rev 313895, syncthing-gtk/trunk/kde-statusicon.patch)
Deleted:
syncthing-gtk/repos/community-any/PKGBUILD
syncthing-gtk/repos/community-any/fix-icon-path.patch
syncthing-gtk/repos/community-any/kde-statusicon.patch
----------------------+
PKGBUILD | 97 +++++++++++++++++++++++--------------------------
fix-icon-path.patch | 50 -------------------------
kde-statusicon.patch | 88 ++++++++++++++++++++++----------------------
3 files changed, 90 insertions(+), 145 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-02 17:02:27 UTC (rev 313895)
+++ PKGBUILD 2018-04-02 17:02:33 UTC (rev 313896)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org>
-# Contributor: Martin Wimpress <c...@flexion.org>
-# Contributor: kozec <kozec at kozec dot com>
-
-pkgname=syncthing-gtk
-pkgver=0.9.3
-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.13' 'gtk3' 'libnotify' 'python2-pyinotify'
- '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
- fix-icon-path.patch)
-sha256sums=('c5eaf6d80ad0479f8e8d59c65d6ab4f9c96325175704a15bbb10e5fb8bb4988a'
- '109d8c970045e60251fc64865f05322b23a0995ee6725be02905941cb3a1ae0d'
- '34b752396db02668016c2c2a57b475f4ade9533f50fb682db6f8a9d239a84653')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Enable Gtk.StatusIcon in KDE
- patch -Np1 -i ../kde-statusicon.patch
-
- # Fix icon path on about dialog
- patch -Np1 -i ../fix-icon-path.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- python2 setup.py build
-}
-
-package() {
- cd $pkgname-$pkgver
- 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/
-}
Copied: syncthing-gtk/repos/community-any/PKGBUILD (from rev 313894,
syncthing-gtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-02 17:02:33 UTC (rev 313896)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org>
+# Contributor: Martin Wimpress <c...@flexion.org>
+# Contributor: kozec <kozec at kozec dot com>
+
+pkgname=syncthing-gtk
+pkgver=0.9.3.1
+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.13' 'gtk3' 'libnotify' 'python2-pyinotify'
+ '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=('0adcdd4be83f2e65aeeb5250d6d4b69c12216dbd740c8051b6a434a9154bd9b4'
+ '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
+
+ # 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/
+}
Deleted: fix-icon-path.patch
===================================================================
--- fix-icon-path.patch 2018-04-02 17:02:27 UTC (rev 313895)
+++ fix-icon-path.patch 2018-04-02 17:02:33 UTC (rev 313896)
@@ -1,50 +0,0 @@
-From bee33afd49644754140c327677b01ec1e486dcde Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Fri, 26 Jan 2018 20:20:34 +0100
-Subject: [PATCH] Fix icon path on about dialog
-
----
- syncthing_gtk/aboutdialog.py | 7 +++++--
- syncthing_gtk/app.py | 2 +-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/syncthing_gtk/aboutdialog.py b/syncthing_gtk/aboutdialog.py
-index 8f788f8..2e5a431 100644
---- a/syncthing_gtk/aboutdialog.py
-+++ b/syncthing_gtk/aboutdialog.py
-@@ -10,8 +10,9 @@
-
- class AboutDialog(object):
- """ Standard looking about dialog """
-- def __init__(self, app, gladepath):
-+ def __init__(self, app, gladepath, iconpath):
- self.gladepath = gladepath
-+ self.iconpath = iconpath
- self.setup_widgets(app)
-
- def show(self, parent=None):
-@@ -28,8 +29,10 @@ def close(self):
- self.dialog.destroy()
-
- def setup_widgets(self, app):
-- # Load glade file
- self.builder = UIBuilder()
-+ # Fix icon path
-+ self.builder.replace_icon_path("icons/", self.iconpath)
-+ # Load glade file
- self.builder.add_from_file(os.path.join(self.gladepath,
"about.glade"))
- self.builder.connect_signals(self)
- self.dialog = self.builder.get_object("dialog")
-diff --git a/syncthing_gtk/app.py b/syncthing_gtk/app.py
-index f910ca5..6d21487 100644
---- a/syncthing_gtk/app.py
-+++ b/syncthing_gtk/app.py
-@@ -1699,7 +1699,7 @@ def cb_exit(self, *a):
-
- def cb_about(self, *a):
- from syncthing_gtk.aboutdialog import AboutDialog
-- AboutDialog(self, self.gladepath).show(self["window"])
-+ AboutDialog(self, self.gladepath,
self.iconpath).show(self["window"])
-
- def cb_delete_event(self, *e):
- # Hide main window
Deleted: kde-statusicon.patch
===================================================================
--- kde-statusicon.patch 2018-04-02 17:02:27 UTC (rev 313895)
+++ kde-statusicon.patch 2018-04-02 17:02:33 UTC (rev 313896)
@@ -1,44 +0,0 @@
-From be3d197db4c7f7b06c88fa7457f27bb7741cd016 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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
313895, syncthing-gtk/trunk/kde-statusicon.patch)
===================================================================
--- kde-statusicon.patch (rev 0)
+++ kde-statusicon.patch 2018-04-02 17:02:33 UTC (rev 313896)
@@ -0,0 +1,44 @@
+From be3d197db4c7f7b06c88fa7457f27bb7741cd016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@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)
+
