Florian Weimer 2023-04-26 21:53:59 +02:00
parent 077d68544b
commit 930a15aa62
2 changed files with 36 additions and 1 deletions

31
pygtk2-c99.patch Normal file
View File

@ -0,0 +1,31 @@
Upstream pango removed these functions from its installed headers in
this commit:
commit d21ea13a22b1cab8c9cb604aa3fcd2ca8073befd
Author: Matthias Clasen <mclasen@redhat.com>
Date: Thu Jul 4 20:36:00 2019 +0000
Header cleanup
Abolish the PANGO_ENABLE_BACKEND and PANGO_ENABLE_ENGINE
defines. All backend-only apis are moved into private
headers, all apis that were engine-only are marked as
deprecated, since engines are.
diff --git a/pango.override b/pango.override
index afe43aba3a6ebe81..3e33e1b598322096 100644
--- a/pango.override
+++ b/pango.override
@@ -27,6 +27,12 @@ headers
#include <pygobject.h>
#include <pango/pango.h>
+/* These internal functions are still exported, so just declare them
+ here. There does not seem to be a simple way to ween pygtk2 off
+ them. */
+PangoFontMetrics *pango_font_metrics_new (void);
+const char *pango_font_map_get_shape_engine_type (PangoFontMap *);
+
typedef struct {
PyObject *func, *data;
} PyGtkCustomNotify;

View File

@ -10,7 +10,7 @@
Name: pygtk2
Version: 2.24.0
Release: 39%{?dist}
Release: 40%{?dist}
License: LGPL-2.0-or-later
Summary: Python bindings for GTK+
URL: http://www.pygtk.org/
@ -23,6 +23,7 @@ Patch0: 0001-Fix-leaks-of-Pango-objects.patch
# Fix the build with pango 1.44
# https://github.com/flathub/org.glimpse_editor.Glimpse/blob/master/patches/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch
Patch1: pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch
Patch2: pygtk2-c99.patch
# This was dropped from gnome-python; obsolete it here because, well,
# we have to put it somewhere
@ -129,6 +130,9 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
%{_datadir}/gtk-doc/html/pygtk/
%changelog
* Wed Apr 26 2023 Florian Weimer <fweimer@redhat.com> - 2.24.0-40
- Port to C99 (#2190017)
* Fri Mar 03 2023 Gwyn Ciesla <gwync@protonmail.com> - 2.24.0-39
- migrated to SPDX license