Title: [209482] trunk/Tools
- Revision
- 209482
- Author
- changs...@webkit.org
- Date
- 2016-12-07 14:36:46 -0800 (Wed, 07 Dec 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+ build has failed on the system which CUPS 2.x is installed in. GTK+ 3.16.4
does not assume to use the recent CUPS thus it fails to detect the CUPS in configuration.
GTK+ upstream fixed this issue but it is not easy to apply the original patch to our
old gtk+ since it requires not only bumping up glib accordingly and its consequence
causes many printing test failures. So, I propose to fix the configuration issue by
applying the change to the configure file directly. By doing this, we don't need to
upgrade glib and worry about any test failures as a consequence of the upgraded glib.
* gtk/jhbuild.modules:
* gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (209481 => 209482)
--- trunk/Tools/ChangeLog 2016-12-07 22:30:58 UTC (rev 209481)
+++ trunk/Tools/ChangeLog 2016-12-07 22:36:46 UTC (rev 209482)
@@ -1,3 +1,21 @@
+2016-12-07 ChangSeok Oh <changs...@webkit.org>
+
+ [GTK] Cannot build GTK+ with CUPS 2.* versions
+ https://bugs.webkit.org/show_bug.cgi?id=163591
+
+ Reviewed by Michael Catanzaro.
+
+ GTK+ build has failed on the system which CUPS 2.x is installed in. GTK+ 3.16.4
+ does not assume to use the recent CUPS thus it fails to detect the CUPS in configuration.
+ GTK+ upstream fixed this issue but it is not easy to apply the original patch to our
+ old gtk+ since it requires not only bumping up glib accordingly and its consequence
+ causes many printing test failures. So, I propose to fix the configuration issue by
+ applying the change to the configure file directly. By doing this, we don't need to
+ upgrade glib and worry about any test failures as a consequence of the upgraded glib.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch: Added.
+
2016-12-07 Simon Fraser <simon.fra...@apple.com>
Fix use of enum in a WK2 C SPI header.
Modified: trunk/Tools/gtk/jhbuild.modules (209481 => 209482)
--- trunk/Tools/gtk/jhbuild.modules 2016-12-07 22:30:58 UTC (rev 209481)
+++ trunk/Tools/gtk/jhbuild.modules 2016-12-07 22:36:46 UTC (rev 209482)
@@ -196,7 +196,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="gtk+-configure-fix-detecting-CUPS-2.x.patch" strip="1"/>
+ </branch>
</autotools>
<autotools id="glib"
Added: trunk/Tools/gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch (0 => 209482)
--- trunk/Tools/gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch (rev 0)
+++ trunk/Tools/gtk/patches/gtk+-configure-fix-detecting-CUPS-2.x.patch 2016-12-07 22:36:46 UTC (rev 209482)
@@ -0,0 +1,11 @@
+--- a/configure 2016-12-06 14:33:55.708778846 -0500
++++ b/configure 2016-12-06 14:35:09.695069930 -0500
+@@ -25092,7 +25092,7 @@
+ 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
+ as_fn_error $? "CUPS >= 1.2 not found" "$LINENO" 5
+ fi
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
