[sawfish] sawfish-1.9.0-no-pangox.patch: Adapt to pangox removal

[Adam Jackson]

commit 98179d593ddd7de4328e900f861fa2c16f0767bf
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 27 12:36:17 2012 -0400

    sawfish-1.9.0-no-pangox.patch: Adapt to pangox removal

 sawfish-1.9.0-no-pangox.patch |   46 +++++++++++++++++++++++++++++++++++++++++
 sawfish.spec                  |    8 ++++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/sawfish-1.9.0-no-pangox.patch b/sawfish-1.9.0-no-pangox.patch
new file mode 100644
index 0000000..8b138e7
--- /dev/null
+++ b/sawfish-1.9.0-no-pangox.patch
@@ -0,0 +1,46 @@
+diff -up sawfish-1.9.0/configure.in.jx sawfish-1.9.0/configure.in
+--- sawfish-1.9.0/configure.in.jx	2012-06-26 16:50:43.000000000 -0400
++++ sawfish-1.9.0/configure.in	2012-08-27 12:16:42.784057848 -0400
+@@ -202,10 +202,6 @@ PKG_CHECK_MODULES(PANGO, pango >= ${PANG
+ 		  ,AC_DEFINE(HAVE_PANGO, 1, [Have pango]) FONT_LOADER="Pango"
+ 		  ,AC_MSG_ERROR([cannot locate pango >= $PANGO_MIN_VER]))
+ 
+-PKG_CHECK_MODULES(PANGOX, pangox >= ${PANGO_MIN_VER}
+-		  ,AC_DEFINE(HAVE_PANGO_X, 1, [Have pangox]) PANGO_MODULES="${PANGO_MODULES} pangox" FONT_LOADER="Pango X"
+-		  ,AC_MSG_WARN([pango x support not available >= $PANGO_MIN_VER]))
+-
+ PKG_CHECK_MODULES(PANGOXFT, pangoxft >= ${PANGO_MIN_VER}
+ 		  ,AC_DEFINE(HAVE_PANGO_XFT, 1, [Have pangoxft]) PANGO_MODULES="${PANGO_MODULES} pangoxft" have_pango_xft="yes" FONT_LOADER="Pango XFT" AC_SUBST(have_pango_xft)
+ 		  ,AC_MSG_WARN([pango xft support not available $PANGO_MIN_VER]))
+diff -up sawfish-1.9.0/src/fonts.c.jx sawfish-1.9.0/src/fonts.c
+--- sawfish-1.9.0/src/fonts.c.jx	2012-06-26 16:50:45.000000000 -0400
++++ sawfish-1.9.0/src/fonts.c	2012-08-27 12:30:31.596323616 -0400
+@@ -53,9 +53,6 @@
+ # define PANGO_ENABLE_BACKEND
+ # include <pango/pango.h>
+ # undef PANGO_ENABLE_BACKEND
+-# ifdef HAVE_PANGO_X
+-#  include <pango/pangox.h>
+-# endif
+ # ifdef HAVE_PANGO_XFT
+ #  define PANGO_ENABLE_ENGINE
+ #  include <pango/pangoxft.h>
+@@ -429,8 +426,6 @@ pango_load (Lisp_Font *f)
+ 
+ #ifdef HAVE_PANGO_XFT
+ 	pango_context = pango_xft_get_context (dpy, screen_num);
+-#else
+-	pango_context = pango_x_get_context (dpy, screen_num);
+ #endif
+ 
+ 	langname = g_strdup (setlocale (LC_CTYPE, NULL));
+@@ -514,9 +509,7 @@ pango_draw_line (XftDraw *draw, Window i
+ #ifdef HAVE_PANGO_XFT
+ 	if (PANGO_XFT_IS_FONT (font))
+ 	    pango_xft_render (draw, xft_color, font, glyphs, x, y);
+-	else
+ #endif
+-	    pango_x_render (dpy, id, gc, font, glyphs, x, y);
+ 
+ 	x += rect.width / PANGO_SCALE;
+     }
diff --git a/sawfish.spec b/sawfish.spec
index 00000a1..c010162 100644
--- a/sawfish.spec
+++ b/sawfish.spec
@@ -1,7 +1,7 @@
 Summary: An extensible window manager for the X Window System
 Name: sawfish
 Version: 1.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and Artistic 2.0
 # GPLv2+ is for Sawfish
 # Artistic 2.0 is for sounds
@@ -9,6 +9,8 @@ Group: User Interface/Desktops
 Source0: http://download.tuxfamily.org/%{name}/%{name}-%{version}.tar.bz2
 URL: http://sawfish.wikia.com/
 
+Patch0: sawfish-1.9.0-no-pangox.patch
+
 BuildRequires: gmp-devel
 BuildRequires: gtk2-devel
 BuildRequires: libXft-devel
@@ -47,6 +49,7 @@ Include files for Sawfish development.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-pangox
 
 %build
 %configure
@@ -101,6 +104,9 @@ fi
 # This is sawfish GUI configurator, not devel config script.
 
 %changelog
+* Mon Aug 27 2012 Adam Jackson <ajax at redhat.com> 1.9.0-3
+- sawfish-1.9.0-no-pangox.patch: Adapt to pangox removal
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild