Changeset 244214 in webkit

Timestamp:

Apr 12, 2019 6:29:42 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][WPE] Fix pacman install-dependencies packages
​https://bugs.webkit.org/show_bug.cgi?id=196817

Patch by Ludovico de Nittis <​ludovico.denittis@collabora.com> on 2019-04-12
Reviewed by Žan Doberšek.

python3-setuptools is called python-setuptools
ruby-highline is only available on AUR
libv4l-devel is incorporated in v4l-utils

• gtk/install-dependencies:
• wpe/install-dependencies:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/install-dependencies (modified) (1 diff)
• wpe/install-dependencies (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-12  Ludovico de Nittis  <ludovico.denittis@collabora.com>
+
+        [GTK][WPE] Fix pacman install-dependencies packages
+        https://bugs.webkit.org/show_bug.cgi?id=196817
+
+        Reviewed by Žan Doberšek.
+        
+        python3-setuptools is called python-setuptools
+        ruby-highline is only available on AUR
+        libv4l-devel is incorporated in v4l-utils
+
+        * gtk/install-dependencies:
+        * wpe/install-dependencies:
+
 2019-04-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/gtk/install-dependencies

@@ -371 +371 @@
         python2 \
         python2-lxml \
-        python3-setuptools \
+        python-setuptools \
         ragel \
         bigreqsproto \

trunk/Tools/wpe/install-dependencies

@@ -192 +192 @@
 
     # These are dependencies necessary for running tests.
-    # Note: apache-mod_bw and ruby-json is available in the AUR
+    # Note: apache-mod_bw, ruby-json and ruby-highline are available in the AUR
     packages="$packages \
         apache \
@@ -205 +205 @@
         python2-lxml \
         python2-psutil \
-        ruby \
-        ruby-highline"
+        ruby"
 
     # These are dependencies necessary for building the jhbuild.
@@ -218 +217 @@
         libsrtp \
         libtheora \
-        libv4l-dev \
         libvorbis \
         libvpx \
@@ -229 +227 @@
         orc \
         perl-xml-libxml \
-        python3-setuptools \
+        python-setuptools \
         util-linux \
         v4l-utils \
@@ -241 +239 @@
     pacman -S --needed $packages
 
-    echo "You will also need to follow the instructions on the Arch Wiki to make"
-    echo "'python' call python2 in the webkit folder"
-    echo "https://wiki.archlinux.org/index.php/Python#Dealing_with_version_problem_in_build_scripts"
+        cat <<-EOF
+
+The following packages are available from AUR, and needed for running tests:
+
+    apache-mod_bw ruby-json ruby-highline
+
+Instructions on how to use the AUR can be found on the Arch Wiki:
+
+    https://wiki.archlinux.org/index.php/Arch_User_Repository
+
+You will also need to follow the instructions on the wiki to make 'python'
+call python2 in the WebKit folder:
+
+    https://wiki.archlinux.org/index.php/Python#Dealing_with_version_problem_in_build_scripts
+
+Alternatively, you may use a Python 2.x virtualenv while hacking on WebKitGTK+:
+
+    https://wiki.archlinux.org/index.php/Python/Virtual_environment
+
+EOF
 }