From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 5 Oct 2021 19:46:58 +0000 (+0200)
Subject: - rediff patches, rebuild with openssl 3.0.0, rel 2
X-Git-Tag: auto/th/netsurf-3.10-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnetsurf.git;a=commitdiff_plain;h=9e80286b6790f8d7ef9a2f8952570ca3e0f20186

- rediff patches, rebuild with openssl 3.0.0, rel 2
---

diff --git a/netsurf.spec b/netsurf.spec
index 3692da4..b245d94 100644
--- a/netsurf.spec
+++ b/netsurf.spec
@@ -9,7 +9,7 @@ Summary:	Light WWW browser with CSS support
 Summary(pl.UTF-8):	Lekka przeglądarka WWW z obsługą CSS
 Name:		netsurf
 Version:	3.10
-Release:	1
+Release:	2
 License:	GPL v2 with OpenSSL exception (code), MIT (artwork)
 Group:		Applications/Networking
 Source0:	http://download.netsurf-browser.org/netsurf/releases/source/%{name}-%{version}-src.tar.gz
diff --git a/nsfb-ldflags.patch b/nsfb-ldflags.patch
index e0a9efe..e58b79d 100644
--- a/nsfb-ldflags.patch
+++ b/nsfb-ldflags.patch
@@ -1,12 +1,13 @@
---- netsurf-3.6/frontends/framebuffer/Makefile.orig	2016-02-16 14:30:38.000000000 +0100
-+++ netsurf-3.6/frontends/framebuffer/Makefile	2016-02-27 16:44:59.385032043 +0100
-@@ -39,9 +39,7 @@ CFLAGS += -std=c99 -g -Dsmall \
- LDFLAGS += -lm
+diff -urNp -x '*.orig' netsurf-3.10.org/frontends/framebuffer/Makefile netsurf-3.10/frontends/framebuffer/Makefile
+--- netsurf-3.10.org/frontends/framebuffer/Makefile	2020-05-24 22:55:29.000000000 +0200
++++ netsurf-3.10/frontends/framebuffer/Makefile	2021-10-05 21:43:14.965997618 +0200
+@@ -51,9 +51,7 @@ ifeq ($(NETSURF_FB_FONTLIB),freetype)
+ endif
  
  # non optional pkg-configed libs
 -LDFLAGS += -Wl,--whole-archive
  $(eval $(call pkg_config_find_and_add,libnsfb,libnsfb))
 -LDFLAGS += -Wl,--no-whole-archive
  
- $(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
- 
+ # ---------------------------------------------------------------------------
+ # Target setup
diff --git a/optflags.patch b/optflags.patch
index 708d8b5..b30644d 100644
--- a/optflags.patch
+++ b/optflags.patch
@@ -1,7 +1,7 @@
 --- netsurf-3.6/Makefile.orig	2016-11-19 14:37:41.000000000 +0100
 +++ netsurf-3.6/Makefile	2016-11-21 14:50:30.664966026 +0100
 @@ -530,7 +530,7 @@
- $(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
+ $(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
  
  # Common libraries without pkg-config support
 -LDFLAGS += -lz