[patch] files/pygobject-3.0.2_py3cairo.patch

pygobject-3.0.2_py3cairo.patch (text/plain), 3.31 KB, created by Ian Delaney (RETIRED) on 2011-11-29 20:54:53 UTC

diff -ur pygobject-3.0.2.orig/configure pygobject-3.0.2/configure
--- configure	2011-10-22 06:19:47.000000000 +0800
+++ configure	2011-11-30 04:43:28.466950493 +0800
@@ -15840,14 +15840,14 @@
     pkg_cv_PYCAIRO_CFLAGS="$PYCAIRO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"py3cairo >= 1.10.0
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pycairogrep >= 1.10.0
         \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "py3cairo >= 1.10.0
+  ($PKG_CONFIG --exists --print-errors "pycairogrep >= 1.10.0
         ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PYCAIRO_CFLAGS=`$PKG_CONFIG --cflags "py3cairo >= 1.10.0
+  pkg_cv_PYCAIRO_CFLAGS=`$PKG_CONFIG --cflags "pycairogrep >= 1.10.0
         " 2>/dev/null`
 else
   pkg_failed=yes
@@ -15859,14 +15859,14 @@
     pkg_cv_PYCAIRO_LIBS="$PYCAIRO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"py3cairo >= 1.10.0
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pycairogrep >= 1.10.0
         \""; } >&5
-  ($PKG_CONFIG --exists --print-errors "py3cairo >= 1.10.0
+  ($PKG_CONFIG --exists --print-errors "pycairogrep >= 1.10.0
         ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PYCAIRO_LIBS=`$PKG_CONFIG --libs "py3cairo >= 1.10.0
+  pkg_cv_PYCAIRO_LIBS=`$PKG_CONFIG --libs "pycairogrep >= 1.10.0
         " 2>/dev/null`
 else
   pkg_failed=yes
@@ -15887,16 +15887,16 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "py3cairo >= 1.10.0
+	        PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pycairogrep >= 1.10.0
         " 2>&1`
         else
-	        PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "py3cairo >= 1.10.0
+	        PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pycairogrep >= 1.10.0
         " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PYCAIRO_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (py3cairo >= 1.10.0
+	as_fn_error $? "Package requirements (pycairogrep >= 1.10.0
         ) were not met:
 
 $PYCAIRO_PKG_ERRORS
diff -ur pygobject-3.0.2.orig/configure.ac pygobject-3.0.2/configure.ac
--- configure.ac	2011-10-01 02:20:59.000000000 +0800
+++ configure.ac	2011-11-30 04:43:17.077950497 +0800
@@ -18,7 +18,7 @@
 dnl versions of packages we require ...
 m4_define(introspection_required_version, 1.29.0)
 m4_define(py2cairo_required_version, 1.2.0)
-m4_define(py3cairo_required_version, 1.10.0)
+m4_define(pycairogrep_required_version, 1.10.0)
 m4_define(glib_required_version, 2.24.0)
 m4_define(gio_required_version, 2.24.0)
 
@@ -201,7 +201,7 @@
 if test "$enable_cairo" != no; then
     if test $build_py3k = true; then  
         PKG_CHECK_MODULES(PYCAIRO,
-            py3cairo >= py3cairo_required_version
+            pycairogrep >= pycairogrep_required_version
         )
     else
         PKG_CHECK_MODULES(PYCAIRO,