- rediff patches, rebuild with openssl 3.0.0, rel 2

diff --git a/netsurf.spec b/netsurf.spec
index 3692da4c506a60a738b6d361053c3fbb7eb9de05..b245d94a580c90b5ec329e8cf8c619f633660f39 100644 (file)
--- 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 e0a9efe24e57fbcd37e3c2e3f25bd519b32bb9e7..e58b79d0317290d346d63e0988a8ad2f074b1d5c 100644 (file)
--- 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 708d8b54494cecdd68e568abcd512e48362a9434..b30644d972b12ee7594012786040c614904727d5 100644 (file)
--- 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