diff options
Diffstat (limited to 'www-client/netsurf/files')
3 files changed, 150 insertions, 0 deletions
diff --git a/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch new file mode 100644 index 000000000000..2dc8a14fbeb9 --- /dev/null +++ b/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch @@ -0,0 +1,71 @@ +--- netsurf-3.4/Makefile.defaults ++++ netsurf-3.4/Makefile.defaults +@@ -89,12 +89,6 @@ + # Valid options: YES, NO + NETSURF_FS_BACKING_STORE := NO + +-# Initial CFLAGS. Optimisation level etc. tend to be target specific. +-CFLAGS := +- +-# Initial CXXFLAGS. Optimisation level etc. tend to be target specific. +-CXXFLAGS := +- + # Default installation/execution prefix + PREFIX ?= /usr/local + +--- netsurf-3.4/framebuffer/Makefile.defaults ++++ netsurf-3.4/framebuffer/Makefile.defaults +@@ -2,9 +2,6 @@ + # Framebuffer-target-specific options + # ---------------------------------------------------------------------------- + +-# Optimisation levels +-CFLAGS += -O2 +- + # Framebuffer default surface provider. + # Valid values are: x, sdl, linux, vnc, able, + NETSURF_FB_FRONTEND := sdl +--- netsurf-3.4/framebuffer/Makefile.target ++++ netsurf-3.4/framebuffer/Makefile.target +@@ -30,7 +30,7 @@ + CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"' + CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"' + +-CFLAGS += -std=c99 -g -Dsmall \ ++CFLAGS += -std=c99 -Dsmall \ + -D_BSD_SOURCE \ + -D_DEFAULT_SOURCE \ + -D_XOPEN_SOURCE=600 \ +--- netsurf-3.4/gtk/Makefile.defaults ++++ netsurf-3.4/gtk/Makefile.defaults +@@ -37,6 +37,3 @@ + + # Set default GTK version to build for (2 or 3) + NETSURF_GTK_MAJOR ?= 2 +- +-# Optimisation levels +-CFLAGS += -O2 +--- netsurf-3.4/gtk/Makefile.target ++++ netsurf-3.4/gtk/Makefile.target +@@ -49,7 +49,7 @@ + endif + + +-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \ ++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ + $(GTKDEPFLAGS) \ + -D_BSD_SOURCE \ + -D_DEFAULT_SOURCE \ +--- netsurf-3.4/test/Makefile ++++ netsurf-3.4/test/Makefile +@@ -45,8 +45,9 @@ + TESTROOT := build-$(HOST)-test + endif + +-TESTCFLAGS := -std=c99 -g -Wall \ ++TESTCFLAGS := -std=c99 -Wall \ + -D_BSD_SOURCE \ ++ -D_DEFAULT_SOURCE \ + -D_POSIX_C_SOURCE=200809L \ + -D_XOPEN_SOURCE=600 \ + -Itest -I. -I.. \ diff --git a/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch new file mode 100644 index 000000000000..e78d71c5794c --- /dev/null +++ b/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch @@ -0,0 +1,49 @@ +--- netsurf-3.4/image/image.c ++++ netsurf-3.4/image/image.c +@@ -26,14 +26,28 @@ + #include "desktop/gui_internal.h" + + #include "image/bitmap.h" ++#ifdef WITH_BMP + #include "image/bmp.h" +-#include "image/gif.h" + #include "image/ico.h" ++#endif ++#ifdef WITH_GIF ++#include "image/gif.h" ++#endif ++#ifdef WITH_JPEG + #include "image/jpeg.h" ++#endif ++#ifdef WITH_NSSPRITE + #include "image/nssprite.h" ++#endif ++#ifdef WITH_PNG + #include "image/png.h" ++#endif ++#ifdef WITH_RSVG + #include "image/rsvg.h" ++#endif ++#ifdef WITH_NS_SVG + #include "image/svg.h" ++#endif + #include "image/image.h" + + /** +@@ -68,6 +82,16 @@ + if (error != NSERROR_OK) + return error; + #endif ++ ++#ifdef WITH_MNG ++ error = nsmng_init(); ++ if (error != NSERROR_OK) ++ return error; ++ ++ error = nsjpng_init(); ++ if (error != NSERROR_OK) ++ return error; ++#endif + + #ifdef WITH_PNG + error = nspng_init(); diff --git a/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch b/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch new file mode 100644 index 000000000000..31aaa0ae8ad6 --- /dev/null +++ b/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch @@ -0,0 +1,30 @@ +--- netsurf-3.4/framebuffer/Makefile.target ++++ netsurf-3.4/framebuffer/Makefile.target +@@ -4,13 +4,17 @@ + + # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here + NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG ++NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG + NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE + NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB + NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG + NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP + NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF ++NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG ++NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP + NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 + NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 ++NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO + + CFLAGS += -Dnsframebuffer + +@@ -65,6 +69,9 @@ + $(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) + $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) + $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) ++$(eval $(call pkg_config_find_and_add_enabled,RSVG,librsvg-2.0,SVG)) ++$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) ++$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp))) + $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) + $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) + |