2.11 hacker snapshot

["Joseph E. Sacco, PhD" <joseph_sacco comcast net>]

The latest 2.11 hacker snapshot patches gtk+-2.7.4 to remove the
necessity of using the curren CVS version of cairo, cairo-0.5.2-head.

Attached are patches to do the same for pango, which is a dependency for
gtk+.


-Joseph

-- 
joseph_sacco [at] comcast [dot] net

91f386893ff483e14dc4571e352150e4  download/pango-1.9.1.tar.bz2
834d9bfba20fc36c0fbd2683b353ef3f  download/hack-around-cairo-configure.diff

--- pango-1.9.1/configure-	2005-07-28 13:39:49.000000000 -0400
+++ pango-1.9.1/configure	2005-07-28 13:40:58.000000000 -0400
@@ -21654,23 +21654,23 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for cairo >= 0.5.2-head" >&5
-echo $ECHO_N "checking for cairo >= 0.5.2-head... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for cairo >=0.5.2" >&5
+echo $ECHO_N "checking for cairo >=0.5.2... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "cairo >= 0.5.2-head" ; then
+        if $PKG_CONFIG --exists "cairo >=0.5.2" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
 echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
-            CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 0.5.2-head"`
+            CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >=0.5.2"`
             echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
 echo "${ECHO_T}$CAIRO_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
 echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
-            CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 0.5.2-head"`
+            CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >=0.5.2"`
             echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
 echo "${ECHO_T}$CAIRO_LIBS" >&6
         else
@@ -21678,7 +21678,7 @@
             CAIRO_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 0.5.2-head"`
+            CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >=0.5.2"`
 
         fi
 

GARNAME = pango
GARVERSION = 1.9.1
CATEGORIES = platform
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
PATCHFILES = hack-around-cairo-configure.diff

LIBDEPS = freedesktop/cairo

DESCRIPTION = pango
define BLURB
 #FIXME: blurb goes here
endef

FIXUP_SCRIPTS = $(WORKSRC)/libtool
CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = $(WORKSRC)/Makefile

CONFIGURE_ARGS = $(DIRPATHS) --without-qt

include ../category.mk

post-install:
	@install -d $(sysconfdir)/pango
	@$(bindir)/pango-querymodules > $(sysconfdir)/pango/pango.modules