upgpkg: pygtk 2.24.0-9

Fix build with pango 1.44.6

2 files changed, 10 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd5d1901a07a..fa589b240ca8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pygtk
 	pkgdesc = Python bindings for the GTK widget set
 	pkgver = 2.24.0
-	pkgrel = 8
+	pkgrel = 9
 	url = http://www.pygtk.org/
 	arch = x86_64
 	license = LGPL
@@ -12,9 +12,11 @@ pkgbase = pygtk
 	depends = python2-gobject2
 	optdepends = python2-numpy
 	source = https://download.gnome.org/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
+	source = https://gitlab.gnome.org/Archive/pygtk/-/commit/4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2.patch
 	source = python27.patch
 	source = fix-leaks-of-pango-objects.patch
 	sha256sums = cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
+	sha256sums = 45700d4e048aeb353a71c9aa182b8299ddfb485e00845045561660ef7317bbbc
 	sha256sums = 39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682
 	sha256sums = 0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb
 
diff --git a/PKGBUILD b/PKGBUILD
index 93cded0d49bd..10e9632efd53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pygtk
 pkgver=2.24.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Python bindings for the GTK widget set"
 url="http://www.pygtk.org/"
 arch=('x86_64')
@@ -12,9 +12,11 @@ depends=('libglade' 'python2-cairo' 'python2-gobject2')
 makedepends=('python2-numpy' 'pygobject2-devel')
 optdepends=('python2-numpy')
 source=(https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        "https://gitlab.gnome.org/Archive/pygtk/-/commit/4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2.patch"
         python27.patch
         fix-leaks-of-pango-objects.patch)
 sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
+            '45700d4e048aeb353a71c9aa182b8299ddfb485e00845045561660ef7317bbbc'
             '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682'
             '0ca9e910e9bb88897089dd19752a419aa78de15463df766cb19a1d0c2dd45bcb')
 
@@ -27,6 +29,10 @@ prepare() {
   # https://bugzilla.gnome.org/show_bug.cgi?id=660216
   patch -Np1 -i "${srcdir}/fix-leaks-of-pango-objects.patch"
 
+  # fix build with new pango:
+  # https://gitlab.gnome.org/Archive/pygtk/-/merge_requests/1
+  patch -p1 -i ../4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2.patch
+
   # Python 2
   sed -i -e 's#env python$#env python2#' examples/pygtk-demo/{,demos/}*.py