Backport patch from upstream

This commit is contained in:
Richard Hughes 2020-06-11 16:40:57 +01:00
parent 37b20e606f
commit 8bfa859410
2 changed files with 74 additions and 2 deletions

66
197.patch Normal file
View File

@ -0,0 +1,66 @@
From 9f37824abe59ce6725c58c65e7a588ef0861d268 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 10 Jun 2020 16:28:42 +0100
Subject: [PATCH] Use the correct identifier for Pango sub-libraries
The Pango sub-libraries sadly hijack the Pango namespace for their
symbols, but use a different namespace for the identifiers.
This fixes an introspection ABI incompatible change that made its way in
Pango 1.45.
---
pango/meson.build | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pango/meson.build b/pango/meson.build
index ad7fb798..015175c3 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -238,7 +238,7 @@ if build_pangoft2
dependencies: [ libpango_dep, pango_gir_dep ],
namespace: 'PangoFc',
nsversion: pango_api_version,
- identifier_prefix: 'Pango',
+ identifier_prefix: 'PangoFc',
symbol_prefix: 'pango',
export_packages: 'pangofc',
includes: [ pango_gir[0], 'fontconfig-2.0', ],
@@ -256,7 +256,7 @@ if build_pangoft2
dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep ],
namespace: 'PangoOT',
nsversion: pango_api_version,
- identifier_prefix: 'Pango',
+ identifier_prefix: 'PangoOT',
symbol_prefix: 'pango',
export_packages: 'pangoot',
includes: [ pangofc_gir[0], 'freetype2-2.0', ],
@@ -273,7 +273,7 @@ if build_pangoft2
dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep, pangoot_gir_dep ],
namespace: 'PangoFT2',
nsversion: pango_api_version,
- identifier_prefix: 'Pango',
+ identifier_prefix: 'PangoFT2',
symbol_prefix: 'pango',
export_packages: 'pangoft2',
includes: [ pangofc_gir[0], 'freetype2-2.0', ],
@@ -363,7 +363,7 @@ if xft_dep.found() and fontconfig_dep.found()
dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoot_gir_dep, pangoft2_gir_dep ],
namespace: 'PangoXft',
nsversion: pango_api_version,
- identifier_prefix: 'Pango',
+ identifier_prefix: 'PangoXft',
symbol_prefix: 'pango',
export_packages: 'pangoxft',
includes: [ pango_gir[0], pangoot_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
@@ -528,7 +528,7 @@ if cairo_dep.found()
dependencies: [ pangocairo_deps, pango_gir_dep ],
namespace: 'PangoCairo',
nsversion: pango_api_version,
- identifier_prefix: 'Pango',
+ identifier_prefix: 'PangoCairo',
symbol_prefix: 'pango',
export_packages: 'pangocairo',
includes: [ pango_gir[0], 'GObject-2.0', 'cairo-1.0' ],
--
2.26.2

View File

@ -9,13 +9,16 @@
Name: pango
Version: 1.45.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: System for layout and rendering of internationalized text
License: LGPLv2+
URL: http://www.pango.org
Source0: https://download.gnome.org/sources/%{name}/1.45/%{name}-%{version}.tar.xz
# already upstream
Patch0: 197.patch
BuildRequires: pkgconfig(cairo) >= %{cairo_version}
BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@ -74,7 +77,7 @@ the functionality of the installed %{name} package.
%prep
%setup -q -n pango-%{version}
%autosetup -n pango-%{version} -p1
%build
@ -128,6 +131,9 @@ fi
%changelog
* Thu Jun 11 2020 Richard Hughes <rhughes@redhat.com> - 1.45.1-2
- Backport a patch to avoid breaking introspection ABI.
* Tue Jun 09 2020 Kalev Lember <klember@redhat.com> - 1.45.1-1
- Update to 1.45.1