Attachment 255920 Details for Bug 146056 – Patch

[patch] Patch

bug-146056-20150701165508.patch (text/plain), 10.74 KB, created by Carlos Alberto Lopez Perez on 2015-07-01 07:56:02 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2015-07-01 07:56:02 PDT

Size: 10.74 KB

patch

obsolete

>Subversion Revision: 186174
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 6423edd45cfef4c7d180964b1983ec68ae3f70fe..aa1f3158480991304059cc5dd00a087140b76168 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2015-07-01  Carlos Alberto Lopez Perez  <clopez@igalia.com>
>+
>+        [GTK] [Wayland] Allow building and testing the Wayland target with the default JHBuild moduleset.
>+        https://bugs.webkit.org/show_bug.cgi?id=146056
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * gtk/install-dependencies: libepoxy is now required for building GTK+.
>+        * gtk/jhbuild-wayland.modules: Removed. Not longer needed.
>+        * gtk/jhbuild.modules: Upgrade GTK+ (3.16.4) and required dependencies for building:
>+        Cairo (1.14.2), Gdk-Pixbuf (2.30.8) and GLib (2.44.1).
>+        * gtk/patches/cairo-1.12.8-add_disable-lto.patch: Removed. Not longer needed.
>+        Cairo removed support for LTO on (1.14). Upstream commit: c7ff9bb.
>+        * gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch: Removed. Not longer needed.
>+        GTK+ merged this patch on GTK+-3.10. Upstream commit: 8d83d98.
>+
> 2015-06-30  Andy VanWagoner  <thetalecrafter@gmail.com>
> 
>         Implement ECMAScript Internationalization API
>diff --git a/Tools/gtk/install-dependencies b/Tools/gtk/install-dependencies
>index 1b8bf24a91d4c948398b24cb5463929880de1878..a5c32240f47f35a81dadf8ce5c3ce22b11869be8 100755
>--- a/Tools/gtk/install-dependencies
>+++ b/Tools/gtk/install-dependencies
>@@ -122,6 +122,7 @@ function installDependenciesWithApt {
>         icon-naming-utils \
>         libcroco3-dev \
>         libegl1-mesa-dev \
>+        libepoxy-dev \
>         libgcrypt11-dev \
>         libgpg-error-dev \
>         libjson-glib-dev \
>@@ -254,6 +255,7 @@ function installDependenciesWithPacman {
>         gobject-introspection \
>         icon-naming-utils \
>         libcroco \
>+        libepoxy \
>         libgcrypt \
>         libgpg-error \
>         p11-kit \
>@@ -369,6 +371,7 @@ function installFedoraDependencies {
>         itstool \
>         libXfont-devel \
>         libcroco-devel \
>+        libepoxy-devel \
>         libgcrypt-devel \
>         libgpg-error-devel \
>         libp11-devel \
>diff --git a/Tools/gtk/jhbuild-wayland.modules b/Tools/gtk/jhbuild-wayland.modules
>deleted file mode 100644
>index f248c200ec7debc26b3ab697703647483b8cb528..0000000000000000000000000000000000000000
>--- a/Tools/gtk/jhbuild-wayland.modules
>+++ /dev/null
>@@ -1,43 +0,0 @@
>-<?xml version="1.0"?>
>-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
>-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
>-<moduleset>
>-
>-  
>-  <repository type="tarball" name="ftp.gnome.org"
>-      href="http://ftp.gnome.org"/>
>-
>-  <autotools id="gdk-pixbuf" autogen-sh="configure"
>-             autogenargs="--disable-introspection">
>-    <dependencies>
>-      <dep package="glib"/>
>-    </dependencies>
>-    <branch module="/pub/GNOME/sources/gdk-pixbuf/2.29/gdk-pixbuf-2.29.3.tar.xz" version="2.29.3"
>-            repo="ftp.gnome.org"
>-            hash="sha256:f3ab2e153809ceedc3f8b9b22cdee018ffe7bbec2d2a8b5154e0ce220ea7d088"/>
>-  </autotools>
>-
>-  <autotools id="gtk+" autogen-sh="configure"
>-             autogenargs="--disable-introspection --enable-x11-backend --enable-wayland-backend">
>-    <dependencies>
>-      <dep package="glib"/>
>-      <dep package="cairo"/>
>-      <dep package="at-spi2-atk"/>
>-      <dep package="gdk-pixbuf"/>
>-    </dependencies>
>-    <branch module="/pub/GNOME/sources/gtk+/3.12/gtk+-3.12.0.tar.xz" version="3.12.0"
>-            repo="ftp.gnome.org"
>-            hash="sha256:eb69741cd4029b5a1ac9cf04d9de55dcf9e30777a63891750f5d20cc554b6e4b"/>
>-  </autotools>
>-
>-  <autotools id="glib"
>-             autogen-sh="configure"
>-             autogenargs="--disable-dtrace">
>-    <dependencies>
>-      <dep package="libffi"/>
>-    </dependencies>
>-    <branch module="/pub/GNOME/sources/glib/2.40/glib-2.40.0.tar.xz" version="2.40.0"
>-            repo="ftp.gnome.org"
>-            hash="sha256:0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5"/>
>-  </autotools>
>-</moduleset>
>diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
>index 612128e0ab28f7fbc7b814f62c9a00476e7041c0..540aa03d8df75f0b315373277ea2737c943695ab 100644
>--- a/Tools/gtk/jhbuild.modules
>+++ b/Tools/gtk/jhbuild.modules
>@@ -63,19 +63,16 @@
>       href="http://anongit.freedesktop.org/git"/>
> 
>   <autotools id="cairo"
>-             autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no --disable-lto"
>+             autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no"
>              makeargs="">
>     <dependencies>
>       <dep package="fontconfig"/>
>       <dep package="pixman"/>
>       <dep package="glib"/>
>     </dependencies>
>-    <branch module="releases/cairo-1.12.8.tar.xz" version="1.12.8"
>+    <branch module="releases/cairo-1.14.2.tar.xz" version="1.14.2"
>             repo="cairographics.org"
>-            hash="sha256:8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9"
>-            md5sum="8b3dcade859c44fb7e56fc68edfe9a45">
>-      <patch file="cairo-1.12.8-add_disable-lto.patch" strip="1"/>
>-    </branch>
>+            hash="sha1:c8da68aa66ca0855b5d0ff552766d3e8679e1d24"/>
>   </autotools>
> 
>   <autotools id="pixman" autogen-sh="configure"
>@@ -127,10 +124,9 @@
>     <dependencies>
>       <dep package="glib"/>
>     </dependencies>
>-    <branch module="/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-2.26.5.tar.xz" version="2.26.5"
>+    <branch module="/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz" version="2.30.8"
>             repo="ftp.gnome.org"
>-            hash="sha256:77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84"
>-            md5sum="339329e6d619ee3e1cb93979111b04c0"/>
>+            hash="sha256:4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be"/>
>   </autotools>
> 
>   <autotools id="librsvg" autogen-sh="configure"
>@@ -156,11 +152,9 @@
>       <dep package="at-spi2-atk"/>
>       <dep package="gdk-pixbuf"/>
>     </dependencies>
>-    <branch module="/pub/GNOME/sources/gtk+/3.6/gtk+-3.6.0.tar.xz" version="3.6.0"
>+    <branch module="/pub/GNOME/sources/gtk+/3.16/gtk+-3.16.4.tar.xz" version="3.16.4"
>             repo="ftp.gnome.org"
>-            hash="sha256:e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049">
>-      <patch file="gtk-3.6-do-not-shutdown-accessibility.patch" strip="1"/>
>-    </branch>
>+            hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"/>
>   </autotools>
> 
>   <autotools id="glib"
>@@ -169,10 +163,9 @@
>     <dependencies>
>       <dep package="libffi"/>
>     </dependencies>
>-    <branch module="/pub/GNOME/sources/glib/2.41/glib-2.41.2.tar.xz" version="2.41.2"
>+    <branch module="/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz" version="2.44.1"
>             repo="ftp.gnome.org"
>-            hash="sha256:da1f7258655f0e196b9304cb9515784634f3797437923e236bb3466348811c96"
>-            md5sum="9636f60e99b98fd0fdb5239f905ac008">
>+            hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
>       <patch file="glib-warning-fix.patch" strip="1"/>
>     </branch>
>   </autotools>
>diff --git a/Tools/gtk/patches/cairo-1.12.8-add_disable-lto.patch b/Tools/gtk/patches/cairo-1.12.8-add_disable-lto.patch
>deleted file mode 100644
>index e740c9956a27dcb65d7f1f4bd8a49ccd308630d1..0000000000000000000000000000000000000000
>--- a/Tools/gtk/patches/cairo-1.12.8-add_disable-lto.patch
>+++ /dev/null
>@@ -1,52 +0,0 @@
>-From c3645d97ebd24c6f7ad850785d585aebc706a11c Mon Sep 17 00:00:00 2001
>-From: Bryce Harrington <b.harrington@samsung.com>
>-Date: Tue, 8 Jul 2014 13:14:20 -0700
>-Subject: configure.ac: Add a --disable-lto configure option
>-
>-Link-Time Optimization seems to be stable enough with gcc 4.8 and 4.9,
>-but has proven to be an issue in the past for many cairo users (webkit,
>-efl, ubuntu, opensuse, gentoo, arch...) who carry patches to disable it.
>-
>-Gentoo's patch[1] adds a --disable-lto option to leave it enabled by
>-default but give users the ability to work around lto related build
>-problems (c.f. fdo #77060).  Patch appears to have been authored by
>-Alexandre Rostovtsev[2].
>-
>-1: sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch
>-2: https://bugs.gentoo.org/show_bug.cgi?id=509552
>-
>-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60852
>-Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
>-Reviewed-by: Uli Schlachter <psychon@znc.in>
>-
>-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
>-index f984eb2..a72d948 100644
>---- a/build/configure.ac.warnings
>-+++ b/build/configure.ac.warnings
>-@@ -38,13 +38,18 @@ dnl options.  Namely, the following:
>- 
>- dnl -flto working really needs a test link, not just a compile
>- 
>--safe_MAYBE_WARN="$MAYBE_WARN"
>--MAYBE_WARN="$MAYBE_WARN -flto"
>--AC_TRY_LINK([],[
>-+AC_ARG_ENABLE(lto,
>-+  AS_HELP_STRING([--disable-lto],
>-+                 [Do not try to use Link-Time Optimization]))
>-+if test "x$enable_lto" != "xno"; then
>-+   safe_MAYBE_WARN="$MAYBE_WARN"
>-+   MAYBE_WARN="$MAYBE_WARN -flto"
>-+   AC_TRY_LINK([],[
>- 	int main(int argc, char **argv) { return 0; }
>--],[],[
>-+   ],[],[
>- 	MAYBE_WARN="$safe_MAYBE_WARN"
>--])
>-+   ])
>-+fi
>- 
>- MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
>- 
>--- 
>-cgit v0.10.2
>-
>diff --git a/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch b/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch
>deleted file mode 100644
>index 94636c7a4227bd22956b1aa4a625177d635b8f42..0000000000000000000000000000000000000000
>--- a/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch
>+++ /dev/null
>@@ -1,39 +0,0 @@
>---- gtk+-3.6.0/gtk/gtkmain.c	2012-09-18 16:34:42.000000000 +0100
>-+++ gtk+-3.6.0/gtk/gtkmain.c	2013-09-16 17:36:58.046546545 +0100
>-@@ -671,7 +671,6 @@
>- 
>- /* XXX: Remove me after getting rid of gail */
>- extern void _gtk_accessibility_init (void);
>--extern void _gtk_accessibility_shutdown (void);
>- 
>- static void
>- do_post_parse_initialization (int    *argc,
>-@@ -1180,8 +1179,6 @@
>- 
>-       /* Synchronize the recent manager singleton */
>-       _gtk_recent_manager_sync ();
>--
>--      _gtk_accessibility_shutdown ();
>-     }
>- }
>- 
>---- gtk+-3.6.0/gtk/gtkapplication.c	2012-09-24 00:57:30.000000000 +0100
>-+++ gtk+-3.6.0/gtk/gtkapplication.c	2013-09-16 17:37:23.154671051 +0100
>-@@ -47,8 +47,6 @@
>- #include <gdk/x11/gdkx.h>
>- #endif
>- 
>--extern void _gtk_accessibility_shutdown (void);
>--
>- /**
>-  * SECTION:gtkapplication
>-  * @title: GtkApplication
>-@@ -433,8 +431,6 @@
>-   /* Synchronize the recent manager singleton */
>-   _gtk_recent_manager_sync ();
>- 
>--  _gtk_accessibility_shutdown ();
>--
>-   G_APPLICATION_CLASS (gtk_application_parent_class)
>-     ->shutdown (application);
>- }

Actions: View | Formatted Diff | Diff

Attachments on bug 146056: 255754 | 255920