gentoo resync : 22.10.2018

4 files changed, 97 insertions, 110 deletions

diff --git a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
deleted file mode 100644
index 8004aa4c6206..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- netsurf-3.6/Makefile.defaults
-+++ netsurf-3.6/Makefile.defaults
-@@ -96,12 +96,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.6/frontends/framebuffer/Makefile
-+++ netsurf-3.6/frontends/framebuffer/Makefile
-@@ -20,7 +20,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.6/frontends/framebuffer/Makefile.defaults
-+++ netsurf-3.6/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
- 
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@
- endif
- 
- 
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- 		$(GTKDEPFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_DEFAULT_SOURCE \
---- netsurf-3.6/frontends/gtk/Makefile.defaults
-+++ netsurf-3.6/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@
- NETSURF_GTK_MAJOR ?= 2
- 
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS += 
---- netsurf-3.6/test/Makefile
-+++ netsurf-3.6/test/Makefile
-@@ -105,7 +105,7 @@
-   COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
- 
--TESTCFLAGS := -std=c99 -g \
-+TESTCFLAGS := -std=c99 \
- 		$(COMMON_WARNFLAGS) \
- 		-D_BSD_SOURCE \
- 		-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
deleted file mode 100644
index 6aca4f6abdf9..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -16,7 +16,6 @@
- 
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
--		-DG_DISABLE_DEPRECATED \
- 	       	-DGTK_DISABLE_SINGLE_INCLUDES \
- 		-DGTK_MULTIHEAD_SAFE \
- 		-DPANGO_DISABLE_DEPRECATED
---- netsurf-3.6/content/handlers/image/video.c
-+++ netsurf-3.6/content/handlers/image/video.c
-@@ -22,6 +22,8 @@
- #include "content/content_protected.h"
- 
- #include "image/video.h"
-+#include "utils/http/parameter.h"
-+#include "content/llcache.h"
- 
- typedef struct nsvideo_content {
- 	struct content base;
---- netsurf-3.6/content/content_factory.h
-+++ netsurf-3.6/content/content_factory.h
-@@ -25,6 +25,7 @@
- 
- #include "netsurf/content_type.h"
- #include "utils/errors.h"
-+#include "utils/utils.h"
- 
- #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER)	\
- 									\
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
new file mode 100644
index 000000000000..c52422dcb92b
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
@@ -0,0 +1,79 @@
+diff --git a/Makefile.defaults b/Makefile.defaults
+index 51090109e..f1ec46f73 100644
+--- a/Makefile.defaults
++++ b/Makefile.defaults
+@@ -114,12 +114,6 @@ NETSURF_USE_SANITIZERS := NO
+ # But recover after sanitizer failure
+ NETSURF_RECOVER_SANITIZERS := YES
+ 
+-# 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
+ 
+diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
+index bdedd903b..35179138a 100644
+--- a/frontends/framebuffer/Makefile
++++ b/frontends/framebuffer/Makefile
+@@ -20,7 +20,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
+ 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 \
+diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
+index cc712e992..f132c97d6 100644
+--- a/frontends/framebuffer/Makefile.defaults
++++ b/frontends/framebuffer/Makefile.defaults
+@@ -3,7 +3,7 @@
+ # ----------------------------------------------------------------------------
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+ 
+ # Framebuffer default surface provider.
+ # Valid values are: x, sdl, linux, vnc, able,
+diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
+index ec60ce70c..04af6df8f 100644
+--- a/frontends/gtk/Makefile
++++ b/frontends/gtk/Makefile
+@@ -33,7 +33,7 @@ GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
+ endif
+ 
+ 
+-GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
++GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
+ 		$(GTKDEPFLAGS) \
+ 		-D_BSD_SOURCE \
+ 		-D_DEFAULT_SOURCE \
+diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
+index a98043eb9..bb5371230 100644
+--- a/frontends/gtk/Makefile.defaults
++++ b/frontends/gtk/Makefile.defaults
+@@ -39,4 +39,4 @@ NETSURF_FS_BACKING_STORE := YES
+ NETSURF_GTK_MAJOR ?= 2
+ 
+ # Optimisation levels
+-CFLAGS += -O2
++CFLAGS += 
+diff --git a/test/Makefile b/test/Makefile
+index 4f9dd22c9..8bec9b88a 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -134,7 +134,7 @@ ifneq ($(CC_MAJOR),2)
+   COMMON_WARNFLAGS += -Wno-unused-parameter
+ endif
+ 
+-BASE_TESTCFLAGS := -std=c99 -g \
++BASE_TESTCFLAGS := -std=c99 \
+ 	$(COMMON_WARNFLAGS) \
+ 	-D_DEFAULT_SOURCE \
+ 	-D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
index 5824adc1ecbf..e9c2420a33fd 100644
--- a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
+++ b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
@@ -1,5 +1,7 @@
---- netsurf-3.6/desktop/font_haru.c
-+++ netsurf-3.6/desktop/font_haru.c
+diff --git a/desktop/font_haru.c b/desktop/font_haru.c
+index 4ee9824f0..3304ba82a 100644
+--- a/desktop/font_haru.c
++++ b/desktop/font_haru.c
 @@ -37,7 +37,7 @@
  #include <hpdf.h>
  
@@ -9,8 +11,10 @@
  #include "desktop/font.h"
  #include "utils/log.h"
  
---- netsurf-3.6/desktop/save_pdf.c
-+++ netsurf-3.6/desktop/save_pdf.c
+diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
+index 889190089..9e6265cfb 100644
+--- a/desktop/save_pdf.c
++++ b/desktop/save_pdf.c
 @@ -60,6 +60,8 @@
  #include "utils/useragent.h"
  #include "content/hlcache.h"
@@ -20,7 +24,7 @@
  #include "netsurf/bitmap.h"
  
  #include "netsurf/plotters.h"
-@@ -450,11 +452,6 @@
+@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
  
  		switch(content_get_type(content)){
  		/*Handle "embeddable" types of images*/
@@ -32,7 +36,7 @@
  
  		/*Disabled until HARU PNG support will be more stable.
  
-@@ -700,7 +697,7 @@
+@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
  
  
  #ifndef PDF_DEBUG
@@ -41,7 +45,7 @@
  		HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
  #endif
  	HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -774,7 +771,7 @@
+@@ -780,7 +777,7 @@ void pdf_end(void)
  	assert(settings->output != NULL);
  
  	/*Encryption on*/
@@ -50,7 +54,7 @@
  		guit->misc->pdf_password(&owner_pass, &user_pass,
  				(void *)settings->output);
  	else
-@@ -789,7 +786,7 @@
+@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
  {
  	nserror res = NSERROR_OK;
  
@@ -59,9 +63,11 @@
  		HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
  		HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
  		free(owner_pass);
---- netsurf-3.6/frontends/gtk/scaffolding.c
-+++ netsurf-3.6/frontends/gtk/scaffolding.c
-@@ -731,14 +731,14 @@
+diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
+index 8c46fd884..748518fdc 100644
+--- a/frontends/gtk/scaffolding.c
++++ b/frontends/gtk/scaffolding.c
+@@ -853,14 +853,14 @@ MULTIHANDLER(pdf)
  
  	free(url_name);
  
@@ -70,7 +76,7 @@
  	strncat(dirname, "/", PATH_MAX - strlen(dirname));
  	dirname[PATH_MAX - 1] = '\0';
  
- 	/* this way the scale used by PDF functions is synchronized with that
+ 	/* this way the scale used by PDF functions is synchronised with that
  	 * used by the all-purpose print interface
  	 */
 -	haru_nsfont_set_scale((float)option_export_scale / 100);