surf: adjust to current HEAD

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Nov 1 18:59:37 2020 +0100
Changeset:	8682fd97ee513b645f99eb203b05a324da948112

Modified Files:
	surf-git/PLIST
	surf-git/distinfo
Added Files:
	surf-git/patches/patch-Makefile
Removed Files:
	surf-git/patches/patch-libsurf-webext.c
	surf-git/patches/patch-surf.c

Log Message:
surf: adjust to current HEAD

Two patches are no longer needed due recent refactor and a portability Makefile
patch is now needed (shared in private with upstream).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8682fd97ee513b645f99eb203b05a324da948112

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 surf-git/PLIST                          |  2 +-
 surf-git/distinfo                       |  3 +--
 surf-git/patches/patch-Makefile         | 15 +++++++++++++++
 surf-git/patches/patch-libsurf-webext.c | 27 ---------------------------
 surf-git/patches/patch-surf.c           | 18 ------------------
 5 files changed, 17 insertions(+), 48 deletions(-)

diffs:
diff --git a/surf-git/PLIST b/surf-git/PLIST
index 6becb2f84c..ddcdb919ff 100644
--- a/surf-git/PLIST
+++ b/surf-git/PLIST
@@ -1,4 +1,4 @@
 @comment $NetBSD$
 bin/surf
-lib/surf/libsurf-webext.so
+lib/surf/webext-surf.so
 man/man1/surf.1
diff --git a/surf-git/distinfo b/surf-git/distinfo
index 2cd0974095..1bea1acf69 100644
--- a/surf-git/distinfo
+++ b/surf-git/distinfo
@@ -1,4 +1,3 @@
 $NetBSD$
 
-SHA1 (patch-libsurf-webext.c) = fedcab069e6859b14a573905257bf562244b2591
-SHA1 (patch-surf.c) = e9df463148856a838842b9e8f8d8a5383de7e509
+SHA1 (patch-Makefile) = b51e072a4d1c4fbfaa2d247e64f361ec55f6aff8
diff --git a/surf-git/patches/patch-Makefile b/surf-git/patches/patch-Makefile
new file mode 100644
index 0000000000..abcd76cf72
--- /dev/null
+++ b/surf-git/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add non-present .so to SUFFIXES.
+
+--- Makefile.orig	2020-11-01 17:49:05.189611428 +0000
++++ Makefile
+@@ -2,6 +2,8 @@
+ # See LICENSE file for copyright and license details.
+ .POSIX:
+ 
++.SUFFIXES: .so
++
+ include config.mk
+ 
+ SRC = surf.c
diff --git a/surf-git/patches/patch-libsurf-webext.c b/surf-git/patches/patch-libsurf-webext.c
deleted file mode 100644
index 4ee87a9990..0000000000
--- a/surf-git/patches/patch-libsurf-webext.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-Fix negative values in scrollh()/scrollv().
-
-Shared upstream via:
-
- <https://lists.suckless.org/hackers/1906/16887.html>
-
---- libsurf-webext.c.orig	2020-06-01 15:14:21.000000000 +0000
-+++ libsurf-webext.c
-@@ -91,14 +91,14 @@ readpipe(GIOChannel *s, GIOCondition c, 
- 			return TRUE;
- 		ww = webkit_dom_dom_window_get_inner_width(view);
- 		webkit_dom_dom_window_scroll_by(view,
--		                                (ww / 100) * msg[3], 0);
-+		                                (ww / 100) * (signed char)msg[3], 0);
- 		break;
- 	case 'v':
- 		if (msgsz != 4)
- 			return TRUE;
- 		wh = webkit_dom_dom_window_get_inner_height(view);
- 		webkit_dom_dom_window_scroll_by(view,
--		                                0, (wh / 100) * msg[3]);
-+		                                0, (wh / 100) * (signed char)msg[3]);
- 		break;
- 	}
- 
diff --git a/surf-git/patches/patch-surf.c b/surf-git/patches/patch-surf.c
deleted file mode 100644
index 9c123f5e05..0000000000
--- a/surf-git/patches/patch-surf.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Set URI atom for WEBKIT_LOAD_COMMITTED event too.
-
-Shared upstream via:
-
- <https://lists.suckless.org/hackers/2008/17553.html>
-
---- surf.c.orig	2020-06-01 15:14:21.000000000 +0000
-+++ surf.c
-@@ -1513,6 +1513,7 @@ loadchanged(WebKitWebView *v, WebKitLoad
- 		seturiparameters(c, uri, loadtransient);
- 		break;
- 	case WEBKIT_LOAD_COMMITTED:
-+		setatom(c, AtomUri, uri);
- 		seturiparameters(c, uri, loadcommitted);
- 		c->https = webkit_web_view_get_tls_info(c->view, &c->cert,
- 		                                        &c->tlserr);