[arch-commits] Commit in syncthing-gtk/trunk (3 files)

[Balló György]

    Date: Sunday, January 28, 2018 @ 09:53:20
  Author: bgyorgy
Revision: 287610

upgpkg: syncthing-gtk 1:0.9.2.7-5

Add back dependency on python2-cairo (FS#57253)

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

---------------------+
 PKGBUILD            |   12 ++++++------
 fix-icon-path.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 fix-icon.patch      |   32 --------------------------------
 3 files changed, 56 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-28 08:51:22 UTC (rev 287609)
+++ PKGBUILD	2018-01-28 09:53:20 UTC (rev 287610)
@@ -5,7 +5,7 @@
 
 pkgname=syncthing-gtk
 pkgver=0.9.2.7
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc='GTK3 based GUI and notification area icon for Syncthing'
 arch=('any')
@@ -12,7 +12,7 @@
 url='https://github.com/syncthing/syncthing-gtk'
 license=('GPL2')
 depends=('syncthing>=0.13' 'gtk3' 'libnotify' 'python2-pyinotify'
-         'python2-bcrypt' 'python2-dateutil' 'python2-gobject')
+         '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'
@@ -20,11 +20,11 @@
 source=($pkgname-$pkgver.tar.gz::https://github.com/syncthing/$pkgname/archive/v$pkgver.tar.gz
         fix-statusicon.patch
         kde-statusicon.patch
-        fix-icon.patch)
+        fix-icon-path.patch)
 sha256sums=('a500665ce2ebd04cf0f51e0b65690dddc258bc495a74b6311604fefe9f3e16ef'
             '5e9d4f89fb503d8761f435ebd03dbb126c0d5df8f00e4fd405fbdd8e5fb4a47c'
             '109d8c970045e60251fc64865f05322b23a0995ee6725be02905941cb3a1ae0d'
-            'cbfcfe6e2dabb9ac374f3bddbabbfe866529ea63d6e428c01e9c2eb88d7fb2c1')
+            '34b752396db02668016c2c2a57b475f4ade9533f50fb682db6f8a9d239a84653')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -35,8 +35,8 @@
   # Enable Gtk.StatusIcon in KDE
   patch -Np1 -i ../kde-statusicon.patch
 
-  # Fix icon on about dialog
-  patch -Np1 -i ../fix-icon.patch
+  # Fix icon path on about dialog
+  patch -Np1 -i ../fix-icon-path.patch
 }
 
 build() {

Added: fix-icon-path.patch
===================================================================
--- fix-icon-path.patch	                        (rev 0)
+++ fix-icon-path.patch	2018-01-28 09:53:20 UTC (rev 287610)
@@ -0,0 +1,50 @@
+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

Deleted: fix-icon.patch
===================================================================
--- fix-icon.patch	2018-01-28 08:51:22 UTC (rev 287609)
+++ fix-icon.patch	2018-01-28 09:53:20 UTC (rev 287610)
@@ -1,32 +0,0 @@
-From a798e2e41dc71951175749a6ac34a07a068871a1 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:53:23 +0100
-Subject: [PATCH] Fix icon on about dialog
-
----
- about.glade | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/about.glade b/about.glade
-index 85cad9d..d0d02ae 100644
---- a/about.glade
-+++ b/about.glade
-@@ -5,7 +5,7 @@
-   <object class="GtkDialog" id="dialog">
-     <property name="can_focus">False</property>
-     <property name="title" translatable="yes">About Syncthing-GTK</property>
--    <property name="icon">icons/st-gtk-logo.png</property>
-+    <property name="icon_name">syncthing-gtk</property>
-     <property name="type_hint">dialog</property>
-     <signal name="response" handler="on_dialog_response" swapped="no"/>
-     <child internal-child="vbox">
-@@ -53,7 +53,8 @@
-                 <property name="visible">True</property>
-                 <property name="can_focus">False</property>
-                 <property name="margin_bottom">10</property>
--                <property name="pixbuf">icons/st-gtk-logo.png</property>
-+                <property name="pixel_size">128</property>
-+                <property name="icon_name">syncthing-gtk</property>
-               </object>
-               <packing>
-                 <property name="expand">False</property>