Attachment 210069 Details for Bug 120455 – Patch

[patch] Patch

bug-120455-20130830142836.patch (text/plain), 2.90 KB, created by ChangSeok Oh on 2013-08-29 22:28:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: ChangSeok Oh

Created: 2013-08-29 22:28:37 PDT

Size: 2.90 KB

patch

obsolete

>Subversion Revision: 154743
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9a596c1ede60184bc19678995653579bff71e3a4..573def48767f8170562b35402120e5f1d90a0f62 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2013-08-29  ChangSeok Oh  <changseok.oh@collabora.com>
>+
>+        [GTK] Add wayland-dependencies modulesset to jhbuild-optional.modules
>+        https://bugs.webkit.org/show_bug.cgi?id=120455
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Current versions of gtk+, gdk-pixbuf and glib don't fit the requirement for wayland support.
>+        With this patch, you can build extra gtk+, gdk-pixbuf and glib through jhbuild with exporting
>+        WEBKIT_EXTRA_MODULES=wayland-dependencies.
>+
>+        * gtk/jhbuild-optional.modules:
>+
> 2013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
> 
>         Http tests fails on Debian with Apache 2.4
>diff --git a/Tools/gtk/jhbuild-optional.modules b/Tools/gtk/jhbuild-optional.modules
>index cccf8ffff33a90683a6ab58dcb5c3cf0982bb5a3..a4d0d2dd7c25b7b2b6e17bc2f9980426c939a80a 100644
>--- a/Tools/gtk/jhbuild-optional.modules
>+++ b/Tools/gtk/jhbuild-optional.modules
>@@ -16,4 +16,45 @@
>             hash="sha256:e5399dfb61376a7500d20cb22715152780aa3a2c8a64281ec6bc8f0ebeb8b689"/>
>   </autotools>
> 
>+  <metamodule id="wayland-dependencies">
>+    <dependencies>
>+      <dep package="gdk-pixbuf-for-wayland"/>
>+      <dep package="gtk+-for-wayland"/>
>+      <dep package="glib-for-wayland"/>
>+    </dependencies>
>+  </metamodule>
>+
>+  <autotools id="gdk-pixbuf-for-wayland" autogen-sh="configure"
>+             autogenargs="--disable-introspection">
>+    <dependencies>
>+      <dep package="glib-for-wayland"/>
>+    </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+-for-wayland" autogen-sh="configure"
>+             autogenargs="--disable-introspection --enable-x11-backend --enable-wayland-backend">
>+    <dependencies>
>+      <dep package="glib-for-wayland"/>
>+      <dep package="cairo"/>
>+      <dep package="at-spi2-atk"/>
>+      <dep package="gdk-pixbuf-for-wayland"/>
>+    </dependencies>
>+    <branch module="/pub/GNOME/sources/gtk+/3.9/gtk+-3.9.6.tar.xz" version="3.9.6"
>+            repo="ftp.gnome.org"
>+            hash="sha256:4d34b7cd763ca4975b8a55e587923eeefe7b3c8e08d3d01c9111900fca30c817"/>
>+  </autotools>
>+
>+  <autotools id="glib-for-wayland"
>+             autogen-sh="configure"
>+             autogenargs="--disable-dtrace">
>+    <dependencies>
>+      <dep package="libffi"/>
>+    </dependencies>
>+    <branch module="/pub/GNOME/sources/glib/2.37/glib-2.37.6.tar.xz" version="2.37.6"
>+            repo="ftp.gnome.org"
>+            hash="sha256:01e1de3179cc58dafc0c950363530fccdefc6dda32a25aed96dd24dc23b83165"/>
>+  </autotools>
> </moduleset>

Actions: View | Formatted Diff | Diff

Attachments on bug 120455: 210069 | 210791 | 210793 | 211166