Title: [280354] trunk/Tools
Revision
280354
Author
[email protected]
Date
2021-07-27 15:51:11 -0700 (Tue, 27 Jul 2021)

Log Message

[GTK][WPE] Move WebKitGTK and WPE dependency packages to a common GLIB list
https://bugs.webkit.org/show_bug.cgi?id=228326

Reviewed by Adrian Perez de Castro.

WebKitGTK and WPE share many dependency packages. Until now each port
maintained its own list of dependencies. It was a common mistake to
add a new package dependency to one of the ports but not to the other
one.

This patch adds a common GLIB for dependency packages, which can help
prevent mistakes like the one described above.

* glib/dependencies/apt: Copied from Tools/wpe/dependencies/apt.
* glib/dependencies/dnf: Copied from Tools/wpe/dependencies/dnf.
* glib/dependencies/pacman: Copied from Tools/wpe/dependencies/pacman.
* gtk/dependencies/apt:
* gtk/dependencies/dnf:
* gtk/dependencies/pacman:
* wpe/dependencies/apt:
* wpe/dependencies/dnf:
* wpe/dependencies/pacman:

Modified Paths

Added Paths

Diff

Modified: trunk/Tools/ChangeLog (280353 => 280354)


--- trunk/Tools/ChangeLog	2021-07-27 22:42:02 UTC (rev 280353)
+++ trunk/Tools/ChangeLog	2021-07-27 22:51:11 UTC (rev 280354)
@@ -1,3 +1,28 @@
+2021-07-27  Diego Pino Garcia  <[email protected]>
+
+        [GTK][WPE] Move WebKitGTK and WPE dependency packages to a common GLIB list
+        https://bugs.webkit.org/show_bug.cgi?id=228326
+
+        Reviewed by Adrian Perez de Castro.
+
+        WebKitGTK and WPE share many dependency packages. Until now each port
+        maintained its own list of dependencies. It was a common mistake to
+        add a new package dependency to one of the ports but not to the other
+        one.
+
+        This patch adds a common GLIB for dependency packages, which can help
+        prevent mistakes like the one described above.
+
+        * glib/dependencies/apt: Copied from Tools/wpe/dependencies/apt.
+        * glib/dependencies/dnf: Copied from Tools/wpe/dependencies/dnf.
+        * glib/dependencies/pacman: Copied from Tools/wpe/dependencies/pacman.
+        * gtk/dependencies/apt:
+        * gtk/dependencies/dnf:
+        * gtk/dependencies/pacman:
+        * wpe/dependencies/apt:
+        * wpe/dependencies/dnf:
+        * wpe/dependencies/pacman:
+
 2021-07-27  Kevin Neal  <[email protected]>
 
         [results.webkit.org] Tooltips should remain visible when hovering over commit representations

Copied: trunk/Tools/glib/dependencies/apt (from rev 280353, trunk/Tools/wpe/dependencies/apt) (0 => 280354)


--- trunk/Tools/glib/dependencies/apt	                        (rev 0)
+++ trunk/Tools/glib/dependencies/apt	2021-07-27 22:51:11 UTC (rev 280354)
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+PACKAGES=(
+    # These are dependencies necessary for building WebKitGTK/WPE.
+    autoconf
+    automake
+    autopoint
+    autotools-dev
+    bubblewrap
+    cmake
+    gawk
+    gperf
+    gtk-doc-tools
+    intltool
+    itstool
+    libasound2-dev
+    libevent-dev
+    libfile-copy-recursive-perl
+    libgstreamer1.0-dev
+    libgstreamer-plugins-bad1.0-dev
+    libgstreamer-plugins-base1.0-dev
+    libjpeg-dev
+    libkate-dev
+    libopenjp2-7-dev
+    libpng-dev
+    libseccomp-dev
+    libsqlite3-dev
+    libsystemd-dev
+    libtasn1-6-dev
+    libtool
+    libwebp-dev
+    libwoff-dev
+    libxslt1-dev
+    ninja-build
+    patch
+    ruby
+
+    # These are dependencies necessary for running tests.
+    apache2
+    curl
+    fonts-liberation
+    gdb
+    libcgi-pm-perl
+    psmisc
+    pulseaudio-utils
+    python-gi
+    ruby-highline
+    ruby-json
+
+    # These are dependencies necessary for building with the Flatpak SDK.
+    flatpak
+
+    # These are dependencies necessary for building the jhbuild.
+    git
+    gsettings-desktop-schemas-dev
+    gyp
+    libegl1-mesa-dev
+    libexpat1-dev
+    libfdk-aac-dev
+    libgles2-mesa-dev
+    liborc-0.4-dev
+    libproxy-dev
+    libpsl-dev
+    libtool-bin
+    libxml-libxml-perl
+    python3-setuptools
+    uuid-dev
+    yasm
+
+    # These are dependencies necessary for using webkit-patch.
+    git-svn
+    subversion
+
+    # These are GStreamer plugins needed to play different media files.
+    gstreamer1.0-gl
+    gstreamer1.0-libav
+    gstreamer1.0-plugins-bad
+    gstreamer1.0-plugins-base
+    gstreamer1.0-plugins-good
+    gstreamer1.0-plugins-ugly
+    gstreamer1.0-pulseaudio
+)

Copied: trunk/Tools/glib/dependencies/dnf (from rev 280353, trunk/Tools/wpe/dependencies/dnf) (0 => 280354)


--- trunk/Tools/glib/dependencies/dnf	                        (rev 0)
+++ trunk/Tools/glib/dependencies/dnf	2021-07-27 22:51:11 UTC (rev 280354)
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+
+PACKAGES=(
+    # These are dependencies necessary for building WebKitGTK/WPE.
+    alsa-lib-devel
+    autoconf
+    automake
+    bubblewrap
+    cmake
+    gcc-c++
+    gperf
+    gstreamer1-devel
+    gstreamer1-plugins-bad-free-devel
+    gstreamer1-plugins-base-devel
+    gtk-doc
+    intltool
+    libevent-devel
+    libjpeg-turbo-devel
+    libkate-devel
+    libpng-devel
+    libseccomp-devel
+    libtasn1-devel
+    libwebp-devel
+    libxslt-devel
+    ninja-build
+    openjpeg2-devel
+    patch
+    perl-File-Copy-Recursive
+    perl-JSON-PP
+    perl-Time-HiRes
+    perl-version
+    ruby
+    sqlite-devel
+    systemd-devel
+
+    # These are dependencies necessary for running tests.
+    curl
+    gdb
+    httpd
+    liberation-fonts
+    mod_ssl
+    perl-CGI
+    psmisc
+    pulseaudio-utils
+    python2-psutil
+    rubygem-highline
+    rubygem-json
+
+    # These are dependencies necessary for building with the Flatpak SDK.
+    flatpak
+    pipenv
+
+    # These are dependencies necessary for building the jhbuild.
+    expat-devel
+    fdk-aac-devel
+    git
+    gsettings-desktop-schemas-devel
+    gyp
+    libproxy-devel
+    libpsl-devel
+    libuuid-devel
+    libxcb-devel
+    mesa-libEGL-devel
+    orc-devel
+    perl-XML-LibXML
+    python3-setuptools
+    yasm
+
+    # These are dependencies necessary for using webkit-patch.
+    git-svn
+    subversion
+
+    # These are GStreamer plugins needed to play different media files.
+    gstreamer1-plugins-bad-free
+    gstreamer1-plugins-bad-free-extras
+    gstreamer1-plugins-base
+    gstreamer1-plugins-good
+    gstreamer1-plugins-good-extras
+    gstreamer1-plugins-ugly-free
+)

Copied: trunk/Tools/glib/dependencies/pacman (from rev 280353, trunk/Tools/wpe/dependencies/pacman) (0 => 280354)


--- trunk/Tools/glib/dependencies/pacman	                        (rev 0)
+++ trunk/Tools/glib/dependencies/pacman	2021-07-27 22:51:11 UTC (rev 280354)
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+PACKAGES=(
+    # These are dependencies necessary for building WebKitGTK/WPE.
+    alsa-lib
+    autoconf
+    automake
+    bubblewrap
+    cmake
+    file
+    findutils
+    gawk
+    gcc
+    gperf
+    grep
+    groff
+    gst-plugins-base-libs
+    gstreamer
+    gtk-doc
+    gzip
+    intltool
+    itstool
+    libevent
+    libjpeg-turbo
+    libkate
+    libpng
+    libseccomp
+    libsystemd
+    libtasn1
+    libtool
+    libwebp
+    libxslt
+    m4
+    make
+    ninja
+    openjpeg2
+    patch
+    perl-file-copy-recursive
+    pkg-config
+    sed
+    sqlite
+    texinfo
+    which
+    woff2
+
+    # These are dependencies necessary for running tests.
+    # Note: ruby-json and ruby-highline are available in the AUR.
+    apache
+    curl
+    gdb
+    psmisc
+    pulseaudio
+    python2-psutil
+    ttf-liberation
+
+    # These are dependencies necessary for building with the Flatpak SDK.
+    flatpak
+    python-pipenv
+
+    # These are dependencies necessary for building the jhbuild.
+    # Note: Could not find libegl-mesa.
+    expat
+    git
+    gsettings-desktop-schemas
+    gyp
+    libfdk-aac
+    libproxy
+    libpsl
+    libxcb
+    orc
+    python-setuptools
+    yasm
+
+    # These are dependencies necessary for using webkit-patch.
+    svn
+
+    # These are GStreamer plugins needed to play different media files.
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+)

Modified: trunk/Tools/gtk/dependencies/apt (280353 => 280354)


--- trunk/Tools/gtk/dependencies/apt	2021-07-27 22:42:02 UTC (rev 280353)
+++ trunk/Tools/gtk/dependencies/apt	2021-07-27 22:51:11 UTC (rev 280354)
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+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 {
@@ -10,171 +12,95 @@
     fi
 }
 
-PACKAGES=(
-	# These are dependencies necessary for building WebKitGTK.
-	autoconf
-	automake
-	autopoint
-	autotools-dev
-	bubblewrap
-	cmake
-	gawk
-	geoclue-2.0
-	gnome-common
-	gperf
-	gtk-doc-tools
-	intltool
-	itstool
-	libasound2-dev
-	libatk1.0-dev
-	libedit-dev
-	libenchant-dev
-	libevent-dev
-	libfaad-dev
-	libffi-dev
-	libfile-copy-recursive-perl
-	$(aptIfElse libgcrypt20-dev libgcrypt11-dev)
-	libgirepository1.0-dev
-	libgl1-mesa-dev
-	libgl1-mesa-glx
-	libgstreamer1.0-dev
-	libgstreamer-plugins-bad1.0-dev
-	libgstreamer-plugins-base1.0-dev
-	libgtk-3-dev
-	libgudev-1.0-dev
-	libhyphen-dev
-	libjpeg-dev
-	libkate-dev
-	libmount-dev
-	libmpg123-dev
-	libnotify-dev
-	libopenjp2-7-dev
-	libopus-dev
-	libpango1.0-dev
-	libpng-dev
-	libpulse-dev
-	librsvg2-dev
-	libseccomp-dev
-	libsecret-1-dev
-	libsoup2.4-dev
-	libsqlite3-dev
-	libsrtp2-dev
-	libsystemd-dev
-	libtasn1-6-dev
-	libtheora-dev
-	libtool
-	libupower-glib-dev
-	libvorbis-dev
-	libvpx-dev
-	libwayland-dev
-	libwebp-dev
-	libwoff-dev
-	libxcomposite-dev
-	libxslt1-dev
-	libxt-dev
-	libxtst-dev
-	nasm
-	ninja-build
-	patch
-	ruby
-	xfonts-utils
+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
+    libgtk-3-dev
+    libgudev-1.0-dev
+    libhyphen-dev
+    libmount-dev
+    libmpg123-dev
+    libnotify-dev
+    libopus-dev
+    libpango1.0-dev
+    libpulse-dev
+    librsvg2-dev
+    libsecret-1-dev
+    libsoup2.4-dev
+    libsrtp2-dev
+    libtheora-dev
+    libupower-glib-dev
+    libvorbis-dev
+    libvpx-dev
+    libwayland-dev
+    libxcomposite-dev
+    libxt-dev
+    libxtst-dev
+    nasm
+    xfonts-utils
 
-	# These are dependencies necessary for running tests.
-	apache2
-	cups-daemon
-	curl
-	dbus-x11
-	fonts-liberation
-	gdb
-	hunspell
-	hunspell-en-gb
-	hunspell-en-us
-	libcgi-pm-perl
-	libgpg-error-dev
-	psmisc
-	pulseaudio-utils
-	python-gi
-	python-psutil
-	python-yaml
-	ruby
-	ruby-highline
-	ruby-json
-	weston
-	xvfb
+    # These are dependencies necessary for running tests.
+    cups-daemon
+    dbus-x11
+    hunspell
+    hunspell-en-gb
+    hunspell-en-us
+    python-psutil
+    python-yaml
+    weston
+    xvfb
 
-	# These are dependencies necessary for building with the Flatpak SDK.
-	flatpak
-
-	# These are dependencies necessary for building the jhbuild.
-	bison
-	flex
-	git
-	gobject-introspection
-	gsettings-desktop-schemas-dev
-	gyp
-	icon-naming-utils
-	libcroco3-dev
-	libcups2-dev
-	libdrm-dev
-	libegl1-mesa-dev
-	libepoxy-dev
-	libevdev-dev
-	libexpat1-dev
-	libfdk-aac-dev
-	libgbm-dev
-	libgles2-mesa-dev
-	libgnutls28-dev
-	libgpg-error-dev
-	libinput-dev
-	libjson-glib-dev
-	libmtdev-dev
-	liborc-0.4-dev
-	libp11-kit-dev
-	libpciaccess-dev
-	libproxy-dev
-	libpsl-dev
-	libssl-dev
-	libtiff5-dev
-	libtool-bin
-	libudev-dev
-	libunistring-dev
-	libv4l-dev
-	libxcb-composite0-dev
-	libxcb-xfixes0-dev
-	libxfont2
-	libxfont-dev
-	libxkbcommon-x11-dev
-	libxkbfile-dev
-	libxml-libxml-perl
-	python3-setuptools
-	python-dev
-	ragel
-	uuid-dev
-	x11proto-bigreqs-dev
-	x11proto-composite-dev
-	x11proto-gl-dev
-	x11proto-input-dev
-	x11proto-randr-dev
-	x11proto-resource-dev
-	x11proto-scrnsaver-dev
-	x11proto-video-dev
-	x11proto-xcmisc-dev
-	x11proto-xf86dri-dev
-	xfonts-utils
-	xtrans-dev
-	xutils-dev
-	yasm
-
-	# These are dependencies necessary for using webkit-patch.
-	git-svn
-	subversion
-
-	# These are GStreamer plugins needed to play different media files.
-	gstreamer1.0-gl
-	gstreamer1.0-libav
-	gstreamer1.0-plugins-bad
-	gstreamer1.0-plugins-base
-	gstreamer1.0-plugins-good
-	gstreamer1.0-plugins-ugly
-	gstreamer1.0-pulseaudio
+    # These are dependencies necessary for building the jhbuild.
+    bison
+    flex
+    gobject-introspection
+    icon-naming-utils
+    libcroco3-dev
+    libcups2-dev
+    libdrm-dev
+    libepoxy-dev
+    libevdev-dev
+    libgbm-dev
+    libgnutls28-dev
+    libgpg-error-dev
+    libinput-dev
+    libjson-glib-dev
+    libmtdev-dev
+    libp11-kit-dev
+    libpciaccess-dev
+    libssl-dev
+    libtiff5-dev
+    libudev-dev
+    libunistring-dev
+    libv4l-dev
+    libxcb-composite0-dev
+    libxcb-xfixes0-dev
+    libxfont2
+    libxfont-dev
+    libxkbcommon-x11-dev
+    libxkbfile-dev
+    python-dev
+    ragel
+    x11proto-bigreqs-dev
+    x11proto-composite-dev
+    x11proto-gl-dev
+    x11proto-input-dev
+    x11proto-randr-dev
+    x11proto-resource-dev
+    x11proto-scrnsaver-dev
+    x11proto-video-dev
+    x11proto-xcmisc-dev
+    x11proto-xf86dri-dev
+    xtrans-dev
+    xutils-dev
 )

Modified: trunk/Tools/gtk/dependencies/dnf (280353 => 280354)


--- trunk/Tools/gtk/dependencies/dnf	2021-07-27 22:42:02 UTC (rev 280353)
+++ trunk/Tools/gtk/dependencies/dnf	2021-07-27 22:51:11 UTC (rev 280354)
@@ -1,43 +1,27 @@
 #!/usr/bin/env bash
 
-PACKAGES=(
+source "$(dirname "$0")/../../glib/dependencies/dnf"
+
+PACKAGES+=(
     # These are dependencies necessary for building WebKitGTK.
-    alsa-lib-devel
     atk-devel
-    autoconf
-    automake
-    bubblewrap
     cairo-devel
-    cmake
     enchant-devel
-    gcc-c++
     geoclue2-devel
     gettext-devel
     gobject-introspection-devel
-    gperf
-    gstreamer1-devel
-    gstreamer1-plugins-bad-free-devel
-    gstreamer1-plugins-base-devel
     gtk3-devel
-    gtk-doc
     hyphen-devel
-    intltool
     json-glib-devel
     libedit-devel
-    libevent-devel
     libffi-devel
     libgcrypt-devel
     libgudev1-devel
-    libjpeg-turbo-devel
-    libkate-devel
     libmount-devel
     libnotify-devel
-    libpng-devel
-    libseccomp-devel
     libsecret-devel
     libsoup-devel
     libsrtp-devel
-    libtasn1-devel
     libtheora-devel
     libv4l-devel
     libvorbis-devel
@@ -44,71 +28,37 @@
     libvpx-devel
     libwayland-client-devel
     libwayland-server-devel
-    libwebp-devel
-    libxslt-devel
     libXt-devel
     libXtst-devel
     mesa-libGL-devel
     nasm
-    ninja-build
-    openjpeg2-devel
     openssl-devel
     opus-devel
-    patch
     pcre-devel
-    perl-File-Copy-Recursive
-    perl-JSON-PP
     perl-Switch
-    perl-Time-HiRes
-    perl-version
     pulseaudio-libs-devel
     python-devel
     redhat-rpm-config
-    ruby
-    sqlite-devel
-    systemd-devel
     upower-devel
     woff2-devel
 
     # These are dependencies necessary for running tests.
     cups
-    curl
     dbus-x11
-    gdb
-    httpd
     hunspell-en
     hunspell-en-GB
-    liberation-fonts
-    libgpg-error-devel
-    mod_ssl
-    perl-CGI
-    psmisc
-    pulseaudio-utils
     pygobject3-base
-    python2-psutil
     python2-yaml
-    ruby
-    rubygem-highline
-    rubygem-json
     weston-devel
     xorg-x11-server-Xvfb
 
-    # These are dependencies necessary for building with the Flatpak SDK.
-    flatpak
-    pipenv
-
     # These are dependencies necessary for building the jhbuild.
     bison
     cups-devel
     docbook-utils
-    expat-devel
-    fdk-aac-devel
     flex
-    git
     gnutls-devel
     gobject-introspection
-    gsettings-desktop-schemas-devel
-    gyp
     icon-naming-utils
     itstool
     libcroco-devel
@@ -119,37 +69,15 @@
     libinput-devel
     libp11-devel
     libpciaccess-devel
-    libproxy-devel
-    libpsl-devel
     libtiff-devel
     libunistring-devel
-    libuuid-devel
-    libxcb-devel
     libXfont2-devel
     libxkbcommon-x11-devel
     libxkbfile-devel
-    mesa-libEGL-devel
     mtdev-devel
-    orc-devel
-    perl-XML-LibXML
-    python3-setuptools
     ragel
-    systemd-devel
     xorg-x11-font-utils
     xorg-x11-proto-devel
     xorg-x11-util-macros
     xorg-x11-xtrans-devel
-    yasm
-
-    # These are dependencies necessary for using webkit-patch.
-    git-svn
-    subversion
-
-    # These are GStreamer plugins needed to play different media files.
-    gstreamer1-plugins-bad-free
-    gstreamer1-plugins-bad-free-extras
-    gstreamer1-plugins-base
-    gstreamer1-plugins-good
-    gstreamer1-plugins-good-extras
-    gstreamer1-plugins-ugly-fre
 )

Modified: trunk/Tools/gtk/dependencies/pacman (280353 => 280354)


--- trunk/Tools/gtk/dependencies/pacman	2021-07-27 22:42:02 UTC (rev 280353)
+++ trunk/Tools/gtk/dependencies/pacman	2021-07-27 22:51:11 UTC (rev 280354)
@@ -1,119 +1,64 @@
 #!/usr/bin/env bash
 
-PACKAGES=(
+source "$(dirname "$0")/../../glib/dependencies/pacman"
+
+PACKAGES+=(
     # These are dependencies necessary for building WebKitGTK.
-    alsa-lib
     atk
-    autoconf
-    automake
-    bubblewrap
-    cmake
     enchant
     faad2
-    file
-    findutils
-    gawk
-    gcc
     geoclue2
     gettext
     gnome-common
     gobject-introspection
-    gperf
-    grep
-    groff
-    gst-plugins-base-libs
-    gstreamer
     gtk3
-    gtk-doc
-    gzip
     hyphen
-    intltool
-    itstool
     libedit
-    libevent
     libffi
     libgcrypt
-    libjpeg-turbo
-    libkate
     libnotify
-    libpng
     libpulse
     librsvg
-    libseccomp
     libsecret
     libsoup
     libsrtp
-    libsystemd
-    libtasn1
     libtheora
-    libtool
     libvorbis
     libvpx
-    libwebp
     libxcomposite
-    libxslt
     libxt
     libxtst
-    m4
-    make
     mesa
     mesa-libgl
     mpg123
-    ninja
-    openjpeg2
     opus
     pango
-    patch
-    perl-file-copy-recursive
-    pkg-config
     ruby
-    sed
-    sqlite
-    texinfo
     upower
     util-linux
     wayland
-    which
-    woff2
     xorg-font-utils
 
     # These are dependencies necessary for running tests.
     # Note: ruby-json and ruby-highline are available in the AUR.
-    apache
     cups
-    curl
-    gdb
     hunspell
     hunspell-en
     hunspell-en_GB
     libgpg-error
-    psmisc
-    pulseaudio
-    python2-psutil
     python2-yaml
     python-gobject
-    ruby
-    ttf-liberation
     weston
     xorg-server-xvfb
 
-    # These are dependencies necessary for building with the Flatpak SDK.
-    flatpak
-    python-pipenv
-
     # These are dependencies necessary for building the jhbuild.
     # Note: Could not find libegl-mesa.
     bigreqsproto
     bison
     compositeproto
-    expat
     flex
-    git
     glproto
     gnutls
-    gobject-introspection
-    gsettings-desktop-schemas
-    gyp
     icon-naming-utils
     inputproto
     libcroco
@@ -121,26 +66,19 @@
     libdrm
     libepoxy
     libevdev
-    libfdk-aac
-    libgpg-error
     libinput
     libpciaccess
-    libproxy
-    libpsl
     libtiff
     libunistring-dev
-    libxcb
     libxfixes
     libxfont2
     libxkbcommon-x11
     libxkbfile
     mtdev
-    orc
     p11-kit
     perl-xml-libxm
     python2
     python2-lxml
-    python-setuptools
     ragel
     randrproto
     resourceproto
@@ -148,17 +86,6 @@
     videoproto
     xcmiscproto
     xf86driproto
-    xorg-font-utils
     xorg-util-macros
     xtrans
-    yasm
-
-    # These are dependencies necessary for using webkit-patch.
-    svn
-
-    # These are GStreamer plugins needed to play different media files.
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
 )

Modified: trunk/Tools/wpe/dependencies/apt (280353 => 280354)


--- trunk/Tools/wpe/dependencies/apt	2021-07-27 22:42:02 UTC (rev 280353)
+++ trunk/Tools/wpe/dependencies/apt	2021-07-27 22:51:11 UTC (rev 280354)
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+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 {
@@ -10,107 +12,33 @@
     fi
 }
 
-PACKAGES=(
+PACKAGES+=(
     # These are dependencies necessary for building WPE.
-    autoconf
-    automake
-    autopoint
-    autotools-dev
-    bubblewrap
-    cmake
     g++
-    gawk
     gcc
-    gperf
-    gtk-doc-tools
-    intltool
-    itstool
-    libasound2-dev
-    libevent-dev
     libgbm-dev
     libgnutls28-dev
-    libgstreamer1.0-dev
-    libgstreamer-plugins-bad1.0-dev
-    libgstreamer-plugins-base1.0-dev
     libicu-dev
-    libjpeg-dev
-    libkate-dev
-    libfile-copy-recursive-perl
-    libopenjp2-7-dev
-    libpng-dev
-    libseccomp-dev
-    libsqlite3-dev
-    libsystemd-dev
-    libtasn1-6-dev
-    libtool
-    libwebp-dev
-    libwoff-dev
     libxml2-dev
-    libxslt1-dev
-    ninja-build
-    patch
     pkg-config
-    ruby
     zlib1g-dev
 
     # These are dependencies necessary for running tests.
-    apache2
-    curl
-    gdb
-    fonts-liberation
-    libcgi-pm-perl
-    psmisc
-    pulseaudio-utils
-    python-gi
     python3-psutil
-    ruby
-    ruby-highline
-    ruby-json
 
-    # These are dependencies necessary for building with the Flatpak SDK.
-    flatpak
-
     # These are dependencies necessary for building the jhbuild.
-    git
-    gsettings-desktop-schemas-dev
-    gyp
     libegl-mesa0
-    libegl1-mesa-dev
-    libexpat1-dev
-    libfdk-aac-dev
-    libgles2-mesa-dev
     libluajit-5.1-dev
     libmount-dev
     libopus-dev
-    liborc-0.4-dev
-    libproxy-dev
-    libpsl-dev
     libpulse-dev
     libsrtp2-dev
     libtheora-dev
-    libtool-bin
     libvorbis-dev
     libvpx-dev
+    libwayland-dev
     libxcb-xkb-dev
     libxkbcommon-dev
-    libxml-libxml-perl
     libxrandr-dev
-    libwayland-dev
     luajit
-    python3-setuptools
-    uuid-dev
-    yasm
-
-    # These are dependencies necessary for using webkit-patch.
-    git-svn
-    subversion
-
-    # These are GStreamer plugins needed to play different media files.
-    gstreamer1.0-gl
-    gstreamer1.0-libav
-    gstreamer1.0-plugins-bad
-    gstreamer1.0-plugins-base
-    gstreamer1.0-plugins-good
-    gstreamer1.0-plugins-ugly
-    gstreamer1.0-pulseaudio
 )

Modified: trunk/Tools/wpe/dependencies/dnf (280353 => 280354)


--- trunk/Tools/wpe/dependencies/dnf	2021-07-27 22:42:02 UTC (rev 280353)
+++ trunk/Tools/wpe/dependencies/dnf	2021-07-27 22:51:11 UTC (rev 280354)
@@ -1,103 +1,33 @@
 #!/usr/bin/env bash
 
-PACKAGES=(
+source "$(dirname "$0")/../../glib/dependencies/dnf"
+
+PACKAGES+=(
     # These are dependencies necessary for building WebKitWPE.
-    alsa-lib-devel
-    autoconf
-    automake
-    bubblewrap
-    cmake
-    gcc-c++
     gnutls-devel
-    gperf
-    gstreamer1-devel
-    gstreamer1-plugins-bad-free-devel
-    gstreamer1-plugins-base-devel
-    gtk-doc
-    intltool
     itstool
-    libevent-devel
     libicu-devel
-    libjpeg-turbo-devel
-    libkate-devel
-    libpng-devel
-    libseccomp-devel
-    libtasn1-devel
     libtool
-    libwebp-devel
     libxml2-devel
-    libxslt-devel
-    ninja-build
-    openjpeg2-devel
-    patch
-    perl-File-Copy-Recursive
-    perl-JSON-PP
-    perl-Time-HiRes
-    perl-version
-    ruby
-    sqlite-devel
-    systemd-devel
     zlib-devel
 
     # These are dependencies necessary for running tests.
-    curl
-    gdb
-    httpd
-    liberation-fonts
-    mod_ssl
-    perl-CGI
-    psmisc
-    pulseaudio-utils
-    python2-psutil
     python-gobject-base
-    ruby
-    rubygem-highline
-    rubygem-json
 
-    # These are dependencies necessary for building with the Flatpak SDK.
-    flatpak
-    pipenv
-
     # These are dependencies necessary for building the jhbuild.
-    expat-devel
-    fdk-aac-devel
-    git
-    gsettings-desktop-schemas-devel
-    gyp
     libmount-devel
-    libproxy-devel
-    libpsl-devel
     libsrtp-devel
     libtheora-devel
-    libuuid-devel
     libv4l-devel
     libvorbis-devel
     libvpx-devel
-    libxcb-devel
     libxkbcommon-devel
     libXrandr-devel
     luajit
     luajit-devel
-    mesa-libEGL-devel
     mesa-libGLES-devel
     opus-devel
-    orc-devel
-    perl-XML-LibXML
     pulseaudio-libs-devel
-    python3-setuptools
     wayland-devel
     woff2-devel
-    yasm
-
-    # These are dependencies necessary for using webkit-patch.
-    git-svn
-    subversion
-
-    # These are GStreamer plugins needed to play different media files.
-    gstreamer1-plugins-bad-free
-    gstreamer1-plugins-bad-free-extras
-    gstreamer1-plugins-base
-    gstreamer1-plugins-good
-    gstreamer1-plugins-good-extras
-    gstreamer1-plugins-ugly-free
 )

Modified: trunk/Tools/wpe/dependencies/pacman (280353 => 280354)


--- trunk/Tools/wpe/dependencies/pacman	2021-07-27 22:42:02 UTC (rev 280353)
+++ trunk/Tools/wpe/dependencies/pacman	2021-07-27 22:51:11 UTC (rev 280354)
@@ -1,106 +1,37 @@
 #!/usr/bin/env bash
 
-PACKAGES=(
+source "$(dirname "$0")/../../glib/dependencies/pacman"
+
+PACKAGES+=(
     # These are dependencies necessary for building WPE.
-    alsa-lib
-    autoconf
-    automake
-    bubblewrap
-    cmake
-    file
-    findutils
-    gawk
-    gcc
     gnutls
-    gperf
-    grep
-    groff
-    gst-plugins-base-libs
-    gstreamer
-    gtk-doc
-    gzip
     icu
-    intltool
-    itstool
-    libevent
-    libjpeg-turbo
-    libkate
-    libpng
-    libseccomp
-    libsystemd
-    libtasn1
-    libtool
-    libwebp
     libxml2
-    libxslt
-    m4
-    make
-    ninja
-    openjpeg2
-    patch
-    perl-file-copy-recursive
-    pkg-config
     ru
-    sed
-    sqlite
-    texinfo
-    which
-    woff2
     zlib
 
     # These are dependencies necessary for running tests.
     # Note: ruby-json and ruby-highline are available in the AUR.
-    apache
-    curl
-    gdb
     perl-cgi
-    psmisc
-    pulseaudio
     python2
     python2-gobject
     python2-lxml
-    python2-psutil
     ruby
-    ttf-liberation
 
-    # These are dependencies necessary for building with the Flatpak SDK.
-    flatpak
-    python-pipenv
-
     # These are dependencies necessary for building the jhbuild.
-    expat
-    git
-    gsettings-desktop-schemas
-    gyp
-    libfdk-aac
-    libproxy
-    libpsl
     libpulse
     libsrtp
     libtheora
     libvorbis
     libvpx
-    libxcb
     libxkbcommon
     luajit
     mesa
     mesa-libgl
     opus
-    orc
     perl-xml-libxml
-    python-setuptools
     util-linux
     v4l-utils
     wayland
     xorg-xrandr
-    yasm
-
-    # These are dependencies necessary for using webkit-patch.
-    svn
-
-    # These are GStreamer plugins needed to play different media files.
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
 )
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to