[gtg-git] Update patches.

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@379 df209809-8e4a-0410-9a64-c169741eb0fc

5 files changed, 59 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6016c8e3c87..adfd5a87a020 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtg-git
 	pkgdesc = Personal GTD like organizer for the GNOME desktop environment. Git version.
-	pkgver = r5107.767bfca
+	pkgver = r5112.1328f1d
 	pkgrel = 1
 	url = http://gtgnome.net/
 	install = gtg-git.install
@@ -37,11 +37,9 @@ pkgbase = gtg-git
 	optdepends = python-launchpadlib: for Launchpad synchronization service
 	conflicts = gtg
 	source = gtg-git::git+https://github.com/getting-things-gnome/gtg
-	source = 0001-plugin-API-Open-preference-file-for-reading-as-binar.patch
-	source = 0002-No-need-to-use-unicode-on-strs.patch
+	source = 0001-Remove-has_separator-property.patch
 	md5sums = SKIP
-	md5sums = 443cf942f731a97c031a0118d3a2c895
-	md5sums = 6850a96df56027f7eee02054ad2554af
+	md5sums = a79aab175a0434928e5da2c12f94abb8
 
 pkgname = gtg-git
 
diff --git a/0001-Remove-has_separator-property.patch b/0001-Remove-has_separator-property.patch
new file mode 100644
index 000000000000..eeba0ccdcf44
--- /dev/null
+++ b/0001-Remove-has_separator-property.patch
@@ -0,0 +1,52 @@
+From 13aed8d5fa5c51bd97ad026b14bba21cadec7420 Mon Sep 17 00:00:00 2001
+From: Olivier Mehani <olivier.mehani@nicta.com.au>
+Date: Fri, 24 Oct 2014 11:06:45 +1100
+Subject: [PATCH] Remove has_separator property
+
+Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au>
+---
+ GTG/plugins/hamster/hamster.py  | 2 +-
+ GTG/plugins/hamster/prefs.ui    | 1 -
+ GTG/taskbrowser/gtd-gnome.glade | 1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/GTG/plugins/hamster/hamster.py b/GTG/plugins/hamster/hamster.py
+index 2badf8b..cbc97d4 100644
+--- a/GTG/plugins/hamster/hamster.py
++++ b/GTG/plugins/hamster/hamster.py
+@@ -90,7 +90,7 @@ class hamsterPlugin:
+ 
+         category = ""
+         if self.preferences['category'] == 'auto_tag':
+-            hamster_activities = dict([(str(x[0]), unicode(x[1]))
++            hamster_activities = dict([(str(x[0]), x[1])
+                                        for x in
+                                        self.hamster.GetActivities('')])
+             if (gtg_title in hamster_activities
+diff --git a/GTG/plugins/hamster/prefs.ui b/GTG/plugins/hamster/prefs.ui
+index 66e394e..82f94f7 100644
+--- a/GTG/plugins/hamster/prefs.ui
++++ b/GTG/plugins/hamster/prefs.ui
+@@ -5,7 +5,6 @@
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Hamster Preferences</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
+     <signal name="delete_event" handler="prefs_close"/>
+     <child internal-child="vbox">
+       <object class="GtkBox" id="dialog-vbox1">
+diff --git a/GTG/taskbrowser/gtd-gnome.glade b/GTG/taskbrowser/gtd-gnome.glade
+index 831f207..20349c6 100644
+--- a/GTG/taskbrowser/gtd-gnome.glade
++++ b/GTG/taskbrowser/gtd-gnome.glade
+@@ -499,7 +499,6 @@
+     <property name="title" translatable="yes">Confirm task deletion</property>
+     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+-    <property name="has_separator">False</property>
+     <signal name="close" handler="on_delete_cancel"/>
+     <child internal-child="vbox">
+       <widget class="GtkVBox" id="dialog-vbox1">
+-- 
+2.1.2
+
diff --git a/0001-plugin-API-Open-preference-file-for-reading-as-binar.patch b/0001-plugin-API-Open-preference-file-for-reading-as-binar.patch
deleted file mode 100644
index 5330fde41e3d..000000000000
--- a/0001-plugin-API-Open-preference-file-for-reading-as-binar.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 767bfca97a931def28d354d18c1ec3541779ff59 Mon Sep 17 00:00:00 2001
-From: Olivier Mehani <shtrom+gtg@ssji.net>
-Date: Wed, 18 Jun 2014 09:46:31 +1000
-Subject: [PATCH] [plugin API] Open preference file for reading as binary
-
-Otherwise, the file is not readable as such when reloading, and the
-plugin (e.g., Hamster integration) always uses the defaults.
-
-Signed-off-by: Olivier Mehani <shtrom+gtg@ssji.net>
----
- GTG/core/plugins/api.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/GTG/core/plugins/api.py b/GTG/core/plugins/api.py
-index 6e881f4..09c3f4f 100644
---- a/GTG/core/plugins/api.py
-+++ b/GTG/core/plugins/api.py
-@@ -237,7 +237,7 @@ class PluginAPI:
-         if os.path.isdir(dirname):
-             if os.path.isfile(path):
-                 try:
--                    with open(path, 'r') as file:
-+                    with open(path, 'rb') as file:
-                         item = pickle.load(file)
-                         config.update(item)
-                 except:
--- 
-2.0.0
-
diff --git a/0002-No-need-to-use-unicode-on-strs.patch b/0002-No-need-to-use-unicode-on-strs.patch
deleted file mode 100644
index c614eea367a6..000000000000
--- a/0002-No-need-to-use-unicode-on-strs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f10a378cb1efc6fa73f0f113968efcc8221eb287 Mon Sep 17 00:00:00 2001
-From: Olivier Mehani <olivier.mehani@nicta.com.au>
-Date: Wed, 18 Jun 2014 13:11:01 +1000
-Subject: [PATCH 2/2] No need to use unicode() on strs
-
-Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au>
----
- GTG/plugins/hamster/hamster.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/GTG/plugins/hamster/hamster.py b/GTG/plugins/hamster/hamster.py
-index 2badf8b..cbc97d4 100644
---- a/GTG/plugins/hamster/hamster.py
-+++ b/GTG/plugins/hamster/hamster.py
-@@ -90,7 +90,7 @@ class hamsterPlugin:
- 
-         category = ""
-         if self.preferences['category'] == 'auto_tag':
--            hamster_activities = dict([(str(x[0]), unicode(x[1]))
-+            hamster_activities = dict([(str(x[0]), x[1])
-                                        for x in
-                                        self.hamster.GetActivities('')])
-             if (gtg_title in hamster_activities
--- 
-2.0.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 7d85c5a21e8a..b9600baf05de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Olivier Mehani <shtrom-aur@ssji.net>
 # $Id$
 pkgname=gtg-git
-pkgver=r5107.767bfca
+pkgver=r5112.1328f1d
 pkgrel=1
 pkgdesc="Personal GTD like organizer for the GNOME desktop environment. Git version."
 url="http://gtgnome.net/"
@@ -35,8 +35,7 @@ optdepends=(
 conflicts=('gtg')
 install="${pkgname}.install"
 source=("${pkgname}::git+https://github.com/getting-things-gnome/gtg"
-        "0001-plugin-API-Open-preference-file-for-reading-as-binar.patch"
-        "0002-No-need-to-use-unicode-on-strs.patch")
+        "0001-Remove-has_separator-property.patch")
 
 pkgver() {
   cd "$srcdir/${pkgname}"
@@ -45,8 +44,7 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${pkgname}"
-  patch -p1 < ${srcdir}/0001-plugin-API-Open-preference-file-for-reading-as-binar.patch
-  patch -p1 < ${srcdir}/0002-No-need-to-use-unicode-on-strs.patch
+  patch -p1 < ${srcdir}/0001-Remove-has_separator-property.patch
   python setup.py build
 }
 
@@ -57,5 +55,4 @@ package() {
 
 # vim:set ts=2 sw=2 et:
 md5sums=('SKIP'
-         '443cf942f731a97c031a0118d3a2c895'
-         '6850a96df56027f7eee02054ad2554af')
+         'a79aab175a0434928e5da2c12f94abb8')