summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2016-03-02 23:57:45 +0100
committerMichael Weber <xmw@gentoo.org>2016-03-03 00:00:04 +0100
commite3761da77db24d788c88e5669dadf9a1fa37a66b (patch)
treef4aa01492e8cf52afe397144cb4f68639c268d59 /www-client/netsurf/files
parentdev-python/epsilon: Clean up old. (diff)
downloadgentoo-e3761da77db24d788c88e5669dadf9a1fa37a66b.tar.gz
gentoo-e3761da77db24d788c88e5669dadf9a1fa37a66b.tar.bz2
gentoo-e3761da77db24d788c88e5669dadf9a1fa37a66b.zip
Drop old, cleanup FILESDIR.
Diffstat (limited to 'www-client/netsurf/files')
-rw-r--r--www-client/netsurf/files/netsurf-2.9-buildsystem.patch13
-rw-r--r--www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch63
-rw-r--r--www-client/netsurf/files/netsurf-2.9-includes.patch10
-rw-r--r--www-client/netsurf/files/netsurf-3.0-CFLAGS.patch77
-rw-r--r--www-client/netsurf/files/netsurf-3.2-CFLAGS.patch77
-rw-r--r--www-client/netsurf/files/netsurf-3.2-glibc2.20.patch30
-rw-r--r--www-client/netsurf/files/netsurf-3.2-pdf-writer.patch90
7 files changed, 0 insertions, 360 deletions
diff --git a/www-client/netsurf/files/netsurf-2.9-buildsystem.patch b/www-client/netsurf/files/netsurf-2.9-buildsystem.patch
deleted file mode 100644
index 14c0070cf59..00000000000
--- a/www-client/netsurf/files/netsurf-2.9-buildsystem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- netsurf-2.9/framebuffer/Makefile.target
-+++ netsurf-2.9/framebuffer/Makefile.target
-@@ -39,6 +39,10 @@
- $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
- $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
- $(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
-+$(eval $(call pkg_config_find_and_add,NSSVG,libsvgtiny,NSSVG))
-+$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,RSVG))
-+$(eval $(call pkg_config_find_and_add,WEBP,libwebp,WEBP))
-+$(eval $(call pkg_config_find_and_add,VIDEO,gstreamer-0.10,VIDEO))
-
- CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) \
- -D_BSD_SOURCE \
diff --git a/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch
deleted file mode 100644
index 6520c7608a6..00000000000
--- a/www-client/netsurf/files/netsurf-2.9-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7abd1c708d894a67617e60c2f85d6db355a713bb Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Sat, 18 Aug 2012 16:10:23 +0100
-Subject: [PATCH] Conditionally include image headers to allow building
- without some dependencies.
-
----
- image/image.c | 32 +++++++++++++++++++++++++++++---
- 1 files changed, 29 insertions(+), 3 deletions(-)
-
-diff --git a/image/image.c b/image/image.c
-index becf221..70b981b 100644
---- a/image/image.c
-+++ b/image/image.c
-@@ -27,16 +27,42 @@
- #include "desktop/plotters.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_MNG
- #include "image/mng.h"
--#include "image/nssprite.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"
-
---
-1.7.8.6
-
diff --git a/www-client/netsurf/files/netsurf-2.9-includes.patch b/www-client/netsurf/files/netsurf-2.9-includes.patch
deleted file mode 100644
index ca1a7c95fff..00000000000
--- a/www-client/netsurf/files/netsurf-2.9-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- netsurf-2.9/framebuffer/font_internal.c
-+++ netsurf-2.9/framebuffer/font_internal.c
-@@ -18,6 +18,7 @@
- */
-
- #include <inttypes.h>
-+#include <string.h>
-
- #include <assert.h>
- #include "css/css.h"
diff --git a/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch
deleted file mode 100644
index 065148ba15d..00000000000
--- a/www-client/netsurf/files/netsurf-3.0-CFLAGS.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- netsurf-3.0/Makefile.defaults
-+++ netsurf-3.0/Makefile.defaults
-@@ -93,7 +93,6 @@
- NETSURF_USE_LIBICONV_PLUG := YES
-
- # Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
-
- # Default installation/execution prefix
- PREFIX ?= /usr/local
---- netsurf-3.0/framebuffer/Makefile.defaults
-+++ netsurf-3.0/framebuffer/Makefile.defaults
-@@ -3,7 +3,6 @@
- # ----------------------------------------------------------------------------
-
- # Optimisation levels
-- CFLAGS += -O2
-
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
---- netsurf-3.0/framebuffer/Makefile.target
-+++ netsurf-3.0/framebuffer/Makefile.target
-@@ -47,12 +47,12 @@
- $(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 $(WARNFLAGS) \
-+CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L \
- $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) \
-- $(shell xml2-config --cflags)
-+ $(shell ${PKG_CONFIG} libxml-2.0 --cflags)
-
- LDFLAGS += -lm -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive
-
---- netsurf-3.0/gtk/Makefile.defaults
-+++ netsurf-3.0/gtk/Makefile.defaults
-@@ -31,4 +31,3 @@
- NETSURF_GTK_MAJOR := 2
-
- # Optimisation levels
-- CFLAGS += -O2
---- netsurf-3.0/gtk/Makefile.target
-+++ netsurf-3.0/gtk/Makefile.target
-@@ -51,7 +51,7 @@
- -D_POSIX_C_SOURCE=200112L \
- -D_NETBSD_SOURCE \
- -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
-- $(WARNFLAGS) -g
-+ $(WARNFLAGS)
-
- # non optional pkg-configed libs
- $(eval $(call pkg_config_find_and_add,libcss,CSS))
---- netsurf-3.0/test/Makefile
-+++ netsurf-3.0/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_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/log.c utils/nsurl.c test/nsurl.c
diff --git a/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch
deleted file mode 100644
index 3d5b8668f53..00000000000
--- a/www-client/netsurf/files/netsurf-3.2-CFLAGS.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- netsurf-3.2/Makefile.defaults
-+++ netsurf-3.2/Makefile.defaults
-@@ -91,9 +91,6 @@
- # Valid options: YES, NO
- NETSURF_FS_BACKING_STORE := NO
-
--# Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
--
- # Default installation/execution prefix
- PREFIX ?= /usr/local
-
---- netsurf-3.2/framebuffer/Makefile.defaults
-+++ netsurf-3.2/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.2/framebuffer/Makefile.target
-+++ netsurf-3.2/framebuffer/Makefile.target
-@@ -42,7 +42,7 @@
- $(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 $(WARNFLAGS) \
-+CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L \
---- netsurf-3.2/gtk/Makefile.defaults
-+++ netsurf-3.2/gtk/Makefile.defaults
-@@ -38,6 +38,3 @@
-
- # Set default GTK version to build for (2 or 3)
- NETSURF_GTK_MAJOR := 2
--
--# Optimisation levels
--CFLAGS += -O2
---- netsurf-3.2/gtk/Makefile.target
-+++ netsurf-3.2/gtk/Makefile.target
-@@ -51,7 +51,7 @@
- -D_POSIX_C_SOURCE=200809L \
- -D_NETBSD_SOURCE \
- -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
-- $(WARNFLAGS) -g
-+ $(WARNFLAGS)
-
- # non optional pkg-configed libs
- $(eval $(call pkg_config_find_and_add,libcss,CSS))
---- netsurf-3.2/test/Makefile
-+++ netsurf-3.2/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_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
diff --git a/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch b/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
deleted file mode 100644
index b521aeb34fc..00000000000
--- a/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- netsurf-3.2/framebuffer/Makefile.target
-+++ netsurf-3.2/framebuffer/Makefile.target
-@@ -43,7 +43,7 @@
- $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
-
- CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) \
-- -D_BSD_SOURCE \
-+ -D_BSD_SOURCE -D_DEFAULT_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L \
- $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
---- netsurf-3.2/gtk/Makefile.target
-+++ netsurf-3.2/gtk/Makefile.target
-@@ -46,7 +46,7 @@
-
- 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.2/test/Makefile
-+++ netsurf-3.2/test/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS := -std=c99 -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
-
diff --git a/www-client/netsurf/files/netsurf-3.2-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.2-pdf-writer.patch
deleted file mode 100644
index 92179dcd894..00000000000
--- a/www-client/netsurf/files/netsurf-3.2-pdf-writer.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- netsurf-3.2/desktop/save_pdf/pdf_plotters.c
-+++ netsurf-3.2/desktop/save_pdf/pdf_plotters.c
-@@ -426,11 +428,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.
-
-@@ -676,7 +678,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());
-@@ -750,7 +752,7 @@
- assert(settings->output != NULL);
-
- /*Encryption on*/
-- if (option_enable_PDF_password)
-+ if (nsoption_bool(enable_PDF_password))
- PDF_Password(&owner_pass, &user_pass,
- (void *)settings->output);
- else
-@@ -765,7 +767,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.2/gtk/gui.c
-+++ netsurf-3.2/gtk/gui.c
-@@ -740,9 +740,11 @@
-
- #ifdef WITH_PDF_EXPORT
-
-+#include <glade/glade-xml.h>
-+
- void PDF_Password(char **owner_pass, char **user_pass, char *path)
- {
-- GladeXML *x = glade_xml_new(glade_password_file_location, NULL, NULL);
-+ GladeXML *x = glade_xml_new(glade_file_location->password, NULL, NULL);
- GtkWindow *wnd = GTK_WINDOW(glade_xml_get_widget(x, "wndPDFPassword"));
- GtkButton *ok, *no;
- void **data = malloc(5 * sizeof(void *));
---- netsurf-3.2/gtk/scaffolding.c
-+++ netsurf-3.2/gtk/scaffolding.c
-@@ -711,14 +711,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,
---- netsurf-3.2/gtk/Makefile.target
-+++ netsurf-3.2/gtk/Makefile.target
-@@ -62,6 +62,7 @@
- $(eval $(call pkg_config_find_and_add,gtk+-$(NETSURF_GTK_MAJOR).0,GTK-$(NETSURF_GTK_MAJOR)))
- $(eval $(call pkg_config_find_and_add,gthread-2.0,GThread2))
- $(eval $(call pkg_config_find_and_add,gmodule-2.0,GModule2))
-+$(eval $(call pkg_config_find_and_add,libglade-2.0,GLADE))
-
-
- CFLAGS += $(GTKCFLAGS)