diff --git a/mingw-w64-python2-pygtk/PKGBUILD b/mingw-w64-python2-pygtk/PKGBUILD index fc615e6752..5f81104662 100644 --- a/mingw-w64-python2-pygtk/PKGBUILD +++ b/mingw-w64-python2-pygtk/PKGBUILD @@ -4,7 +4,7 @@ _realname=pygtk pkgbase=mingw-w64-python2-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-python2-${_realname}" pkgver=2.24.0 -pkgrel=7 +pkgrel=8 pkgdesc="Python bindings for the GTK widget set (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64') @@ -16,20 +16,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-python2-cairo" "${MINGW_PACKAGE_PREFIX}-pango" "${MINGW_PACKAGE_PREFIX}-gtk2" "${MINGW_PACKAGE_PREFIX}-libglade") -makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy") options=('staticlibs' 'strip') source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.bz2 001-python27.patch 002-no-undefined.patch 003-python-m4.patch 004-pygtk-demo.patch - 005-atk-glib-libs.patch) + 005-atk-glib-libs.patch + pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch) sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682' '365df388b238899d08acf1caf2ae4c1b1bb3b7a768aec3709b80aced155d226e' 'fed9d666c0bd3baa0a361a7cc9af8303e811921ccab849e770ff38fc50092d76' '2430bc0f52f3ca0f76b51e0d959e223941ce7c8dec363f64fb65157180481ac9' - 'fb6db5409041099d6ef913dfcee3389e763605e28e345abeb7424f7d2f1a5302') + 'fb6db5409041099d6ef913dfcee3389e763605e28e345abeb7424f7d2f1a5302' + 'ad93cf8b17bb5c68bc323b55ac697f44d83fb80703cce41a83ad025403b9394d') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -38,6 +39,7 @@ prepare() { patch -p1 -i ${srcdir}/003-python-m4.patch patch -p1 -i ${srcdir}/004-pygtk-demo.patch patch -p1 -i ${srcdir}/005-atk-glib-libs.patch + patch -p1 -i ${srcdir}/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch autoreconf -fi -I m4 #WANT_AUTOMAKE=latest ./autogen.sh diff --git a/mingw-w64-python2-pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch b/mingw-w64-python2-pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch new file mode 100644 index 0000000000..ba4141e3fa --- /dev/null +++ b/mingw-w64-python2-pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch @@ -0,0 +1,39 @@ +From 877164b6b70780468a31d8211f29421b6f34b0c8 Mon Sep 17 00:00:00 2001 +From: Mathieu Bridon +Date: Thu, 24 Oct 2019 22:58:36 +0200 +Subject: [PATCH] Drop the PangoFont find_shaper virtual method + +This API has been removed from Pango 1.44.6, because it was completely +unused by anything. + +However, PyGTK tries to bind everything, even unused API. + +Removing this from PyGTK means we can build it against the latest Pango +again. +--- + pango.defs | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/pango.defs b/pango.defs +index 2a79ecc..862667a 100644 +--- a/pango.defs ++++ b/pango.defs +@@ -1391,15 +1391,6 @@ + ) + ) + +-(define-virtual find_shaper +- (of-object "PangoFont") +- (return-type "PangoEngineShape*") +- (parameters +- '("PangoLanguage*" "lang") +- '("guint32" "ch") +- ) +-) +- + (define-virtual get_glyph_extents + (of-object "PangoFont") + (return-type "none") +-- +2.21.0 +