From a2ca8e357f346aaab5c079649b7f0ab99b6a584f Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sun, 25 Jun 2017 02:49:12 -0400
Subject: network/surf: Updated for version 2.0.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 network/surf/surf.SlackBuild | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'network/surf/surf.SlackBuild')

diff --git a/network/surf/surf.SlackBuild b/network/surf/surf.SlackBuild
index 12079a00f1..98507c6896 100644
--- a/network/surf/surf.SlackBuild
+++ b/network/surf/surf.SlackBuild
@@ -6,13 +6,22 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170625 bkw:
+# - updated for v2.0 (webkit2gtk now required).
+# - re-work searchengines.diff and homepage.diff for v2.0.
+# - remove "sw" search from searchengines.diff, since packages.slackware.eu
+#   no longer exists. Before you ask, no, I can't replace it with the official
+#   search at packages.slackware.com, because searchengines.diff only does
+#   HTTP GET requests. Find me a working Slackware package search that doesn't
+#   require a POST request, and I'll add it to searchengines.diff.
+
 # 20170121 bkw:
 # - updated for v0.7.
 # - remove patches/startfullscreen.diff as it's integrated into 0.7
 # - update homepage.diff and searchengines.diff for 0.7
 
 PRGNAM=surf
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,6 +67,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Revert upstream commit f9714ab8, which requires gtk+3-3.20.0 or greater.
+# We only have 3.18.9 in Slack 14.2. NB: submission reviewer, please don't
+# move this patch into patches/ (it must always be applied, whether or not
+# PATCH=yes is set).
+patch -p1 < $CWD/getkbdevice.diff
+
 # Add a couple of nice patches from upstream, unless disabled. Note that
 # upstream expects users to add patches and edit the source to customize it.
 # This SlackBuild just semi-automates some of that process.
@@ -71,7 +86,7 @@ fi
 
 # Customization.
 
-# Default to rxvt rather than st as the terminal for running wget when
+# Default to rxvt rather than st as the terminal for running curl when
 # downloading. This avoids adding st as a required dep.
 TERMINAL=${TERMINAL:-rxvt}
 
@@ -88,17 +103,9 @@ SLACKVER="${SLACKVER:-$( cut -d' ' -f2 /etc/slackware-version )}"
 # For the paranoid:
 STRICTSSL=${STRICTSSL:-no}
 if [ "$STRICTSSL" = "yes" ]; then
-  sed -i '/strictssl/s,FALSE,TRUE,' config.def.h
+  sed -i '/StrictSSL/s,0,1,' config.def.h
 fi
 
-# Apply customizations
-case "$SLACKVER$LIBDIRSUFFIX" in
-  14.0) SVER=19 ;;
-  14.064) SVER=20 ;;
-  current) SVER=13 ;;
-  current64) SVER=16 ;;
-esac
-
 sed -i \
   -e "s,@HOMEPAGE@,$HOMEPAGE,g" \
   -e "s,\<800\>,$WIDTH," \
@@ -107,8 +114,7 @@ sed -i \
 
 sed -i \
   -e "s,\<st\>,$TERMINAL," \
-  -e "s,@SVER@,$SVER,g" \
-  -e "s,@64@,$LIBDIRSUFFIX,g" \
+  -e "s,@SLACKVER@,$SLACKVER," \
   config.def.h
 
 sed -i \
-- 
cgit v1.2.3