From ad9bbf7c3f8b7a7e72fa8ef423223ffa6a6d6d35 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 28 Sep 2011 11:17:59 -0400 Subject: [PATCH] Drop upstreamed patch --- pango-1.29.3-fallback_engine.patch | 29 ----------------------------- pango.spec | 3 --- 2 files changed, 32 deletions(-) delete mode 100644 pango-1.29.3-fallback_engine.patch diff --git a/pango-1.29.3-fallback_engine.patch b/pango-1.29.3-fallback_engine.patch deleted file mode 100644 index efb402d..0000000 --- a/pango-1.29.3-fallback_engine.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eebb94d94054bbb1a3a3d08e47e32de09d93c9b3 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Mon, 11 Jul 2011 10:00:02 +0300 -Subject: [PATCH] Don't define PangoFallbackEngine as abstract type - -Fixes a regression from ea702f4 which changed PangoFallbackEngine to be -abstract. - -https://bugzilla.gnome.org/show_bug.cgi?id=653985 ---- - pango/pango-engine.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/pango/pango-engine.c b/pango/pango-engine.c -index 1a49385..8e87402 100644 ---- a/pango/pango-engine.c -+++ b/pango/pango-engine.c -@@ -180,7 +180,7 @@ fallback_engine_covers (PangoEngineShape *engine G_GNUC_UNUSED, - - static GType pango_fallback_engine_get_type (void); - --G_DEFINE_ABSTRACT_TYPE (PangoFallbackEngine, pango_fallback_engine, PANGO_TYPE_ENGINE_SHAPE); -+G_DEFINE_TYPE (PangoFallbackEngine, pango_fallback_engine, PANGO_TYPE_ENGINE_SHAPE); - - static void - pango_fallback_engine_init (PangoFallbackEngine *self) --- -1.7.6 - diff --git a/pango.spec b/pango.spec index 938e2a6..d490555 100644 --- a/pango.spec +++ b/pango.spec @@ -39,8 +39,6 @@ BuildRequires: gnome-common intltool gtk-doc # Look for pango.modules in an arch-specific directory Patch0: pango-1.21.4-lib64.patch -# Upstream fix for fallback engine crash: -Patch1: pango-1.29.3-fallback_engine.patch %description Pango is a library for laying out and rendering of text, with an emphasis @@ -76,7 +74,6 @@ for the pango package. %setup -q -n pango-%{version} %patch0 -p1 -b .lib64 -%patch1 -p1 -b .fallback_engine %build