Backport 00e8470 to work around gobject regression

3 files changed, 43 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d990bb8246ae..8e31f334ab32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Apr 18 16:28:16 UTC 2017
+# Sun May 27 13:04:35 UTC 2018
 pkgbase = ccsm
 	pkgdesc = Compizconfig Settings Manager in Python2
 	pkgver = 0.8.14
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/compiz-reloaded/ccsm/
 	arch = any
 	groups = compiz-fusion
@@ -18,7 +18,9 @@ pkgbase = ccsm
 	provides = ccsm=0.8.14
 	conflicts = ccsm-git
 	source = https://github.com/compiz-reloaded/ccsm//releases/download/v0.8.14/ccsm-0.8.14.tar.xz
+	source = bindings-regression-workaround.patch
 	sha256sums = f2f23068706f52b8d9d0a06520b09070cfc9b5e5bbac82b71ee7f30ce39f872c
+	sha256sums = a71ca356c239a0e88a91bf05f975fd3dd92801beb6bb16d3e69b1b318fdf5ee0
 
 pkgname = ccsm
 
diff --git a/PKGBUILD b/PKGBUILD
index fc459e4e472b..f53b855f4fa7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _micro=""
 
 pkgname=ccsm
 pkgver="${_pkgver}${_micro}"
-pkgrel=1
+pkgrel=2
 pkgdesc="Compizconfig Settings Manager in Python2"
 arch=('any')
 url="https://github.com/compiz-reloaded/${_upstream}/"
@@ -21,11 +21,20 @@ optdepends=('compiz-gtk-standalone: option 1' 'compiz-core: option 2')
 groups=('compiz-fusion')
 conflicts=('ccsm-git')
 provides=("ccsm=$pkgver")
-source=("${url}/releases/download/v${pkgver}/${_upstream}-${pkgver}.tar.xz")
+source=(
+	"${url}/releases/download/v${pkgver}/${_upstream}-${pkgver}.tar.xz"
+	"bindings-regression-workaround.patch"
+)
+
+prepare() {
+  cd "${srcdir}/${_upstream}-${pkgver}"
+  patch -Np1 -i "${srcdir}/bindings-regression-workaround.patch"
+}
 
 package() {
   cd "${srcdir}/${_upstream}-${pkgver}"
   python ./setup.py install --prefix=/usr --with-gtk=2.0 --root="${pkgdir}"
 }
 
-sha256sums=('f2f23068706f52b8d9d0a06520b09070cfc9b5e5bbac82b71ee7f30ce39f872c')
+sha256sums=('f2f23068706f52b8d9d0a06520b09070cfc9b5e5bbac82b71ee7f30ce39f872c'
+            'a71ca356c239a0e88a91bf05f975fd3dd92801beb6bb16d3e69b1b318fdf5ee0')
diff --git a/bindings-regression-workaround.patch b/bindings-regression-workaround.patch
new file mode 100644
index 000000000000..b26103101ebb
--- /dev/null
+++ b/bindings-regression-workaround.patch
@@ -0,0 +1,27 @@
+From 00e847094302c22bb2645ab9c73aff7a17ce9aee Mon Sep 17 00:00:00 2001
+From: Alexei Sorokin <sor.alexei@meowr.ru>
+Date: Wed, 9 May 2018 14:29:49 +0300
+Subject: [PATCH] Gtk2: Workaround a bindings regression
+
+---
+ ccm/Widgets.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ccm/Widgets.py b/ccm/Widgets.py
+index 0c3715f..bf9d8bc 100644
+--- a/ccm/Widgets.py
++++ b/ccm/Widgets.py
+@@ -385,11 +385,11 @@ def clear(self):
+ 
+     def append(self, value):
+         iter = self.store.append()
+-        self.store.set(iter, 0, value)
++        self.store.set_value(iter, 0, value)
+ 
+     def set(self, pos, value):
+         iter = self.store.get_iter(pos)
+-        self.store.set(iter, 0, value)
++        self.store.set_value(iter, 0, value)
+ 
+     def delete(self, b):
+         selected_rows = self.select.get_selected_rows()[1]