garnome r6594 - in trunk: . freedesktop/pixman freedesktop/pixman/files

[kbrae svn gnome org]

Author: kbrae
Date: Tue Jun  3 22:55:06 2008
New Revision: 6594
URL: http://svn.gnome.org/viewvc/garnome?rev=6594&view=rev

Log:
	* freedesktop/pixman: Add upstream patch to disable interactive
	tests depending on GTK+, introducing a circular dependency.



Added:
   trunk/freedesktop/pixman/files/
   trunk/freedesktop/pixman/files/pixman-disable-gtk.patch
Modified:
   trunk/ChangeLog
   trunk/freedesktop/pixman/Makefile
   trunk/freedesktop/pixman/checksums

Modified: trunk/freedesktop/pixman/Makefile
==============================================================================
--- trunk/freedesktop/pixman/Makefile	(original)
+++ trunk/freedesktop/pixman/Makefile	Tue Jun  3 22:55:06 2008
@@ -2,6 +2,7 @@
 GARVERSION = 0.10.0
 CATEGORIES = freedesktop
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = pixman-disable-gtk.patch
 
 MASTER_SITES = http://cairographics.org/releases/
 
@@ -16,6 +17,14 @@
 BUILD_SCRIPTS = $(WORKSRC)/Makefile
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
-CONFIGURE_ARGS = $(DIRPATHS)
+# actually disables interactive tests, depending on GTK+, introducing a
+# circular dependency
+CONFIGURE_ARGS = $(DIRPATHS) --disable-gtk
 
 include ../category.mk
+
+# needed for pixman-disable-gtk.patch upstream patch
+pre-configure:
+	@echo "  Regenerating configure..."
+	@cd $(WORKSRC); rm -f configure; autoconf
+	@$(MAKECOOKIE)

Modified: trunk/freedesktop/pixman/checksums
==============================================================================
--- trunk/freedesktop/pixman/checksums	(original)
+++ trunk/freedesktop/pixman/checksums	Tue Jun  3 22:55:06 2008
@@ -1 +1,2 @@
 41804ac38025102dcc9891dfd4a3d105  download/pixman-0.10.0.tar.gz
+ccafabcc08093deb980a1ed3808f6588  download/pixman-disable-gtk.patch

Added: trunk/freedesktop/pixman/files/pixman-disable-gtk.patch
==============================================================================
--- (empty file)
+++ trunk/freedesktop/pixman/files/pixman-disable-gtk.patch	Tue Jun  3 22:55:06 2008
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index 637f835..fcd9372 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -237,7 +237,16 @@ dnl ========================================================
+ AC_SUBST(MMX_CFLAGS)
+ AC_SUBST(SSE_CFLAGS)
+ 
+-PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
++AC_ARG_ENABLE(gtk,
++   [AC_HELP_STRING([--disable-gtk],
++                   [disable tests using GTK+])],
++   [disable_gtk=yes], [disable_gtk=no])
++
++if test $disable_gtk = no ; then
++   PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
++else
++   HAVE_GTK=no
++fi
+ AM_CONDITIONAL(HAVE_GTK, [test "x$HAVE_GTK" = xyes])
+ 
+ AC_SUBST(GTK_CFLAGS)