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

[Jaroslav Lichtblau]

    Date: Monday, April 2, 2018 @ 17:02:14
  Author: jlichtblau
Revision: 313894

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

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

---------------------+
 PKGBUILD            |   13 ++++---------
 fix-icon-path.patch |   50 --------------------------------------------------
 2 files changed, 4 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-02 17:02:01 UTC (rev 313893)
+++ PKGBUILD	2018-04-02 17:02:14 UTC (rev 313894)
@@ -4,7 +4,7 @@
 # Contributor: kozec <kozec at kozec dot com>
 
 pkgname=syncthing-gtk
-pkgver=0.9.3
+pkgver=0.9.3.1
 pkgrel=1
 epoch=1
 pkgdesc='GTK3 based GUI and notification area icon for Syncthing'
@@ -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
-        kde-statusicon.patch
-        fix-icon-path.patch)
-sha256sums=('c5eaf6d80ad0479f8e8d59c65d6ab4f9c96325175704a15bbb10e5fb8bb4988a'
-            '109d8c970045e60251fc64865f05322b23a0995ee6725be02905941cb3a1ae0d'
-            '34b752396db02668016c2c2a57b475f4ade9533f50fb682db6f8a9d239a84653')
+        kde-statusicon.patch)
+sha256sums=('0adcdd4be83f2e65aeeb5250d6d4b69c12216dbd740c8051b6a434a9154bd9b4'
+            '109d8c970045e60251fc64865f05322b23a0995ee6725be02905941cb3a1ae0d')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -29,9 +27,6 @@
 
   # 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() {

Deleted: fix-icon-path.patch
===================================================================
--- fix-icon-path.patch	2018-04-02 17:02:01 UTC (rev 313893)
+++ fix-icon-path.patch	2018-04-02 17:02:14 UTC (rev 313894)
@@ -1,50 +0,0 @@
-From bee33afd49644754140c327677b01ec1e486dcde 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 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