Fix a crash in the fallback engine

This commit is contained in:
Kalev Lember 2011-08-17 15:17:09 +03:00
parent 624aadadc5
commit dbbe0abd23
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From eebb94d94054bbb1a3a3d08e47e32de09d93c9b3 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
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

View File

@ -9,7 +9,7 @@
Summary: System for layout and rendering of internationalized text
Name: pango
Version: 1.29.3
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/pango
@ -39,6 +39,8 @@ 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
@ -74,6 +76,7 @@ for the pango package.
%setup -q -n pango-%{version}
%patch0 -p1 -b .lib64
%patch1 -p1 -b .fallback_engine
%build
@ -238,6 +241,9 @@ fi
%changelog
* Wed Aug 17 2011 Kalev Lember <kalevlember@gmail.com> - 1.29.3-2
- Fix a crash in the fallback engine
* Fri Jun 17 2011 Tomas Bzatek <tbzatek@redhat.com> - 1.29.3-1
- Update to 1.29.3