Attachment 369282 Details for Bug 197352 – Patch

[patch] Patch

bug-197352-20190507175214.patch (text/plain), 1.77 KB, created by Adrian Perez on 2019-05-07 07:52:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2019-05-07 07:52:16 PDT

Size: 1.77 KB

patch

obsolete

>Subversion Revision: 245001
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 97cbee665743a384cbe4dd44c0fb88a17baabdd6..690d1ac478d897a459fc8b1264512f6710e0c9bc 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-07  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [Flatpak] webkit-build fails due to missing GTK2 in build environment
>+        https://bugs.webkit.org/show_bug.cgi?id=197352
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The Flatpak runtimes do not include GTK 2.x anymore, which means that we need
>+        to build it ourselves on top in order to be able to build the GTK 2.x plugin
>+        process.
>+
>+        * flatpak/org.webkit.GTK.yaml: Add gtk2 package.
>+
> 2019-05-06  Tim Horton  <timothy_horton@apple.com>
> 
>         _overrideViewportWithArguments does not work when called before loading
>diff --git a/Tools/flatpak/org.webkit.GTK.yaml b/Tools/flatpak/org.webkit.GTK.yaml
>index 1ca461ebda56e3ae117b7f835ab86d4099db753c..49eccfd16308f4b411adb785df7bfc8e0df55d21 100644
>--- a/Tools/flatpak/org.webkit.GTK.yaml
>+++ b/Tools/flatpak/org.webkit.GTK.yaml
>@@ -88,6 +88,23 @@
>     - --disable-local-transport
>     - --without-dtrace
> 
>+# Required for the GTK2 plugin process
>+- name: gtk2
>+  sources:
>+  - type: archive
>+    url: https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.32.tar.xz
>+    sha256: b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
>+  - type: script
>+    commands:
>+      - "sed -i '1s/python$/&2/' gtk/gtk-builder-convert"
>+      - "sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool"
>+  config-opts:
>+    - --disable-gtk-doc
>+    - --disable-cups
>+    - --disable-papi
>+    - --enable-introspection=no
>+    - --with-gdktarget=x11
>+
> # Required for run-gtk-tests
> - name: pycairo
>   buildsystem: simple

Actions: View | Formatted Diff | Diff

Attachments on bug 197352: 369282