mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-24 22:04:19 +08:00
87 lines
3.8 KiB
Diff
87 lines
3.8 KiB
Diff
diff -ruwN source/libnsfb/Makefile source-new/libnsfb/Makefile
|
|
--- source/libnsfb/Makefile 2020-05-24 15:35:21.000000000 -0600
|
|
+++ 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
|
|
|
|
# determine which surface handlers can be compiled based upon avalable library
|
|
-$(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
|
|
+#$(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver))
|
|
$(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl))
|
|
-$(eval $(call pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
|
|
-$(eval $(call pkg_config_package_available,NSFB_WLD_AVAILABLE,wayland-client))
|
|
+#$(eval $(call pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES)))
|
|
+#$(eval $(call pkg_config_package_available,NSFB_WLD_AVAILABLE,wayland-client))
|
|
|
|
# Flags and setup for each support library
|
|
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 2023-03-03 19:29:10.674915797 -0700
|
|
@@ -46,7 +46,7 @@
|
|
#error "Endian determination failed"
|
|
#endif
|
|
#else
|
|
- #include <endian.h>
|
|
+ #include <machine/endian.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 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
|
|
+
|
|
+override NETSURF_USE_JPEG := YES
|
|
+override NETSURF_USE_BMP := YES
|
|
+override NETSURF_USE_OPENSSL := YES
|
|
+override NETSURF_USE_CURL := YES
|
|
+override NETSURF_USE_PNG := YES
|
|
+
|
|
+override NETSURF_USE_LIBICONV_PLUG := NO
|
|
+override NETSURF_USE_NSSVG := NO
|
|
+override NETSURF_USE_RSVG := NO
|
|
+override NETSURF_USE_DUKTAPE := YES
|
|
+override NETSURF_USE_HARU_PDF := NO
|
|
+override NETSURF_USE_VIDEO := NO
|
|
+
|
|
+override NETSURF_FB_FONTLIB := freetype
|
|
+override NETSURF_FB_FONTPATH := /ui/fonts/
|
|
+override NETSURF_FB_FONT_SANS_SERIF := Sans/Fira/Regular.ttf
|
|
+override NETSURF_FB_FONT_SANS_SERIF_BOLD := Sans/Fira/Bold.ttf
|
|
+override NETSURF_FB_FONT_SANS_SERIF_ITALIC := Sans/Fira/Regular.ttf
|
|
+override NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD := Sans/Fira/Bold.ttf
|
|
+override NETSURF_FB_FONT_SERIF := Sans/Fira/Regular.ttf
|
|
+override NETSURF_FB_FONT_SERIF_BOLD := Sans/Fira/Bold.ttf
|
|
+override NETSURF_FB_FONT_MONOSPACE := Mono/Fira/Regular.ttf
|
|
+override NETSURF_FB_FONT_MONOSPACE_BOLD := Mono/Fira/Bold.ttf
|
|
+override NETSURF_FB_FONT_CURSIVE := Sans/Fira/Regular.ttf
|
|
+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 2023-03-03 19:29:10.674915797 -0700
|
|
@@ -63,7 +63,8 @@
|
|
defined(__BEOS__) || \
|
|
defined(__amigaos4__) || \
|
|
defined(__AMIGA__) || \
|
|
- defined(__MINT__))
|
|
+ defined(__MINT__) || \
|
|
+ defined(__redox__))
|
|
#undef HAVE_STRPTIME
|
|
#undef HAVE_STRFTIME
|
|
#else
|