From e78c864a2a1aee166513a8b4f95a22e2c81cd604 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 11 Jun 2020 21:05:39 +0200
Subject: [PATCH] Update to 1.45.2

---
 .gitignore |  1 +
 197.patch  | 66 ------------------------------------------------------
 pango.spec | 10 ++++-----
 sources    |  2 +-
 4 files changed, 7 insertions(+), 72 deletions(-)
 delete mode 100644 197.patch

diff --git a/.gitignore b/.gitignore
index dcb1e09..506cedd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ pango-1.28.1.tar.bz2
 /pango-1.44.6.tar.xz
 /pango-1.44.7.tar.xz
 /pango-1.45.1.tar.xz
+/pango-1.45.2.tar.xz
diff --git a/197.patch b/197.patch
deleted file mode 100644
index 33a5cd2..0000000
--- a/197.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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
-
diff --git a/pango.spec b/pango.spec
index 5d2e843..e38f4ed 100644
--- a/pango.spec
+++ b/pango.spec
@@ -8,17 +8,14 @@
 %global freetype_version 2.1.5
 
 Name: pango
-Version: 1.45.1
-Release: 2%{?dist}
+Version: 1.45.2
+Release: 1%{?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}
@@ -131,6 +128,9 @@ fi
 
 
 %changelog
+* Thu Jun 11 2020 Kalev Lember <klember@redhat.com> - 1.45.2-1
+- Update to 1.45.2
+
 * Thu Jun 11 2020 Richard Hughes <rhughes@redhat.com> - 1.45.1-2
 - Backport a patch to avoid breaking introspection ABI.
 
diff --git a/sources b/sources
index 314eaa5..8e8452b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pango-1.45.1.tar.xz) = 33d255257bf88a0dd71457454cb91b97f9873fff5e0ed49ca710a6b37e7b74b93ad065c28d7ad6c62fe75dabd11d34a6fc889482674dcf9cf6ffb90c60b2808a
+SHA512 (pango-1.45.2.tar.xz) = 776189fe4dffe53dfb633e2f78d81ec21e1e5926bfd2924e6fceac6a0906851baf63bc236fedad98a866222cb569e6618f1d5b42319dc8a769071b4fadd833f0