diff -u freetype-2.4.8/debian/changelog freetype-2.4.8/debian/changelog --- freetype-2.4.8/debian/changelog +++ freetype-2.4.8/debian/changelog @@ -1,3 +1,12 @@ +freetype (2.4.8-1ubuntu2) precise; urgency=low + + * debian/patches-freetype/revert_scalable_fonts_metric.patch: + - revert commit "Fix metrics on size request for scalable fonts.", + it's breaking gtk underlining markups and creating some other + issues as well (lp: #972223) + + -- Sebastien Bacher Tue, 03 Apr 2012 10:42:05 +0200 + freetype (2.4.8-1ubuntu1) precise; urgency=low * SECURITY UPDATE: Denial of service via crafted BDF font (LP: #963283) diff -u freetype-2.4.8/debian/patches-freetype/series freetype-2.4.8/debian/patches-freetype/series --- freetype-2.4.8/debian/patches-freetype/series +++ freetype-2.4.8/debian/patches-freetype/series @@ -22,0 +23 @@ +revert_scalable_fonts_metric.patch only in patch2: unchanged: --- freetype-2.4.8.orig/debian/patches-freetype/revert_scalable_fonts_metric.patch +++ freetype-2.4.8/debian/patches-freetype/revert_scalable_fonts_metric.patch @@ -0,0 +1,16 @@ +# Description: revert commit which creates regressions in gtk +# Ubuntu: https://bugs.launchpad.net/freetype/+bug/972223 +# Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636776 +--- a/src/truetype/ttdriver.c ++++ b/src/truetype/ttdriver.c +@@ -246,10 +246,7 @@ + FT_Request_Metrics( size->face, req ); + + if ( FT_IS_SCALABLE( size->face ) ) +- { + error = tt_size_reset( ttsize ); +- ttsize->root.metrics = ttsize->metrics; +- } + + return error; + }