From 1409222b053d864fb43d5309cd985e9c1d2d6c1392211fc216440bb38098aecc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Nov 2019 17:11:02 +0000 Subject: [PATCH] Accepting request 751348 from GNOME:Next - Add pygtk-Drop-the-PangoFont-find_shaper-virtual-method.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. OBS-URL: https://build.opensuse.org/request/show/751348 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gtk?expand=0&rev=34 --- ...PangoFont-find_shaper-virtual-method.patch | 39 +++++++++++++++++++ python-gtk.changes | 8 ++++ python-gtk.spec | 7 +++- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch diff --git a/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch b/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch new file mode 100644 index 0000000..5622fe5 --- /dev/null +++ b/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 + diff --git a/python-gtk.changes b/python-gtk.changes index 84c198e..47fcbc4 100644 --- a/python-gtk.changes +++ b/python-gtk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 27 14:21:38 UTC 2019 - Dominique Leuenberger + +- Add pygtk-Drop-the-PangoFont-find_shaper-virtual-method.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. + ------------------------------------------------------------------- Sun Aug 18 15:04:48 UTC 2019 - Bjørn Lie diff --git a/python-gtk.spec b/python-gtk.spec index 76c11e1..63015c1 100644 --- a/python-gtk.spec +++ b/python-gtk.spec @@ -1,7 +1,7 @@ # # spec file for package python-gtk # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,6 +29,8 @@ URL: http://www.pygtk.org/ Source: http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.24/pygtk-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM pygtk-2.22.0-capsule.patch bgo#623965 bnc#669802 jmatejek@novell.com -- Conditionally use the new Capsule API instead of PyCObject Patch0: pygtk-2.22.0-capsule.patch +# pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch -- Drop the PangoFont find_shaper virtual method +Patch1: https://raw.githubusercontent.com/flathub/org.glimpse_editor.Glimpse/master/patches/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch BuildRequires: fdupes # Only for directory ownership: BuildRequires: gtk-doc @@ -74,6 +76,7 @@ python's benefits. %prep %setup -q -n pygtk-%{version} %patch0 -p1 +%patch1 -p1 find examples -type f -name "*.py" -exec sed -i "s|#!%{_bindir}/env python|#!%{_bindir}/python2|" {} \; find examples -type f -name "*.py" -exec sed -i "s|#! %{_bindir}/env python|#!%{_bindir}/python2|" {} \;