Changeset 245011 in webkit

Timestamp:

May 7, 2019 9:15:11 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

[Flatpak] webkit-build fails due to missing GTK2 in build environment
​https://bugs.webkit.org/show_bug.cgi?id=197352

Reviewed by Philippe Normand.

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/org.webkit.GTK.yaml (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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 Philippe Normand.
+
+        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-07  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/flatpak/org.webkit.GTK.yaml

@@ -89 +89 @@
     - --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