pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wyeb-git: partial patch merged upstream



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Fri Nov 16 21:35:29 2018 +0200
Changeset:	cd5da477f51b41f812988f9600d3bd0e9650c9bd

Modified Files:
	wyeb-git/distinfo
	wyeb-git/patches/patch-main.c

Log Message:
wyeb-git: partial patch merged upstream

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

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

diffstat:
 wyeb-git/distinfo             |  2 +-
 wyeb-git/patches/patch-main.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diffs:
diff --git a/wyeb-git/distinfo b/wyeb-git/distinfo
index 948ba66ea1..7ac62cd8ee 100644
--- a/wyeb-git/distinfo
+++ b/wyeb-git/distinfo
@@ -1,3 +1,3 @@
 $NetBSD$
 
-SHA1 (patch-main.c) = e9ae1b5d73c9e03cd662eea68e8a6bfd5375e8b5
+SHA1 (patch-main.c) = a829c08e71a538c4d10b90ab6efa0c40676d2bb6
diff --git a/wyeb-git/patches/patch-main.c b/wyeb-git/patches/patch-main.c
index cbe8428d34..465a24280b 100644
--- a/wyeb-git/patches/patch-main.c
+++ b/wyeb-git/patches/patch-main.c
@@ -2,9 +2,6 @@ $NetBSD$
 
 Use the correct data type for modification time.
 
-The second part of the patch prevents wyeb from trying to download
-urls which have failed (according to the http error code).
-
 --- main.c.orig	2018-11-10 14:18:57.000000000 +0000
 +++ main.c
 @@ -2895,7 +2895,7 @@ static char *histdata(bool rest, bool al
@@ -16,13 +13,3 @@ urls which have failed (according to the http error code).
  	for (int j = 2; j > 0; j--) for (int i = histfnum - 1; i >= 0; i--)
  	{
  		if (!rest && size && num >= size) break;
-@@ -3948,6 +3948,9 @@ static gboolean policycb(
- 	WebKitResponsePolicyDecision *rdec = dec;
- 	WebKitURIResponse *res = webkit_response_policy_decision_get_response(rdec);
- 
-+	if(!SOUP_STATUS_IS_SUCCESSFUL(webkit_uri_response_get_status_code(res)))
-+		return false;
-+
- 	bool dl = false;
- 	char *msr = getset(win, "dlmimetypes");
- 	//for checking whether is sub frame or not.


Home | Main Index | Thread Index | Old Index