summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2017-02-05 10:46:57 +0100
committerMichael Weber <xmw@gentoo.org>2017-02-05 13:17:36 +0100
commitd7806bc77176c8ff9793994d7473abd32019b14c (patch)
tree176bdd7ca0d87f7f6ab6fbe0f36b62efc9864ad8 /www-client/netsurf/files
parentmedia-video/mplayer: Mark ~hppa (bug #601662). (diff)
downloadgentoo-d7806bc77176c8ff9793994d7473abd32019b14c.tar.gz
gentoo-d7806bc77176c8ff9793994d7473abd32019b14c.tar.bz2
gentoo-d7806bc77176c8ff9793994d7473abd32019b14c.zip
www-client/netsurf: Remove old verion(s).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'www-client/netsurf/files')
-rw-r--r--www-client/netsurf/files/netsurf-3.3-pdf-writer.patch85
-rw-r--r--www-client/netsurf/files/netsurf-3.4-CFLAGS.patch71
-rw-r--r--www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch49
-rw-r--r--www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch30
4 files changed, 0 insertions, 235 deletions
diff --git a/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch
deleted file mode 100644
index e2c709e434ea..000000000000
--- a/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- netsurf-3.3/desktop/font_haru.c
-+++ netsurf-3.3/desktop/font_haru.c
-@@ -40,7 +40,7 @@
- #include "css/utils.h"
-
- #include "utils/nsoption.h"
--#include "desktop/save_pdf/font_haru.h"
-+#include "desktop/font_haru.h"
- #include "desktop/font.h"
- #include "utils/log.h"
-
---- netsurf-3.3/desktop/save_pdf.c
-+++ netsurf-3.3/desktop/save_pdf.c
-@@ -57,6 +57,8 @@
-
- #include "content/hlcache.h"
- #include "utils/nsoption.h"
-+#include "desktop/gui_misc.h"
-+#include "desktop/gui_internal.h"
- #include "desktop/plotters.h"
- #include "desktop/print.h"
- #include "desktop/printer.h"
-@@ -450,11 +452,11 @@
-
- switch(content_get_type(content)){
- /*Handle "embeddable" types of images*/
-- case CONTENT_JPEG:
-- image = HPDF_LoadJpegImageFromMem(pdf_doc,
-- (const HPDF_BYTE *) source_data,
-- source_size);
-- break;
-+ //case CONTENT_JPEG:
-+ // image = HPDF_LoadJpegImageFromMem(pdf_doc,
-+ // (const HPDF_BYTE *) source_data,
-+ // source_size);
-+ // break;
-
- /*Disabled until HARU PNG support will be more stable.
-
-@@ -700,7 +702,7 @@
-
-
- #ifndef PDF_DEBUG
-- if (option_enable_PDF_compression)
-+ if (nsoption_bool(enable_PDF_compression))
- HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
- #endif
- HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -774,7 +776,7 @@
- assert(settings->output != NULL);
-
- /*Encryption on*/
-- if (option_enable_PDF_password)
-+ if (nsoption_bool(enable_PDF_password))
- guit->browser->pdf_password(&owner_pass, &user_pass,
- (void *)settings->output);
- else
-@@ -789,7 +791,7 @@
- {
- bool success = false;
-
-- if (option_enable_PDF_password && owner_pass != NULL ) {
-+ if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
- HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
- HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
- free(owner_pass);
---- netsurf-3.3/gtk/scaffolding.c
-+++ netsurf-3.3/gtk/scaffolding.c
-@@ -709,14 +709,14 @@
-
- free(url_name);
-
-- strncpy(dirname, option_downloads_directory, PATH_MAX);
-+ strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
- strncat(dirname, "/", PATH_MAX - strlen(dirname));
- dirname[PATH_MAX - 1] = '\0';
-
- /* this way the scale used by PDF functions is synchronized with that
- * used by the all-purpose print interface
- */
-- haru_nsfont_set_scale((float)option_export_scale / 100);
-+ haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
-
- save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
- GTK_FILE_CHOOSER_ACTION_SAVE,
diff --git a/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch
deleted file mode 100644
index 2dc8a14fbeb9..000000000000
--- a/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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
deleted file mode 100644
index e78d71c5794c..000000000000
--- a/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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
deleted file mode 100644
index 31aaa0ae8ad6..000000000000
--- a/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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))
-