[mingw-pango/f18] Downgrade to 1.32.5, add win32 print patch

[mooninite]

commit 288e30eb0551d5ee61e867f5c1c30f040dd416a2
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Tue May 14 18:33:25 2013 -0500

    Downgrade to 1.32.5, add win32 print patch

 mingw-pango.spec             |   15 +++++++++----
 pango-win32-print-size.patch |   47 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)
---
diff --git a/mingw-pango.spec b/mingw-pango.spec
index 234b9cb..c1de7ce 100644
--- a/mingw-pango.spec
+++ b/mingw-pango.spec
@@ -1,8 +1,8 @@
 %{?mingw_package_header}
 
 Name:           mingw-pango
-Version:        1.32.6
-Release:        1%{?dist}
+Version:        1.32.5
+Release:        2%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
@@ -27,6 +27,9 @@ Patch1000:      pango_enable_static_build.patch
 # Make the dependencies on freetype and fontconfig runtime dependencies
 Patch1001:      pango-enable-delay-load-of-freetype-and-fontconfig.patch
 
+# Gnome BZ: https://bugzilla.gnome.org/show_bug.cgi?id=692470
+Patch1002:      pango-win32-print-size.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -114,6 +117,8 @@ autoreconf -i --force
 
 %patch1000 -b .static
 
+%patch1002 -p1 -b .win32-print
+
 
 %build
 %mingw_configure \
@@ -224,11 +229,11 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/pango/1.8.0/modules/*.dll.a
 %{mingw64_libdir}/pango/1.8.0/modules/pango-arabic-lang.a
 %{mingw64_libdir}/pango/1.8.0/modules/pango-indic-lang.a
 %{mingw64_libdir}/pango/1.8.0/modules/pango-basic-fc.a
- 
+
 
 %changelog
-* Sun Mar 24 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.32.6-1
-- Update to 1.32.6
+* Tue May 14 2013 Michael Cronenworth <mike at cchtml.com> - 1.32.5-2
+- Patch for Gnome BZ# 692470
 
 * Sun Jan  6 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.32.5-1
 - Update to 1.32.5
diff --git a/pango-win32-print-size.patch b/pango-win32-print-size.patch
new file mode 100644
index 0000000..ee45e36
--- /dev/null
+++ b/pango-win32-print-size.patch
@@ -0,0 +1,47 @@
+From 25ad29b488d3e2ae10e4fee25602409fa39207f1 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad at behdad.org>
+Date: Mon, 04 Mar 2013 22:45:03 +0000
+Subject: Revert "Fix Win32 and CoreText cairo backends to take cairo CTM into account"
+
+This reverts commit b359bb484bc7d27a835cfd6d9ffcaed582ebf2ae.
+
+Bug 694918 - Pango layout is rendered in wrong size if we have
+non-identity cairo transformation matrix
+
+I was wrong blindly copying this logic from pangocairo-fc into
+pangocairo-win32 and pangocairo-quartz.
+
+The reason we need the it in pangofc is because the fontsize we
+get back from fontconfig is multiplied by the ctm scale factor,
+so we undo it when loading the font.  The same is NOT true about
+the non-fc backends, so the copying was totally wrong.
+---
+diff --git a/pango/pangocairo-coretextfont.c b/pango/pangocairo-coretextfont.c
+index 0f2a9ef..290a5cc 100644
+--- a/pango/pangocairo-coretextfont.c
++++ b/pango/pangocairo-coretextfont.c
+@@ -220,8 +220,6 @@ _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap  *cafontmap,
+   abs_size = pango_core_text_font_key_get_absolute_size (key);
+   size = pango_units_to_double (abs_size);
+ 
+-  size /= pango_matrix_get_font_scale_factor (pango_core_text_font_key_get_matrix (key));
+-
+   ctdescriptor = pango_core_text_font_key_get_ctfontdescriptor (key);
+   font_ref = CTFontCreateWithFontDescriptor (ctdescriptor, size, NULL);
+ 
+diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c
+index 61d7d60..59f7c0f 100644
+--- a/pango/pangocairo-win32font.c
++++ b/pango/pangocairo-win32font.c
+@@ -252,9 +252,6 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap     *cwfontmap,
+   if (!pango_font_description_get_size_is_absolute (desc))
+     size *= dpi / 72.;
+ 
+-  if (context)
+-    size /= pango_matrix_get_font_scale_factor (pango_context_get_matrix (context));
+-
+ #ifdef USE_FACE_CACHED_FONTS
+   win32fontmap = PANGO_WIN32_FONT_MAP (cwfontmap);
+ 
+--
+cgit v0.9.1