Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=131117faef94eef08cebe90daa25550b1d2f97ad
commit 131117faef94eef08cebe90daa25550b1d2f97ad Author: Baste <[email protected]> Date: Tue Feb 19 14:17:08 2013 +0100 pango-1.32.6-2-x86_64 * add patch revert git diff --git a/source/xlib/pango/FrugalBuild b/source/xlib/pango/FrugalBuild index 6252f18..d104df5 100644 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@ -4,7 +4,7 @@ pkgname=pango pkgver=1.32.6 -pkgrel=1 +pkgrel=2 pkgdesc="A library for layout and rendering of text" url="http://www.gtk.org/"; depends=('libxml2>=2.7.8' 'cairo>=1.8.10-2' 'glib2>=2.34.0' 'libxft>=2.1.13-2' 'libxmu' 'libxi' 'libxrender' 'harfbuzz' 'libxft') @@ -15,8 +15,9 @@ archs=('i686' 'x86_64') backup=(etc/pango/pango.modules) _F_gnome_ext=".tar.xz" Finclude gnome - -Fconfopts+=" --enable-gtk-doc --enable-debug=minimum" -sha1sums=('eb8f0731787cb02f185d1fadfcb756e784678f98') +Fconfopts+=" --enable-gtk-doc --enable-debug=minimum --with-included-modules=basic-fc" +source=($source fix.patch) +sha1sums=('eb8f0731787cb02f185d1fadfcb756e784678f98' \ + '8cd5dab96eee83e5c0fa2dfca8c15ecdbadee5c9') # optimization OK diff --git a/source/xlib/pango/fix.patch b/source/xlib/pango/fix.patch new file mode 100644 index 0000000..2581068 --- /dev/null +++ b/source/xlib/pango/fix.patch @@ -0,0 +1,92 @@ +From 10cc6557ba24239570ee9a7bcaa0a553aae9df95 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <[email protected]> +Date: Thu, 17 Jan 2013 23:11:19 +0000 +Subject: Revert "Don't use the deprecated pango_ft2_font_get_face" + +This reverts commit 2dc0c3dbb1c389c3a3ba12a5c5c85f21dca46e84. + +This doesn't make sense. It ends up in infinite recursion because +pangofc is calling lock_face on pangoft2, which would recursively +call it on pangofc... + +Was causing hang at startup of Inkscape. + +If the deprecated warnings are an issue, they need to be dealt with +in some other way. +--- +diff --git a/pango/pangoft2-render.c b/pango/pangoft2-render.c +index 60cf432..42923f4 100644 +--- a/pango/pangoft2-render.c ++++ b/pango/pangoft2-render.c +@@ -210,7 +210,7 @@ pango_ft2_font_render_glyph (PangoFont *font, + return box; + } + +- face = pango_fc_font_lock_face (PANGO_FC_FONT (font)); ++ face = pango_ft2_font_get_face (font); + + if (face) + { +@@ -231,8 +231,6 @@ pango_ft2_font_render_glyph (PangoFont *font, + rendered->bitmap_left = face->glyph->bitmap_left; + rendered->bitmap_top = face->glyph->bitmap_top; + +- pango_fc_font_unlock_face (PANGO_FC_FONT (font)); +- + if (G_UNLIKELY (!rendered->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, rendered); + return NULL; +@@ -242,8 +240,6 @@ pango_ft2_font_render_glyph (PangoFont *font, + } + else + { +- pango_fc_font_unlock_face (PANGO_FC_FONT (font)); +- + generic_box: + return pango_ft2_font_render_box_glyph (PANGO_UNKNOWN_GLYPH_WIDTH, + PANGO_UNKNOWN_GLYPH_HEIGHT, +diff --git a/pango/pangoft2.c b/pango/pangoft2.c +index cbe1d21..dc6db5d 100644 +--- a/pango/pangoft2.c ++++ b/pango/pangoft2.c +@@ -424,13 +424,12 @@ pango_ft2_font_get_kerning (PangoFont *font, + static FT_Face + pango_ft2_font_real_lock_face (PangoFcFont *font) + { +- return pango_fc_font_lock_face (font); ++ return pango_ft2_font_get_face ((PangoFont *)font); + } + + static void +-pango_ft2_font_real_unlock_face (PangoFcFont *font) ++pango_ft2_font_real_unlock_face (PangoFcFont *font G_GNUC_UNUSED) + { +- pango_fc_font_unlock_face (font); + } + + static gboolean +@@ -500,18 +499,12 @@ pango_ft2_font_get_coverage (PangoFont *font, + PangoGlyph + pango_ft2_get_unknown_glyph (PangoFont *font) + { +- PangoFcFont *fc_font = PANGO_FC_FONT (font); +- FT_Face face; +- PangoGlyph glyph; +- +- face = pango_fc_font_lock_face (fc_font); ++ FT_Face face = pango_ft2_font_get_face (font); + if (face && FT_IS_SFNT (face)) + /* TrueType fonts have an 'unknown glyph' box on glyph index 0 */ +- glyph = 0; ++ return 0; + else +- glyph = PANGO_GLYPH_EMPTY; +- pango_fc_font_unlock_face (fc_font); +- return glyph; ++ return PANGO_GLYPH_EMPTY; + } + + typedef struct +-- +cgit v0.9.1 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
