[Flatpak] webkit-build fails due to missing GTK2 in build environment
authoraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 May 2019 16:15:11 +0000 (16:15 +0000)
committeraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 May 2019 16:15:11 +0000 (16:15 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245011 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 53c2cb6..7ed590a 100644 (file)
@@ -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 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>
 
         [macOS] Avoid crashing the UI process when writing empty data to the pasteboard
index 1ca461e..49eccfd 100644 (file)
     - --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