update to 3.11

1 files changed, 59 insertions, 4 deletions

diff --git a/utils-idna.patch b/utils-idna.patch
index f7b9de81163e..73a881231019 100644
--- a/utils-idna.patch
+++ b/utils-idna.patch
@@ -1,7 +1,14 @@
-diff --text --unified --recursive netsurf-3.10/utils/idna.c netsurf-3.10.new/utils/idna.c
---- netsurf-3.10/utils/idna.c	2020-05-24 13:55:29.000000000 -0700
-+++ netsurf-3.10.new/utils/idna.c	2022-06-21 11:40:58.674410466 -0700
-@@ -167,7 +167,7 @@
+From b2b9c3f2ff66dd51c24163aa924363d19601001f Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 30 May 2020 11:24:15 +0200
+Subject: build fix for libutf8proc
+
+
+diff --git a/utils/idna.c b/utils/idna.c
+index 628ef1f..f6e498a 100644
+--- a/utils/idna.c
++++ b/utils/idna.c
+@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
  
  #ifdef WITH_UTF8PROC
  
@@ -10,3 +17,51 @@ diff --text --unified --recursive netsurf-3.10/utils/idna.c netsurf-3.10.new/uti
  
  int32_t idna_contexto[] = {
  	/* CONTEXTO codepoints which have a rule defined */
+-- 
+2.30.2
+
+
+From 2179a717cb8d1afefc51a7c91522b6c23d374c40 Mon Sep 17 00:00:00 2001
+From: Ken Mays <kmays2000@gmail.com>
+Date: Thu, 1 Jul 2021 09:01:05 +0100
+Subject: removed NetCookieJar.h from previous build
+
+
+diff --git a/frontends/beos/cookies.cpp b/frontends/beos/cookies.cpp
+index 91a9beb..c49775b 100644
+--- a/frontends/beos/cookies.cpp
++++ b/frontends/beos/cookies.cpp
+@@ -38,7 +38,6 @@ extern "C" {
+ #include <private/interface/ColumnListView.h>
+ #include <private/interface/ColumnTypes.h>
+ #include <GroupLayoutBuilder.h>
+-#include <NetworkCookieJar.h>
+ #include <OutlineListView.h>
+ #include <ScrollView.h>
+ #include <StringView.h>
+-- 
+2.30.2
+
+
+From b0fb5ae3fdaa9281888875a782ea2af16a5d2538 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Fri, 19 Nov 2021 10:32:56 +0300
+Subject: link libcolumnlistview before libtracker
+
+
+diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
+index 46f12ec..08bdaae 100644
+--- a/frontends/beos/Makefile
++++ b/frontends/beos/Makefile
+@@ -12,7 +12,7 @@ BEOS_MIMESET := mimeset
+ # Linker flags
+ LDFLAGS += -L/boot/home/config/lib
+ LDFLAGS += -L/boot/common/lib
+-LDFLAGS += -lbe -ltranslation -ltracker -lcolumnlistview -lnetwork
++LDFLAGS += -lbe -ltranslation -lcolumnlistview -ltracker -lnetwork
+ ifeq ($(CC_MAJOR),2)
+     LDFLAGS += -lstdc++.r4
+ else
+-- 
+2.30.2
+