[Sawfish] Pango_x _render

[Togan Muftuoglu <toganm@xxxxxxxxxxxx>]

Hi,

On recent build for opensuse Factory, the upcoming version, the build is
broken with the following message

sawfish-1.9.1/src/fonts.c:519: undefined reference to `pango_x_render'

I found a patch in fedora package which is attached, maybe it should be
applied to the git source

Togan

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;
     }