From ecd451750b148f09f0b79c4d499267a61acf8714 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Wed, 2 Feb 2022 15:03:15 +0700
Subject: [PATCH] libraries/webkit2gtk: Revert back to building 4.0 API.

This reverts commit 9b3dc1f1ca75b9e0a83d65b66076001370a111a5.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/webkit2gtk/README                |  4 ----
 libraries/webkit2gtk/webkit2gtk.SlackBuild | 19 +++++--------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/libraries/webkit2gtk/README b/libraries/webkit2gtk/README
index a745c0704e..fc82e5029b 100644
--- a/libraries/webkit2gtk/README
+++ b/libraries/webkit2gtk/README
@@ -7,7 +7,3 @@ of systems from desktop computers to embedded systems like phones,
 tablets, and televisions.
 
 This package provides WebKit2 API and can co-exist with webkitgtk{3}.
-
-NOTE:
-If you need to build webkit2 API v4.1, use SOUP3=YES ./webkit2gtk.SlackBuild
-It requires libsoup3 to be present before building this package.
diff --git a/libraries/webkit2gtk/webkit2gtk.SlackBuild b/libraries/webkit2gtk/webkit2gtk.SlackBuild
index 5df4ad8b7b..051bf38764 100644
--- a/libraries/webkit2gtk/webkit2gtk.SlackBuild
+++ b/libraries/webkit2gtk/webkit2gtk.SlackBuild
@@ -82,15 +82,6 @@ find -L . \
 
 patch -p1 < $CWD/unhide-deprecated-api.patch
 
-# Use Slackware's libsoup by default, but we offer libsoup3 to build API v4.1:
-if [ "${SOUP3:-NO}" = "YES" ]; then
-  USESOUP2=""
-  WKAPI="4.1"
-else
-  USESOUP2="-DUSE_SOUP2=ON"
-  WKAPI="4.0"
-fi
-
 mkdir -p build
 cd build
   cmake -DPORT=GTK \
@@ -100,11 +91,11 @@ cd build
 	-DCMAKE_SKIP_RPATH=ON \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
-	-DLIBEXEC_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/webkit2gtk-$WKAPI \
+	-DLIBEXEC_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/webkit2gtk-4.0 \
 	-DENABLE_GAMEPAD=OFF \
 	-DENABLE_MINIBROWSER=ON \
 	-DUSE_SYSTEMD=OFF \
-        $USESOUP2 \
+        -DUSE_SOUP2=ON \
         -Wno-dev \
         -G Ninja \
         ..
@@ -114,11 +105,11 @@ cd build
 "${NINJA:=ninja}" -j$(expr $(nproc) / 2)
 DESTDIR=$PKG $NINJA -j1 install
 
-mkdir -p $PKG/usr/share/gtk-doc/html/webkit{2,dom}gtk-$WKAPI
+mkdir -p $PKG/usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0
 install -m 0644 ../Documentation/webkit2gtk-4.0/html/* \
-  $PKG/usr/share/gtk-doc/html/webkit2gtk-$WKAPI
+  $PKG/usr/share/gtk-doc/html/webkit2gtk-4.0
 install -m 0644 ../Documentation/webkitdomgtk-4.0/html/* \
-  $PKG/usr/share/gtk-doc/html/webkitdomgtk-$WKAPI
+  $PKG/usr/share/gtk-doc/html/webkitdomgtk-4.0
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ../NEWS $PKG/usr/doc/$PRGNAM-$VERSION