Debian 8 branch with changes for Netsurf 3.7 building

5 files changed, 7 insertions, 565 deletions

diff --git a/changelog b/changelog
index 39b5cea..b41b66a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,10 @@
-netsurf (3.6-4) UNRELEASED; urgency=medium
+netsurf (3.7-1) UNRELEASED; urgency=medium
+
+  * Remove unecessary patches for 3.7 release
+
+ -- Vincent Sanders <vince@debian.org>  Mon, 29 May 2017 11:55:26 +0000
+
+netsurf (3.6-4) unstable; urgency=medium
 
   * Make png generation reproducible.
   * Add font recommend dependancy for framebuffer edition
diff --git a/patches/fix-nsgenbind-be.patch b/patches/fix-nsgenbind-be.patch
deleted file mode 100644
index d583bf6..0000000
--- a/patches/fix-nsgenbind-be.patch
+++ /dev/null
@@ -1,489 +0,0 @@
---- a/nsgenbind/src/nsgenbind-ast.c
-+++ b/nsgenbind/src/nsgenbind-ast.c
-@@ -132,6 +132,19 @@
-         return nn;
- }
- 
-+struct genbind_node *
-+genbind_new_number_node(enum genbind_node_type type,
-+                        struct genbind_node *l,
-+                        int number)
-+{
-+        struct genbind_node *nn;
-+        nn = calloc(1, sizeof(struct genbind_node));
-+        nn->type = type;
-+        nn->l = l;
-+        nn->r.number = number;
-+        return nn;
-+}
-+
- 
- /* exported interface defined in nsgenbind-ast.h */
- int
---- a/nsgenbind/src/nsgenbind-ast.h
-+++ b/nsgenbind/src/nsgenbind-ast.h
-@@ -71,7 +71,18 @@
- 
- char *genbind_strapp(char *a, char *b);
- 
-+/**
-+ * create a new node with value from pointer
-+ */
- struct genbind_node *genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r);
-+
-+/**
-+ * create a new number node
-+ *
-+ * Create a node with of number type
-+ */
-+struct genbind_node *genbind_new_number_node(enum genbind_node_type type, struct genbind_node *l, int number);
-+
- struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct genbind_node *src);
- 
- struct genbind_node *genbind_node_prepend(struct genbind_node *list, struct genbind_node *inst);
---- a/nsgenbind/src/nsgenbind-parser.y
-+++ b/nsgenbind/src/nsgenbind-parser.y
-@@ -138,17 +138,17 @@
-         }
- 
-         location_node = genbind_new_node(GENBIND_NODE_TYPE_FILE,
--                                genbind_new_node(GENBIND_NODE_TYPE_LINE,
--                                                 cdata_node,
--                                                 (void *)lineno),
-+                                genbind_new_number_node(GENBIND_NODE_TYPE_LINE,
-+                                                        cdata_node,
-+                                                        lineno),
-                                          strdup(filename));
- 
-         /* generate method node */
-         method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
-                                  NULL,
--                                 genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+                                 genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-                                                   location_node,
--                                                  (void *)methodtype));
-+                                                  methodtype));
- 
-         class_node = genbind_node_find_type_ident(*genbind_ast,
-                                                   NULL,
-@@ -304,11 +304,11 @@
-         {
-                 $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
-                         NULL,
--                        genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+                        genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-                                 genbind_new_node(GENBIND_NODE_TYPE_CDATA,
-                                                  NULL,
-                                                  $2),
--                                (void *)$1));
-+                                $1));
-         }
-         ;
- 
-@@ -568,11 +568,11 @@
-         TOK_PROPERTY Modifiers TOK_IDENTIFIER ';'
-         {
-                 $$ = genbind_new_node(GENBIND_NODE_TYPE_PROPERTY, NULL,
--                        genbind_new_node(GENBIND_NODE_TYPE_MODIFIER,
-+                        genbind_new_number_node(GENBIND_NODE_TYPE_MODIFIER,
-                                 genbind_new_node(GENBIND_NODE_TYPE_IDENT,
-                                                  NULL,
-                                                  $3),
--                                         (void *)$2));
-+                                         $2));
-         }
-         |
-         TOK_FLAGS ClassFlags ';'
-@@ -584,11 +584,11 @@
-         {
-                 $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
-                         NULL,
--                        genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+                        genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-                                 genbind_new_node(GENBIND_NODE_TYPE_CDATA,
-                                                  NULL,
-                                                  $2),
--                                (void *)$1));
-+                                $1));
-         }
-         ;
- 
---- a/nsgenbind/src/webidl-ast.c
-+++ b/nsgenbind/src/webidl-ast.c
-@@ -120,6 +120,7 @@
- 
- 
- struct webidl_node *
-+/* exported interface documented in webidl-ast.h */
- webidl_node_new(enum webidl_node_type type,
- 		struct webidl_node *l,
- 		void *r)
-@@ -128,7 +129,21 @@
- 	nn = calloc(1, sizeof(struct webidl_node));
- 	nn->type = type;
- 	nn->l = l;
--	nn->r.text = r;
-+	nn->r.value = r;
-+	return nn;
-+}
-+
-+/* exported interface documented in webidl-ast.h */
-+struct webidl_node *
-+webidl_new_number_node(enum webidl_node_type type,
-+                       struct webidl_node *l,
-+                       int number)
-+{
-+	struct webidl_node *nn;
-+	nn = calloc(1, sizeof(struct webidl_node));
-+	nn->type = type;
-+	nn->l = l;
-+	nn->r.number = number;
- 	return nn;
- }
- 
---- a/nsgenbind/src/webidl-ast.h
-+++ b/nsgenbind/src/webidl-ast.h
-@@ -92,8 +92,17 @@
- 
- int webidl_cmp_node_type(struct webidl_node *node, void *ctx);
- 
-+/**
-+ * create a new node with a pointer value
-+ */
- struct webidl_node *webidl_node_new(enum webidl_node_type, struct webidl_node *l, void *r);
- 
-+/**
-+ * create a new node with an integer value
-+ */
-+struct webidl_node *webidl_new_number_node(enum webidl_node_type type, struct webidl_node *l, int number);
-+
-+
- void webidl_node_set(struct webidl_node *node, enum webidl_node_type type, void *r);
- 
- struct webidl_node *webidl_node_prepend(struct webidl_node *list, struct webidl_node *node);
---- a/nsgenbind/src/webidl-parser.y
-+++ b/nsgenbind/src/webidl-parser.y
-@@ -735,9 +735,9 @@
-         |
-         TOK_INT_LITERAL
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_INT,
--                                     NULL,
--                                     (void *)$1);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_INT,
-+                                            NULL,
-+                                            $1);
-         }
-         |
-         TOK_NULL_LITERAL
-@@ -750,16 +750,16 @@
- BooleanLiteral:
-         TOK_TRUE
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL,
--                                     NULL,
--                                     (void *)true);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-+                                            NULL,
-+                                            (int)true);
-         }
-         |
-         TOK_FALSE
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL,
--                                     NULL,
--                                     (void *)false);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-+                                            NULL,
-+                                            (int)false);
-         }
-         ;
- 
-@@ -846,16 +846,18 @@
- 
-                 /* deal with inherit modifier */
-                 if ($1) {
--                        attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+                        attribute = webidl_new_number_node(
-+                                          WEBIDL_NODE_TYPE_MODIFIER,
-                                           attribute,
--                                          (void *)WEBIDL_TYPE_MODIFIER_INHERIT);
-+                                          WEBIDL_TYPE_MODIFIER_INHERIT);
-                 }
- 
-                 /* deal with readonly modifier */
-                 if ($2) {
--                        attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+                        attribute = webidl_new_number_node(
-+                                         WEBIDL_NODE_TYPE_MODIFIER,
-                                          attribute,
--                                         (void *)WEBIDL_TYPE_MODIFIER_READONLY);
-+                                         WEBIDL_TYPE_MODIFIER_READONLY);
-                 }
- 
-                 $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE,
-@@ -880,14 +882,16 @@
-         {
-                 struct webidl_node *attribute;
- 
--                attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                       $2, (void *)WEBIDL_TYPE_MODIFIER_STATIC);
-+                attribute = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                                   $2,
-+                                                   WEBIDL_TYPE_MODIFIER_STATIC);
- 
-                 /* deal with readonly modifier */
-                 if ($1) {
--                        attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+                        attribute = webidl_new_number_node(
-+                                         WEBIDL_NODE_TYPE_MODIFIER,
-                                          attribute,
--                                         (void *)WEBIDL_TYPE_MODIFIER_READONLY);
-+                                         WEBIDL_TYPE_MODIFIER_READONLY);
-                 }
- 
-                 $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE,
-@@ -900,8 +904,9 @@
-                 struct webidl_node *operation;
- 
-                 /* add static modifier */
--                operation = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                       $2, (void *)WEBIDL_TYPE_MODIFIER_STATIC);
-+                operation = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                                   $2,
-+                                                   WEBIDL_TYPE_MODIFIER_STATIC);
- 
-                 /* put return type on the operation */
-                 operation = webidl_node_prepend($1, operation);
-@@ -1015,16 +1020,16 @@
- Special:
-         TOK_GETTER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_GETTER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_GETTER);
-         }
-         |
-         TOK_SETTER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_SETTER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_SETTER);
-         }
-         |
-         TOK_CREATOR
-@@ -1032,23 +1037,23 @@
-                 /* second edition removed this special but the
-                  * specifications still use it!
-                  */
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_CREATOR);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_CREATOR);
-         }
-         |
-         TOK_DELETER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_DELETER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_DELETER);
-         }
-         |
-         TOK_LEGACYCALLER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_LEGACYCALLER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_LEGACYCALLER);
-         }
-         ;
- 
-@@ -1679,8 +1684,9 @@
-         TOK_ANY TypeSuffixStartingWithArray
-         {
-                 /* todo deal with TypeSuffixStartingWithArray */
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE,
--                                     NULL, (void *)WEBIDL_TYPE_ANY);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                            NULL,
-+                                            WEBIDL_TYPE_ANY);
-         }
-         ;
- 
-@@ -1742,29 +1748,39 @@
-         |
-         TOK_STRING TypeSuffix
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_STRING);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $2,
-+                                        WEBIDL_TYPE_STRING);
-         }
-         |
-         TOK_IDENTIFIER TypeSuffix
-         {
-             struct webidl_node *type;
--            type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_USER);
-+            type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                          $2,
-+                                          WEBIDL_TYPE_USER);
-             $$ = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1);
-         }
-         |
-         TOK_SEQUENCE '<' Type '>' Null
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $3, (void *)WEBIDL_TYPE_SEQUENCE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $3,
-+                                        WEBIDL_TYPE_SEQUENCE);
-         }
-         |
-         TOK_OBJECT TypeSuffix
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_OBJECT);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $2,
-+                                        WEBIDL_TYPE_OBJECT);
-         }
-         |
-         TOK_DATE TypeSuffix
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_DATE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $2,
-+                                        WEBIDL_TYPE_DATE);
-         }
-         ;
- 
-@@ -1778,7 +1794,9 @@
-         TOK_IDENTIFIER Null
-         {
-             struct webidl_node *type;
--            type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_USER);
-+            type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                          NULL,
-+                                          WEBIDL_TYPE_USER);
-             type = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1);
-             $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type);
-         }
-@@ -1793,17 +1811,23 @@
-         |
-         TOK_BOOLEAN
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_BOOL);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_BOOL);
-         }
-         |
-         TOK_BYTE
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_BYTE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_BYTE);
-         }
-         |
-         TOK_OCTET
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_OCTET);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_OCTET);
-         }
-         ;
- 
-@@ -1811,9 +1835,9 @@
- UnrestrictedFloatType:
-         TOK_UNRESTRICTED FloatType
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                 $2,
--                                 (void *)WEBIDL_TYPE_MODIFIER_UNRESTRICTED);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                        $2,
-+                                        WEBIDL_TYPE_MODIFIER_UNRESTRICTED);
-         }
-         |
-         FloatType
-@@ -1823,12 +1847,16 @@
- FloatType:
-         TOK_FLOAT
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_FLOAT);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_FLOAT);
-         }
-         |
-         TOK_DOUBLE
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_DOUBLE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_DOUBLE);
-         }
-         ;
- 
-@@ -1836,9 +1864,9 @@
- UnsignedIntegerType:
-         TOK_UNSIGNED IntegerType
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                 $2,
--                                 (void *)WEBIDL_TYPE_MODIFIER_UNSIGNED);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                        $2,
-+                                        WEBIDL_TYPE_MODIFIER_UNSIGNED);
-         }
-         |
-         IntegerType
-@@ -1848,15 +1876,21 @@
- IntegerType:
-         TOK_SHORT
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_SHORT);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_SHORT);
-         }
-         |
-         TOK_LONG OptionalLong
-         {
-             if ($2) {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_LONGLONG);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                            NULL,
-+                                            WEBIDL_TYPE_LONGLONG);
-             } else {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_LONG);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                            NULL,
-+                                            WEBIDL_TYPE_LONG);
-             }
-         }
-         ;
-@@ -1927,7 +1961,9 @@
-         TOK_VOID
-         {
-             struct webidl_node *type;
--            type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_VOID);
-+            type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                          NULL,
-+                                          WEBIDL_TYPE_VOID);
-             $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type);
-         }
- 
diff --git a/patches/openssl-1.1.0.patch b/patches/openssl-1.1.0.patch
deleted file mode 100644
index 8b4df33..0000000
--- a/patches/openssl-1.1.0.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/netsurf/content/fetchers/curl.c
-+++ b/netsurf/content/fetchers/curl.c
-@@ -128,6 +128,26 @@
- static char fetch_proxy_userpwd[100];
- 
- 
-+/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed */
-+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL)
-+static int ns_X509_up_ref(X509 *cert)
-+{
-+	cert->references++;
-+	return 1;
-+}
-+
-+static void ns_X509_free(X509 *cert)
-+{
-+	cert->references--;
-+	if (cert->references == 0) {
-+		X509_free(cert);
-+	}
-+}
-+#else
-+#define ns_X509_up_ref X509_up_ref
-+#define ns_X509_free X509_free
-+#endif
-+
- /**
-  * Initialise a cURL fetcher.
-  */
-@@ -438,7 +458,7 @@
- 	 */
- 	if (!fetch->cert_data[depth].cert) {
- 		fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx);
--		fetch->cert_data[depth].cert->references++;
-+		ns_X509_up_ref(fetch->cert_data[depth].cert);
- 		fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx);
- 	}
- 
-@@ -815,10 +835,7 @@
- 	}
- 
- 	for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) {
--		f->cert_data[i].cert->references--;
--		if (f->cert_data[i].cert->references == 0) {
--			X509_free(f->cert_data[i].cert);
--		}
-+		ns_X509_free(f->cert_data[i].cert);
- 	}
- 
- 	free(f);
-@@ -986,10 +1003,7 @@
- 					      X509_get_pubkey(certs[depth].cert));
- 
- 		/* and clean up */
--		certs[depth].cert->references--;
--		if (certs[depth].cert->references == 0) {
--			X509_free(certs[depth].cert);
--		}
-+		ns_X509_free(certs[depth].cert);
- 	}
- 
- 	msg.type = FETCH_CERT_ERR;
diff --git a/patches/remove-favicon-link.patch b/patches/remove-favicon-link.patch
deleted file mode 100644
index 2719c12..0000000
--- a/patches/remove-favicon-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/netsurf/!NetSurf/Resources/nl/welcome.html,faf
-+++ b/netsurf/!NetSurf/Resources/nl/welcome.html,faf
-@@ -3,7 +3,6 @@
- <head>

- <title>Welkom bij NetSurf</title>

- <style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:88%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links p{display:table-cell;}.links ul{padding-left:0.8em;margin-top:-1em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style>

--<link rel="icon" type="image/png" href="http://www.netsurf-browser.org/webimages/favicon.png">

- </head>

- 

- <body>

diff --git a/patches/series b/patches/series
index 3b4893c..a8f7a18 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1 @@
-fix-nsgenbind-be.patch
-remove-favicon-link.patch
-openssl-1.1.0.patch
 set-netsurf-config.patch