summaryrefslogtreecommitdiff
path: root/www-client/netsurf
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/netsurf')
-rw-r--r--www-client/netsurf/Manifest13
-rw-r--r--www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch42
-rw-r--r--www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch34
-rw-r--r--www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch31
-rw-r--r--www-client/netsurf/files/netsurf-3.8-CFLAGS.patch79
-rw-r--r--www-client/netsurf/files/netsurf-3.8-pdf-writer.patch86
-rw-r--r--www-client/netsurf/metadata.xml67
-rw-r--r--www-client/netsurf/netsurf-3.10.ebuild (renamed from www-client/netsurf/netsurf-3.9.ebuild)42
-rw-r--r--www-client/netsurf/netsurf-3.8-r2.ebuild129
9 files changed, 138 insertions, 385 deletions
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 16a7c0b9ad76..cc0266a6578c 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,9 +1,6 @@
-AUX netsurf-3.6-conditionally-include-image-headers.patch 598 BLAKE2B d55ff86b9b6981671eb9466ce989145ba79b00aa791ae361367362c9938335f561aa828911e44ea25637ff3e6de637180b76649f55df27b4d7d4269652f19f9a SHA512 346e7befaeb337cb33963794303eb18cccd280eaa86aed205fee9b50bcb3cbea8d5c4025b439d7d737036e66a76354871b1765eae7dd11e2d1a71dc3084747c3
-AUX netsurf-3.8-CFLAGS.patch 2544 BLAKE2B 1d71cd9f577b9a909c90117d4ba6933dacc58423e9db3bc060e79baf7c3bfb71b2eb11c82d53495be92098f50923675a6be6eef5458461d8bc0accd22136c7dc SHA512 87e2698a9b58a8871d9a7fb0bc42368974a9fb815adcacb7ee29d73ed5ac6747ccb944a15e41620841ff813dce95feae1e664ba0fcf332bfd6e8b830e82d3810
-AUX netsurf-3.8-pdf-writer.patch 2807 BLAKE2B 93ee86a467a01a2da07269ef32a672b8337d93a91b65fbcbe4c21e05f9f702baa70f79ca2757cf535ad0b4490c00bbc3c9276f6ed392d56e3a766553e2a5ab42 SHA512 40f6c88b5946822699a125a8c6c5eb631990828bd7b4e31be330191a41588d1978083db9fdca2752f8bb0c3af5afe7ed896d8b79b8eaa6f45523da74c36eda07
+AUX netsurf-3.10-disable-failing-tests.patch 1196 BLAKE2B 055f4663bfed7ebe291e922ad52b20acb3b014e0be36e2e562410ce8e1188fcaa0edce1dd39ec9b834139e4250c30a08039a896a47dfc90c23e9f2e4a1675869 SHA512 dc10108ee223287978305942e1254efacf7ac78201355df0de5c19ebb0782077cdaf655e8eba590c5187df38d1f67e861f77b13d507faea481bf8f1992fe0e1d
+AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9ebd5a00659c88dda90b6e8822e1cb51e8bf3755cae88373a206f6d1637f14e928365345bc9d98cfaa18294e9aa5beeef43449252c70e8d1de8d21b SHA512 76b0d397ce0f73aa23e6069b9fce492768f9d8fe1ba3dcb77b2f3d8c27b2e5fb8cbf5f97ede41bc624684c0d20bd80f3d985385ba1c825298f75f68c768656b4
AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
-DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
-DIST netsurf-3.9-src.tar.gz 3989742 BLAKE2B a147a99bea00163147cb39b16ff8b7b874c58d386e60eb8aa568b3ce30e4957708c9720a5291a2aa37bc6d8d4bd0eaf4e2dc1a2bc2fff396cb4d972dd887e024 SHA512 061a1c6379b48582d842ed1ca6cea59b87cd84cd13769bdc32b623a56cebc69e94af9d65f4abd959608c98da9d0006f7842f875017569e6a3f7b77cbb928f24a
-EBUILD netsurf-3.8-r2.ebuild 3901 BLAKE2B 05e18fe99ada4d93333c4cc00c7083850423d41e6326b9b40b475b68fa9ad21b65b8fcaa6bba3b9e56bee6ccb6712362f8cfdbfe934b3043ff348145bdf77237 SHA512 38647c20bc9a6dc97ec3168f6b52280fec876bf3eef3ba29c7294f918be05467c628c7288c90ecf4c69c5dfadb7b53b3977ace67f22ccc8321c5c6645ee83707
-EBUILD netsurf-3.9.ebuild 3906 BLAKE2B 47797b8f43c566cd2c758a69dbdeae37133ad1e3bf3a648e1397e528affc7b3f7769a0673a5760890105b35abbd2715972e4af8aaa2f9634e1ea34b2f5b92361 SHA512 9e55f7d46404a942db368c3a644edf318215c00125c2a08b59449c87dd7a141777c2077f378fd6cfb747e40af8c4024a0d59a1fa193b795ba1f6a8f643ef75e9
-MISC metadata.xml 1556 BLAKE2B 4ce7e6462525c4091f3a6e6226afaa29748d11728e4e4574147f317cb3b0ec650b247023e7b1c74e29f28e60fba3116084730e831daa6ad11e01267ccac896f4 SHA512 b529c7584bed60fa7b9d84f629314a1d902cdfbfe381e5a5975c77218aa7cbb58c4c4e66de96cb2029192c25956b05e6d47ee6baf394a192154806f46979febf
+DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
+EBUILD netsurf-3.10.ebuild 3899 BLAKE2B a3e64bbaa69941d911c6e6bdf0f6dcb2165777ea407c78ad3e01aa891abe5ee5c48b67589f0990340e08ff017bd2a764c05e785ece928fa76212734be32e3822 SHA512 dd0cfac0bf5f30e800b2bde2523f83e42317ed946d80527b10da89d9a94ffca14c30723a959c3884988c595d12e427ddf7e2a7e19f706bdd52697e7e5aba1f25
+MISC metadata.xml 1564 BLAKE2B 613fed039b6dac6329dacce954d28087855dfb2db7445496e9394882c0d9bf59c9db936bb47188a582eaf7987961acb5d4045baf1917fd1a46b72dad1c24ed7e SHA512 634e81db8221b34e71fab51ff66efd15d95307a88dc08812837b290301a8b8e1644dab4972f9e1941434b04f0c5877343033099d624fa68bd449796f0866ab48
diff --git a/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
new file mode 100644
index 000000000000..6ffcec002e0b
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
@@ -0,0 +1,42 @@
+From 4c3d6b10802b6747ba36b6e7c988f6b584352358 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:42:34 -0400
+Subject: [PATCH 1/1] test: disable failing tests.
+
+Just cut them right out of the Makefile if they ain't gonna work.
+
+Bug: https://bugs.gentoo.org/687378
+Upstream-bug: https://bugs.netsurf-browser.org/mantis/view.php?id=2779
+---
+ test/Makefile | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 82ffee6..952d238 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -5,8 +5,6 @@ TESTS := \
+ nsurl \
+ urldbtest \
+ nsoption \
+- bloom \
+- hashtable \
+ hashmap \
+ urlescape \
+ utils \
+@@ -47,12 +45,6 @@ messages_SRCS := utils/messages.c utils/hashtable.c test/log.c test/messages.c
+ # nsoption test sources
+ nsoption_SRCS := utils/nsoption.c test/log.c test/nsoption.c
+
+-# Bloom filter test sources
+-bloom_SRCS := utils/bloom.c test/bloom.c
+-
+-# hash table test sources
+-hashtable_SRCS := utils/hashtable.c test/log.c test/hashtable.c
+-
+ # hashmap test sources
+ hashmap_SRCS := $(NSURL_SOURCES) utils/hashmap.c utils/corestrings.c test/log.c test/hashmap.c
+ hashmap_LD := -lmalloc_fig
+--
+2.26.2
+
diff --git a/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
new file mode 100644
index 000000000000..3a6ccc2466f4
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
@@ -0,0 +1,34 @@
+From d585a1573819306bb3660db3f13a85b2fd254c63 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:23:10 -0400
+Subject: [PATCH 1/1] utils/idna.c: adjust utf8proc.h header location.
+
+There are two upstreams for libutf8proc, and they each put utf8proc.h
+in a different location -- ostensibly as a performance art piece
+intended to remind the programmer that we as human beings are all
+slowly dying, and that our limited time here on earth should not be
+wasted. This commit switches the header location from the netsurf-
+upstream one that used to work, to the julia-upstream location that
+works now (that the Gentoo package follows the julia upstream).
+
+Bug: https://bugs.gentoo.org/721318
+---
+ utils/idna.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/idna.c b/utils/idna.c
+index 628ef1f..f6e498a 100644
+--- a/utils/idna.c
++++ b/utils/idna.c
+@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
+
+ #ifdef WITH_UTF8PROC
+
+-#include <libutf8proc/utf8proc.h>
++#include <utf8proc.h>
+
+ int32_t idna_contexto[] = {
+ /* CONTEXTO codepoints which have a rule defined */
+--
+2.26.2
+
diff --git a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
deleted file mode 100644
index 06754464cb6c..000000000000
--- a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/content/handlers/image/image.c
-+++ netsurf-3.6/content/handlers/image/image.c
-@@ -27,14 +27,28 @@
- #include "netsurf/content.h"
- #include "desktop/gui_internal.h"
-
-+#ifdef WITH_BMP
- #include "image/bmp.h"
-+#endif
-+#ifdef WITH_GIF
- #include "image/gif.h"
-+#endif
- #include "image/ico.h"
-+#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"
-
- /**
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
deleted file mode 100644
index c52422dcb92b..000000000000
--- a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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.8-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
deleted file mode 100644
index e9c2420a33fd..000000000000
--- a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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>
-
- #include "utils/nsoption.h"
--#include "desktop/save_pdf/font_haru.h"
-+#include "desktop/font_haru.h"
- #include "desktop/font.h"
- #include "utils/log.h"
-
-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"
- #include "utils/nsoption.h"
-+#include "desktop/gui_misc.h"
-+#include "desktop/gui_internal.h"
- #include "netsurf/bitmap.h"
-
- #include "netsurf/plotters.h"
-@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
-
- 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;
-
- /*Disabled until HARU PNG support will be more stable.
-
-@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
-
-
- #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());
-@@ -780,7 +777,7 @@ void pdf_end(void)
- assert(settings->output != NULL);
-
- /*Encryption on*/
-- if (option_enable_PDF_password)
-+ if (nsoption_bool(enable_PDF_password))
- guit->misc->pdf_password(&owner_pass, &user_pass,
- (void *)settings->output);
- else
-@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
- {
- nserror res = NSERROR_OK;
-
-- 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);
-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);
-
-- 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 synchronised 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/metadata.xml b/www-client/netsurf/metadata.xml
index c0afc0380304..4abc84a70da8 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,36 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>philipp.ammann@posteo.de</email>
- <name>Philipp Ammann</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <upstream>
- <changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
- </upstream>
- <use>
- <flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
- <flag name="duktape">Use duktape.org javascript engine</flag>
- <flag name="gtk">Build GTK3 GUI</flag>
- <flag name="gtk2">Build GTK2 GUI</flag>
- <flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
- <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
- <flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
- <flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
- </use>
- <longdescription lang="en">
- NetSurf is a free, open source web browser. It is written in C, has
- its own layout and rendering engine entirely written from scratch. It
- is small and capable of handling many of the web standards in use
- today.
+ <maintainer type="person">
+ <email>philipp.ammann@posteo.de</email>
+ <name>Philipp Ammann</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <changelog>
+ https://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt
+ </changelog>
+ </upstream>
+ <use>
+ <flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
+ <flag name="duktape">Use duktape.org javascript engine</flag>
+ <flag name="gtk">Build GTK3 GUI</flag>
+ <flag name="gtk2">Build GTK2 GUI</flag>
+ <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
+ <flag name="rosprite">
+ RISC OS Sprite bitmap image support (media-libs/librosprite)
+ </flag>
+ <flag name="svgtiny">
+ SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
+ </flag>
+ </use>
+ <longdescription lang="en">
+ NetSurf is a free, open source web browser. It is written in C,
+ has its own layout and rendering engine entirely written from
+ scratch. It is small and capable of handling many of the web
+ standards in use today.
- Whether you want to check your webmail, read the news or post to
- discussion forums, NetSurf is your lightweight gateway to the world
- wide web. Actively developed, NetSurf is continually evolving and
- improving.
- </longdescription>
+ Whether you want to check your webmail, read the news or post to
+ discussion forums, NetSurf is your lightweight gateway to the
+ world wide web. Actively developed, NetSurf is continually
+ evolving and improving.
+ </longdescription>
</pkgmetadata>
diff --git a/www-client/netsurf/netsurf-3.9.ebuild b/www-client/netsurf/netsurf-3.10.ebuild
index 89bfe438c733..206f8f8d2f65 100644
--- a/www-client/netsurf/netsurf-3.9.ebuild
+++ b/www-client/netsurf/netsurf-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,9 +11,9 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
LICENSE="GPL-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
- pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
+KEYWORDS="~amd64"
+IUSE="bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
+ +png +psl rosprite +svg +svgtiny +webp"
REQUIRED_USE="|| ( fbcon gtk gtk2 )
duktape? ( javascript )"
@@ -36,11 +36,13 @@ RDEPEND="
x11-libs/gtk+:3 )
gtk2? ( dev-libs/glib:2
x11-libs/gtk+:2 )
- javascript? ( >=dev-libs/nsgenbind-0.7
- !duktape? ( dev-lang/spidermonkey:0= ) )
+ javascript? (
+ >=dev-libs/nsgenbind-0.7
+ duktape? ( dev-lang/duktape )
+ !duktape? ( dev-lang/spidermonkey:0= )
+ )
jpeg? ( >=virtual/jpeg-0-r2:0 )
mng? ( >=media-libs/libmng-1.0.10-r2 )
- pdf-writer? ( media-libs/libharu )
png? ( >=media-libs/libpng-1.2.51:0 )
psl? ( media-libs/libnspsl )
rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
@@ -53,11 +55,10 @@ BDEPEND="
dev-perl/HTML-Parser
>=dev-util/netsurf-buildsystem-1.7-r1"
-RESTRICT="test"
-
PATCHES=(
- "${FILESDIR}"/${PN}-3.9-conditionally-include-image-headers.patch
- "${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+ "${FILESDIR}/${PN}-3.9-conditionally-include-image-headers.patch"
+ "${FILESDIR}/${PN}-3.10-julia-libutf8proc-header-location.patch"
+ "${FILESDIR}/${PN}-3.10-disable-failing-tests.patch"
)
DOCS=( README docs/using-framebuffer.md
@@ -84,13 +85,12 @@ _emake() {
NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
NETSURF_USE_JS=NO
NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
- NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
PKG_CONFIG=$(tc-getPKG_CONFIG)
NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
+ NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
NETSURF_USE_VIDEO=NO
)
emake "${netsurf_makeconf[@]}" $@
@@ -98,7 +98,7 @@ _emake() {
src_compile() {
use fbcon && _emake TARGET=framebuffer
- use gtk2 && _emake TARGET=gtk
+ use gtk2 && _emake TARGET=gtk2
use gtk && _emake TARGET=gtk3
}
@@ -111,19 +111,19 @@ src_install() {
-i "${WORKDIR}"/*/utils/git-testament.pl || die
if use fbcon ; then
- _emake TARGET=framebuffer DESTDIR="${ED}" install
+ _emake TARGET=framebuffer DESTDIR="${D}" install
elog "framebuffer binary has been installed as netsurf-fb"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
fi
if use gtk2 ; then
- _emake TARGET=gtk DESTDIR="${ED}" install
- elog "netsurf gtk2 version has been installed as netsurf-gtk"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+ _emake TARGET=gtk2 DESTDIR="${D}" install
+ elog "netsurf gtk2 version has been installed as netsurf-gtk2"
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk2 NetSurf-gtk2 netsurf "Network;WebBrowser"
fi
if use gtk ; then
- _emake TARGET=gtk3 DESTDIR="${ED}" install
+ _emake TARGET=gtk3 DESTDIR="${D}" install
elog "netsurf gtk3 version has been installed as netsurf-gtk3"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
fi
insinto /usr/share/pixmaps
diff --git a/www-client/netsurf/netsurf-3.8-r2.ebuild b/www-client/netsurf/netsurf-3.8-r2.ebuild
deleted file mode 100644
index e9cd87acae48..000000000000
--- a/www-client/netsurf/netsurf-3.8-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs desktop
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
- pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 )
- duktape? ( javascript )"
-
-RDEPEND="
- >=dev-libs/libcss-0.8
- >=net-libs/libdom-0.3
- >=net-libs/libhubbub-0.3
- >=dev-libs/libnsutils-0.0.5
- >=dev-libs/libutf8proc-2.2
- dev-libs/libxml2:2
- net-misc/curl
- bmp? ( >=media-libs/libnsbmp-0.1 )
- fbcon? ( >=dev-libs/libnsfb-0.2
- truetype? ( media-fonts/dejavu
- >=media-libs/freetype-2.5.0.1 )
- )
- gif? ( >=media-libs/libnsgif-0.1 )
- gtk? ( dev-libs/glib:2
- x11-libs/gtk+:3 )
- gtk2? ( dev-libs/glib:2
- x11-libs/gtk+:2 )
- javascript? ( >=dev-libs/nsgenbind-0.6
- !duktape? ( dev-lang/spidermonkey:0= ) )
- jpeg? ( >=virtual/jpeg-0-r2:0 )
- mng? ( >=media-libs/libmng-1.0.10-r2 )
- pdf-writer? ( media-libs/libharu )
- png? ( >=media-libs/libpng-1.2.51:0 )
- psl? ( media-libs/libnspsl )
- rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
- svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
- !svgtiny? ( gnome-base/librsvg:2 ) )
- webp? ( >=media-libs/libwebp-0.3.0 )"
-DEPEND="${RDEPEND}
- dev-libs/check
- dev-perl/HTML-Parser
- >=dev-util/netsurf-buildsystem-1.7-r1"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8-CFLAGS.patch
- "${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
- "${FILESDIR}"/${PN}-3.8-pdf-writer.patch
-)
-
-DOCS=( README docs/using-framebuffer.md
- docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
- default
- rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
-}
-
-_emake() {
- source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
- netsurf_define_makeconf
- local netsurf_makeconf=(
- "${NETSURF_MAKECONF[@]}"
- COMPONENT_TYPE=binary
- NETSURF_USE_BMP=$(usex bmp YES NO)
- NETSURF_USE_GIF=$(usex gif YES NO)
- NETSURF_USE_JPEG=$(usex jpeg YES NO)
- NETSURF_USE_PNG=$(usex png YES NO)
- NETSURF_USE_NSPSL=$(usex psl YES NO)
- NETSURF_USE_MNG=$(usex mng YES NO)
- NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
- NETSURF_USE_JS=NO
- NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
- NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
- NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
- NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
- NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
- PKG_CONFIG=$(tc-getPKG_CONFIG)
- NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
- NETSURF_USE_VIDEO=NO
- )
- emake "${netsurf_makeconf[@]}" $@
-}
-
-src_compile() {
- use fbcon && _emake TARGET=framebuffer
- use gtk2 && _emake TARGET=gtk
- use gtk && _emake TARGET=gtk3
-}
-
-src_test() {
- _emake test
-}
-
-src_install() {
- sed -e '1iexit;' \
- -i "${WORKDIR}"/*/utils/git-testament.pl || die
-
- if use fbcon ; then
- _emake TARGET=framebuffer DESTDIR="${ED}" install
- elog "framebuffer binary has been installed as netsurf-fb"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
- fi
- if use gtk2 ; then
- _emake TARGET=gtk DESTDIR="${ED}" install
- elog "netsurf gtk2 version has been installed as netsurf-gtk"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
- fi
- if use gtk ; then
- _emake TARGET=gtk3 DESTDIR="${ED}" install
- elog "netsurf gtk3 version has been installed as netsurf-gtk3"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
- fi
-
- insinto /usr/share/pixmaps
- doins frontends/gtk/res/netsurf.xpm
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 15:23:45 +0000