Changeset 207609 in webkit

Timestamp:

Oct 20, 2016 3:11:02 AM (8 years ago)

Author:

Manuel Rego Casasnovas

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/jhbuild.modules (modified) (2 diffs)
• gtk/patches/configure-fix-detecting-CUPS-2.x.patch (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-20  Manuel Rego Casasnovas  <rego@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  <rego@igalia.com>
 

trunk/Tools/gtk/jhbuild.modules

@@ -176 +176 @@
   </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" />
@@ -195 +194 @@
     <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>