Title: [280379] trunk/Tools
Revision
280379
Author
[email protected]
Date
2021-07-28 01:29:44 -0700 (Wed, 28 Jul 2021)

Log Message

[WPE] Add missing required dependencies to build WPE
https://bugs.webkit.org/show_bug.cgi?id=228530

Reviewed by Adrian Perez de Castro.

Script Tools/wpe/install-dependencies was not installing all the required
package dependencies necessary to build WPE. There were several
packages missing or other ones which were only present in the
WebKitGTK list of package dependencies (moved to GLIB).

* glib/dependencies/apt:
* gtk/dependencies/apt:
* wpe/dependencies/apt:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (280378 => 280379)


--- trunk/Tools/ChangeLog	2021-07-28 07:19:50 UTC (rev 280378)
+++ trunk/Tools/ChangeLog	2021-07-28 08:29:44 UTC (rev 280379)
@@ -1,3 +1,19 @@
+2021-07-28  Diego Pino Garcia  <[email protected]>
+
+        [WPE] Add missing required dependencies to build WPE
+        https://bugs.webkit.org/show_bug.cgi?id=228530
+
+        Reviewed by Adrian Perez de Castro.
+
+        Script Tools/wpe/install-dependencies was not installing all the required
+        package dependencies necessary to build WPE. There were several
+        packages missing or other ones which were only present in the
+        WebKitGTK list of package dependencies (moved to GLIB).
+
+        * glib/dependencies/apt:
+        * gtk/dependencies/apt:
+        * wpe/dependencies/apt:
+
 2021-07-27  Devin Rousso  <[email protected]>
 
         [Modern Media Controls] [macOS] Overflow button still shows as `on` even after contextmenu is dismissed

Modified: trunk/Tools/glib/dependencies/apt (280378 => 280379)


--- trunk/Tools/glib/dependencies/apt	2021-07-28 07:19:50 UTC (rev 280378)
+++ trunk/Tools/glib/dependencies/apt	2021-07-28 08:29:44 UTC (rev 280379)
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+# If the package $1 is available, prints it. Otherwise prints $2.
+# Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
+function aptIfElse {
+    if apt-cache show $1 &>/dev/null; then
+        echo $1
+    else
+        echo $2
+    fi
+}
+
 PACKAGES=(
     # These are dependencies necessary for building WebKitGTK/WPE.
     autoconf
@@ -14,8 +24,11 @@
     intltool
     itstool
     libasound2-dev
+    libatk1.0-dev
+    libepoxy-dev
     libevent-dev
     libfile-copy-recursive-perl
+    $(aptIfElse libgcrypt20-dev libgcrypt11-dev)
     libgstreamer1.0-dev
     libgstreamer-plugins-bad1.0-dev
     libgstreamer-plugins-base1.0-dev
@@ -28,6 +41,7 @@
     libsystemd-dev
     libtasn1-6-dev
     libtool
+    libwayland-dev
     libwebp-dev
     libwoff-dev
     libxslt1-dev

Modified: trunk/Tools/gtk/dependencies/apt (280378 => 280379)


--- trunk/Tools/gtk/dependencies/apt	2021-07-28 07:19:50 UTC (rev 280378)
+++ trunk/Tools/gtk/dependencies/apt	2021-07-28 08:29:44 UTC (rev 280379)
@@ -2,26 +2,14 @@
 
 source "$(dirname "$0")/../glib/dependencies/apt"
 
-# If the package $1 is available, prints it. Otherwise prints $2.
-# Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
-function aptIfElse {
-    if apt-cache show $1 &>/dev/null; then
-        echo $1
-    else
-        echo $2
-    fi
-}
-
 PACKAGES+=(
     # These are dependencies necessary for building WebKitGTK.
     geoclue-2.0
     gnome-common
-    libatk1.0-dev
     libedit-dev
     libenchant-dev
     libfaad-dev
     libffi-dev
-    $(aptIfElse libgcrypt20-dev libgcrypt11-dev)
     libgirepository1.0-dev
     libgl1-mesa-dev
     libgl1-mesa-glx
@@ -42,7 +30,6 @@
     libupower-glib-dev
     libvorbis-dev
     libvpx-dev
-    libwayland-dev
     libxcomposite-dev
     libxt-dev
     libxtst-dev
@@ -68,7 +55,6 @@
     libcroco3-dev
     libcups2-dev
     libdrm-dev
-    libepoxy-dev
     libevdev-dev
     libgbm-dev
     libgnutls28-dev

Modified: trunk/Tools/wpe/dependencies/apt (280378 => 280379)


--- trunk/Tools/wpe/dependencies/apt	2021-07-28 07:19:50 UTC (rev 280378)
+++ trunk/Tools/wpe/dependencies/apt	2021-07-28 08:29:44 UTC (rev 280379)
@@ -2,25 +2,21 @@
 
 source "$(dirname "$0")/../glib/dependencies/apt"
 
-# If the package $1 is available, prints it. Otherwise prints $2.
-# Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
-function aptIfElse {
-    if apt-cache show $1 &>/dev/null; then
-        echo $1
-    else
-        echo $2
-    fi
-}
-
 PACKAGES+=(
     # These are dependencies necessary for building WPE.
     g++
     gcc
+    libatk-bridge2.0-dev
+    libcairo2-dev
     libgbm-dev
     libgnutls28-dev
+    libharfbuzz-dev
     libicu-dev
+    libwpebackend-fdo-1.0-dev
+    libwpewebkit-1.0-dev
     libxml2-dev
     pkg-config
+    wayland-protocols
     zlib1g-dev
 
     # These are dependencies necessary for running tests.
@@ -36,7 +32,6 @@
     libtheora-dev
     libvorbis-dev
     libvpx-dev
-    libwayland-dev
     libxcb-xkb-dev
     libxkbcommon-dev
     libxrandr-dev
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to