Title: [207609] trunk/Tools
- Revision
- 207609
- Author
- r...@igalia.com
- Date
- 2016-10-20 03:11:02 -0700 (Thu, 20 Oct 2016)
Log Message
[GTK] Cannot build GTK+ with CUPS 2.* versions
https://bugs.webkit.org/show_bug.cgi?id=163591
Reviewed by Michael Catanzaro.
GTK+ is wrongly checking about the available CUPS version,
so if you have CUPS 2.* the configure step fails.
This has been already fixed upstream and included in 2.30 series:
https://git.gnome.org/browse/gtk+/commit/?id=631f6b536485829a0bd00532f5826ad302b4951b
Added patch on JHBuild so we can now build GTK+ with CUPS 2.*.
* gtk/jhbuild.modules: Applied patch and avoid using "configure" script directly
as the patch modifies "configure.ac".
* gtk/patches/configure-fix-detecting-CUPS-2.x.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (207608 => 207609)
--- trunk/Tools/ChangeLog 2016-10-20 10:00:22 UTC (rev 207608)
+++ trunk/Tools/ChangeLog 2016-10-20 10:11:02 UTC (rev 207609)
@@ -1,5 +1,24 @@
2016-10-20 Manuel Rego Casasnovas <r...@igalia.com>
+ [GTK] Cannot build GTK+ with CUPS 2.* versions
+ https://bugs.webkit.org/show_bug.cgi?id=163591
+
+ Reviewed by Michael Catanzaro.
+
+ GTK+ is wrongly checking about the available CUPS version,
+ so if you have CUPS 2.* the configure step fails.
+
+ This has been already fixed upstream and included in 2.30 series:
+ https://git.gnome.org/browse/gtk+/commit/?id=631f6b536485829a0bd00532f5826ad302b4951b
+
+ Added patch on JHBuild so we can now build GTK+ with CUPS 2.*.
+
+ * gtk/jhbuild.modules: Applied patch and avoid using "configure" script directly
+ as the patch modifies "configure.ac".
+ * gtk/patches/configure-fix-detecting-CUPS-2.x.patch: Added.
+
+2016-10-20 Manuel Rego Casasnovas <r...@igalia.com>
+
[GTK] Bump glib to 2.50.1
https://bugs.webkit.org/show_bug.cgi?id=163689
Modified: trunk/Tools/gtk/jhbuild.modules (207608 => 207609)
--- trunk/Tools/gtk/jhbuild.modules 2016-10-20 10:00:22 UTC (rev 207608)
+++ trunk/Tools/gtk/jhbuild.modules 2016-10-20 10:11:02 UTC (rev 207609)
@@ -175,8 +175,7 @@
</branch>
</autotools>
- <autotools id="gtk+" autogen-sh="configure"
- autogenargs="--disable-introspection">
+ <autotools id="gtk+" autogenargs="--disable-introspection">
<if condition-set="macos">
<autogenargs value="--enable-x11-backend=no --enable-quartz-backend" />
<makeargs value="-j1" />
@@ -194,7 +193,9 @@
</dependencies>
<branch module="/pub/GNOME/sources/gtk+/3.16/gtk+-3.16.4.tar.xz" version="3.16.4"
repo="ftp.gnome.org"
- hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"/>
+ hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e">
+ <patch file="configure-fix-detecting-CUPS-2.x.patch" strip="1"/>
+ </branch>
</autotools>
<autotools id="glib"
Added: trunk/Tools/gtk/patches/configure-fix-detecting-CUPS-2.x.patch (0 => 207609)
--- trunk/Tools/gtk/patches/configure-fix-detecting-CUPS-2.x.patch (rev 0)
+++ trunk/Tools/gtk/patches/configure-fix-detecting-CUPS-2.x.patch 2016-10-20 10:11:02 UTC (rev 207609)
@@ -0,0 +1,26 @@
+From 631f6b536485829a0bd00532f5826ad302b4951b Mon Sep 17 00:00:00 2001
+From: Misty De Meo <mistyde...@github.com>
+Date: Thu, 16 Jun 2016 15:59:27 -0700
+Subject: [PATCH] configure: fix detecting CUPS 2.x
+
+https://bugzilla.gnome.org/show_bug.cgi?id=767766
+---
+ configure.ac | 2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a0b9c34..b2a6315 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1438,7 +1438,7 @@ else
+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
+
+- if test $CUPS_API_MAJOR -gt 1 -o \
++ if test $CUPS_API_MAJOR -lt 1 -o \
+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
+ AC_MSG_ERROR([CUPS >= 1.2 not found])
+ fi
+--
+2.9.3
+
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
