From f3fb0f6eb62bdca2de9483c1ad9d503fc881b6fe Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Sat, 7 May 2016 23:07:13 +0200 Subject: www-client/netsurf: drop old. Package-Manager: portage-2.2.28 --- .../files/netsurf-3.0-framebuffer-pkgconfig.patch | 29 -------- ...f-3.2-conditionally-include-image-headers.patch | 67 ----------------- www-client/netsurf/files/netsurf-3.3-CFLAGS.patch | 85 ---------------------- 3 files changed, 181 deletions(-) delete mode 100644 www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch delete mode 100644 www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch delete mode 100644 www-client/netsurf/files/netsurf-3.3-CFLAGS.patch (limited to 'www-client/netsurf/files') diff --git a/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch b/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch deleted file mode 100644 index 50c9f8b8a832..000000000000 --- a/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- netsurf-3.0/framebuffer/Makefile.target -+++ netsurf-3.0/framebuffer/Makefile.target -@@ -13,12 +13,16 @@ - - # 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_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 - -@@ -41,6 +45,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)) - diff --git a/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch deleted file mode 100644 index 9c73c233eff7..000000000000 --- a/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- netsurf-3.2/image/image.c -+++ netsurf-3.2/image/image.c -@@ -28,15 +28,42 @@ - #include "content/content.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" --#include "image/nssprite.h" -+#endif -+ -+#ifdef WITH_MNG -+#include "image/mng.h" -+#endif -+ -+#ifdef WITH_PNG - #include "image/png.h" --#include "image/rsvg.h" -+#endif -+ -+#ifdef WITH_NSSPRITE -+#include "image/nssprite.h" -+#endif -+ -+#ifdef WITH_NS_SVG - #include "image/svg.h" -+#endif -+ -+#ifdef WITH_RSVG -+#include "image/rsvg.h" -+#endif -+ -+#ifdef WITH_WEBP - #include "image/webp.h" -+#endif - - #include "image/image.h" - -@@ -73,7 +100,18 @@ - 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 -+ /* Prefer libpng over libmng for pngs by registering later */ - error = nspng_init(); - if (error != NSERROR_OK) - return error; diff --git a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch deleted file mode 100644 index 7a3f23466c66..000000000000 --- a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- netsurf-3.3/Makefile.defaults -+++ netsurf-3.3/Makefile.defaults -@@ -91,12 +91,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.3/framebuffer/Makefile.defaults -+++ netsurf-3.3/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.3/framebuffer/Makefile.target -+++ netsurf-3.3/framebuffer/Makefile.target -@@ -42,8 +42,8 @@ - $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) - $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) - --CFLAGS += -std=c99 -g -Dsmall \ -- -D_BSD_SOURCE \ -+CFLAGS += -std=c99 -Dsmall \ -+ -D_DEFAULT_SOURCE \ - -D_XOPEN_SOURCE=600 \ - -D_POSIX_C_SOURCE=200112L \ - $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) ---- netsurf-3.3/gtk/Makefile.defaults -+++ netsurf-3.3/gtk/Makefile.defaults -@@ -26,6 +26,3 @@ - - # Set default GTK version to build for (2 or 3) - NETSURF_GTK_MAJOR ?= 2 -- --# Optimisation levels --CFLAGS += -O2 ---- netsurf-3.3/gtk/Makefile.target -+++ netsurf-3.3/gtk/Makefile.target -@@ -46,9 +46,9 @@ - # libsexy currently means we cannot enable this - # -DGDK_DISABLE_DEPRECATED - --GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \ -+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ - $(GTKDEPFLAGS) \ -- -D_BSD_SOURCE \ -+ -D_BSD_SOURCE -D_DEFAULT_SOURCE \ - -D_XOPEN_SOURCE=600 \ - -D_POSIX_C_SOURCE=200809L \ - -D_NETBSD_SOURCE \ ---- netsurf-3.3/test/Makefile -+++ netsurf-3.3/test/Makefile -@@ -1,8 +1,8 @@ --CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \ -+CFLAGS := -std=c99 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE -I.. \ - $(shell pkg-config --cflags libcurl) - LDFLAGS := $(shell pkg-config --libs libcurl) -lz - --llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) -O2 -+llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet libdom) - llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom) - - llcache_SRCS := content/fetch.c content/fetchers/curl.c \ -@@ -19,7 +19,7 @@ - utils/filename.c utils/nsurl.c utils/corestrings.c \ - test/urldbtest.c - --urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2 -+urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) - urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom) - - nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c utils/utf8proc.c test/nsurl.c -- cgit v1.2.3-65-gdbad