diff --git a/recipes/netsurf/01_redox.patch b/recipes/netsurf/01_redox.patch index 521cc7680c3cfe6e3707063059fc297f293c4449..6568f77304165c1654fc464e1ecc6c7cd33ff7b3 100644 --- a/recipes/netsurf/01_redox.patch +++ b/recipes/netsurf/01_redox.patch @@ -1,26 +1,6 @@ -diff -ruwN source/buildsystem/makefiles/Makefile.top source-new/buildsystem/makefiles/Makefile.top ---- source/buildsystem/makefiles/Makefile.top 2020-05-24 15:35:19.000000000 -0600 -+++ source-new/buildsystem/makefiles/Makefile.top 2022-11-12 08:54:26.232793713 -0700 -@@ -407,12 +407,16 @@ - $(Q)$(AR) $(ARFLAGS) $@ $(OBJECTS) - else - $(VQ)$(ECHO) $(ECHOFLAGS) " LINK: $@" -+ ifeq ($(COMPONENT_FOR_BUILD),yes) -+ $(Q)$(BUILD_CC) -o $@ $(OBJECTS) $(LDFLAGS) $(SHAREDLDFLAGS) -+ else - ifeq ($(CXX_IN_BUILD),yes) - $(Q)$(CXX) -o $@ $(OBJECTS) $(LDFLAGS) $(SHAREDLDFLAGS) - else - $(Q)$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(SHAREDLDFLAGS) - endif - endif -+endif - - ############################################################################### - # Autogenerated, implied rules diff -ruwN source/libnsfb/Makefile source-new/libnsfb/Makefile --- source/libnsfb/Makefile 2020-05-24 15:35:21.000000000 -0600 -+++ source-new/libnsfb/Makefile 2022-11-12 08:53:23.376764307 -0700 ++++ source-new/libnsfb/Makefile 2023-03-03 19:29:10.674915797 -0700 @@ -43,10 +43,10 @@ NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom @@ -37,7 +17,7 @@ diff -ruwN source/libnsfb/Makefile source-new/libnsfb/Makefile ifeq ($(NSFB_SDL_AVAILABLE),yes) diff -ruwN source/libnsfb/src/plot.h source-new/libnsfb/src/plot.h --- source/libnsfb/src/plot.h 2020-05-24 15:35:21.000000000 -0600 -+++ source-new/libnsfb/src/plot.h 2022-11-12 08:53:23.376764307 -0700 ++++ source-new/libnsfb/src/plot.h 2023-03-03 19:29:10.674915797 -0700 @@ -46,7 +46,7 @@ #error "Endian determination failed" #endif @@ -47,9 +27,21 @@ diff -ruwN source/libnsfb/src/plot.h source-new/libnsfb/src/plot.h #if defined(__BYTE_ORDER__) #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #define NSFB_BE_BYTE_ORDER +diff -ruwN source/Makefile source-new/Makefile +--- source/Makefile 2020-05-24 15:34:42.000000000 -0600 ++++ source-new/Makefile 2023-03-03 19:34:34.411016536 -0700 +@@ -110,7 +110,7 @@ + + # prefixed install macro for each host sub target + define do_build_prefix_install +- $(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= ++ $(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= CC=cc LDFLAGS= + + endef + diff -ruwN source/netsurf/Makefile.config source-new/netsurf/Makefile.config --- source/netsurf/Makefile.config 1969-12-31 17:00:00.000000000 -0700 -+++ source-new/netsurf/Makefile.config 2022-11-12 08:53:23.376764307 -0700 ++++ source-new/netsurf/Makefile.config 2023-03-03 19:29:10.674915797 -0700 @@ -0,0 +1,28 @@ +override NETSURF_HOMEPAGE := "https://www.redox-os.org/" +override NETSURF_FB_FRONTEND := sdl @@ -81,7 +73,7 @@ diff -ruwN source/netsurf/Makefile.config source-new/netsurf/Makefile.config +override NETSURF_FB_FONT_FANTASY := Sans/Fira/Regular.ttf diff -ruwN source/netsurf/utils/config.h source-new/netsurf/utils/config.h --- source/netsurf/utils/config.h 2020-05-24 15:35:23.000000000 -0600 -+++ source-new/netsurf/utils/config.h 2022-11-12 09:00:03.996951825 -0700 ++++ source-new/netsurf/utils/config.h 2023-03-03 19:29:10.674915797 -0700 @@ -63,7 +63,8 @@ defined(__BEOS__) || \ defined(__amigaos4__) || \ @@ -92,14 +84,3 @@ diff -ruwN source/netsurf/utils/config.h source-new/netsurf/utils/config.h #undef HAVE_STRPTIME #undef HAVE_STRFTIME #else -diff -ruwN source/nsgenbind/Makefile source-new/nsgenbind/Makefile ---- source/nsgenbind/Makefile 2020-05-24 15:35:23.000000000 -0600 -+++ source-new/nsgenbind/Makefile 2022-11-12 08:53:43.392773663 -0700 -@@ -10,6 +10,7 @@ - COMPONENT_TYPE := binary - # Component version - COMPONENT_VERSION := 0.8 -+COMPONENT_FOR_BUILD := yes - - # Tooling - PREFIX ?= /opt/netsurf