* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2015-08-10 21:38 Sergei Trofimovich
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Trofimovich @ 2015-08-10 21:38 UTC (permalink / raw
To: gentoo-commits
commit: c28cf799ee244b6b75999924f1d04cff9060f58d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 21:38:04 2015 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 21:38:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28cf799
www-client/netsurf: fix 'src_install' failure, bug #552562
- do not drop _BSD_SOURCE define as 'timeradd' is defined
only under _BSD_SOURCE on old glibc
- use nullglob when we install single binary, bug #552562
by Anthony Parsons, w0rm and others.
Package-Manager: portage-2.2.20
www-client/netsurf/files/netsurf-3.2-glibc2.20.patch | 6 +++---
www-client/netsurf/files/netsurf-3.3-CFLAGS.patch | 4 ++--
www-client/netsurf/netsurf-3.3-r1.ebuild | 12 ++++++++++--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch b/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
index e63ec70..b521aeb 100644
--- a/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
+++ b/www-client/netsurf/files/netsurf-3.2-glibc2.20.patch
@@ -5,7 +5,7 @@
CFLAGS += -std=c99 -Dsmall $(WARNFLAGS) \
- -D_BSD_SOURCE \
-+ -D_DEFAULT_SOURCE \
++ -D_BSD_SOURCE -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
$(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
@@ -16,7 +16,7 @@
GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
$(GTKDEPFLAGS) \
- -D_BSD_SOURCE \
-+ -D_DEFAULT_SOURCE \
++ -D_BSD_SOURCE -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200809L \
-D_NETBSD_SOURCE \
@@ -24,7 +24,7 @@
+++ netsurf-3.2/test/Makefile
@@ -1,4 +1,4 @@
-CFLAGS := -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
-+CFLAGS := -std=c99 -D_DEFAULT_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.3-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
index 3f1c216..7a3f234 100644
--- a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
+++ b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
@@ -57,7 +57,7 @@
+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
$(GTKDEPFLAGS) \
- -D_BSD_SOURCE \
-+ -D_DEFAULT_SOURCE \
++ -D_BSD_SOURCE -D_DEFAULT_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200809L \
-D_NETBSD_SOURCE \
@@ -65,7 +65,7 @@
+++ 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_DEFAULT_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/netsurf-3.3-r1.ebuild b/www-client/netsurf/netsurf-3.3-r1.ebuild
index 6d32981..8e7d6a6 100644
--- a/www-client/netsurf/netsurf-3.3-r1.ebuild
+++ b/www-client/netsurf/netsurf-3.3-r1.ebuild
@@ -119,7 +119,11 @@ src_install() {
netsurf_src_install
elog "framebuffer binary has been installed as netsurf-fb"
pushd "${ED}"usr/bin >/dev/null || die
- for f in netsurf{,.*} ; do
+ eshopts_push -s nullglob
+ # bug 552562
+ local binaries=(netsurf{,.*})
+ eshopts_pop
+ for f in "${binaries[@]}" ; do
mv -v $f ${f/netsurf/netsurf-fb} || die
make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-fb} NetSurf-framebuffer${f/netsurf} netsurf "Network;WebBrowser"
done
@@ -134,7 +138,11 @@ src_install() {
netsurf_src_install
elog "netsurf gtk version has been installed as netsurf-gtk"
pushd "${ED}"usr/bin >/dev/null || die
- for f in netsurf{,.*} ; do
+ eshopts_push -s nullglob
+ # bug 552562
+ local binaries=(netsurf{,.*})
+ eshopts_pop
+ for f in "${binaries[@]}" ; do
mv -v $f ${f/netsurf/netsurf-gtk} || die
make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-gtk} NetSurf-gtk${f/netsurf} netsurf "Network;WebBrowser"
done
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2015-08-11 14:15 Michael Weber
0 siblings, 0 replies; 8+ messages in thread
From: Michael Weber @ 2015-08-11 14:15 UTC (permalink / raw
To: gentoo-commits
commit: 7d92c734e256d255b72a4a25881493e3923cd0e4
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 14:14:57 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 14:15:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d92c734
www-client/netsurf: fix USE=pdf-writer (bug 555904, bug 555906, thanks Oschtan).
Package-Manager: portage-2.2.20
.../netsurf/files/netsurf-3.2-pdf-writer.patch | 90 ++++++++++++++++++++++
.../netsurf/files/netsurf-3.3-pdf-writer.patch | 85 ++++++++++++++++++++
www-client/netsurf/netsurf-3.2-r1.ebuild | 3 +-
www-client/netsurf/netsurf-3.3-r1.ebuild | 3 +-
4 files changed, 179 insertions(+), 2 deletions(-)
diff --git a/www-client/netsurf/files/netsurf-3.2-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.2-pdf-writer.patch
new file mode 100644
index 0000000..92179dc
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.2-pdf-writer.patch
@@ -0,0 +1,90 @@
+--- 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)
diff --git a/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch
new file mode 100644
index 0000000..e2c709e
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.3-pdf-writer.patch
@@ -0,0 +1,85 @@
+--- 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/netsurf-3.2-r1.ebuild b/www-client/netsurf/netsurf-3.2-r1.ebuild
index b1789f8..8737637 100644
--- a/www-client/netsurf/netsurf-3.2-r1.ebuild
+++ b/www-client/netsurf/netsurf-3.2-r1.ebuild
@@ -55,7 +55,8 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
"${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
"${FILESDIR}"/${P}-conditionally-include-image-headers.patch
- "${FILESDIR}"/${P}-glibc2.20.patch )
+ "${FILESDIR}"/${P}-glibc2.20.patch
+ "${FILESDIR}"/${P}-pdf-writer.patch )
DOCS=( fb.modes README Docs/USING-Framebuffer
Docs/ideas/{cache,css-engine,render-library}.txt )
diff --git a/www-client/netsurf/netsurf-3.3-r1.ebuild b/www-client/netsurf/netsurf-3.3-r1.ebuild
index b10a096..4c3e786 100644
--- a/www-client/netsurf/netsurf-3.3-r1.ebuild
+++ b/www-client/netsurf/netsurf-3.3-r1.ebuild
@@ -57,7 +57,8 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
"${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
- "${FILESDIR}"/${PN}-3.2-conditionally-include-image-headers.patch )
+ "${FILESDIR}"/${PN}-3.2-conditionally-include-image-headers.patch
+ "${FILESDIR}"/${P}-pdf-writer.patch )
DOCS=( fb.modes README Docs/USING-Framebuffer
Docs/ideas/{cache,css-engine,render-library}.txt )
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2016-03-02 23:00 Michael Weber
0 siblings, 0 replies; 8+ messages in thread
From: Michael Weber @ 2016-03-02 23:00 UTC (permalink / raw
To: gentoo-commits
commit: e3761da77db24d788c88e5669dadf9a1fa37a66b
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 22:57:45 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 23:00:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3761da7
Drop old, cleanup FILESDIR.
.../netsurf/files/netsurf-2.9-buildsystem.patch | 13 --
| 63 ---------
.../netsurf/files/netsurf-2.9-includes.patch | 10 --
www-client/netsurf/files/netsurf-3.0-CFLAGS.patch | 77 -----------
www-client/netsurf/files/netsurf-3.2-CFLAGS.patch | 77 -----------
.../netsurf/files/netsurf-3.2-glibc2.20.patch | 30 -----
.../netsurf/files/netsurf-3.2-pdf-writer.patch | 90 -------------
www-client/netsurf/netsurf-3.2-r1.ebuild | 141 ---------------------
8 files changed, 501 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 14c0070..0000000
--- 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 6520c76..0000000
--- 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 ca1a7c9..0000000
--- 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 065148b..0000000
--- 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 3d5b866..0000000
--- 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 b521aeb..0000000
--- 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 92179dc..0000000
--- 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)
diff --git a/www-client/netsurf/netsurf-3.2-r1.ebuild b/www-client/netsurf/netsurf-3.2-r1.ebuild
deleted file mode 100644
index 8737637..0000000
--- a/www-client/netsurf/netsurf-3.2-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.2
-inherit netsurf
-
-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
- http://xmw.de/mirror/netsurf-fb.modes-example.gz
- ${NETSURF_BUILDSYSTEM_SRC_URI}"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="+bmp fbcon truetype +gif gstreamer gtk javascript +jpeg +mng pdf-writer
- +png +rosprite +svg +svgtiny +webp fbcon_frontend_able fbcon_frontend_linux
- fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
-
-REQUIRED_USE="|| ( fbcon gtk )
- amd64? ( abi_x86_32? ( !javascript ) )
- fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
- fbcon_frontend_vnc fbcon_frontend_x ) )"
-
-RDEPEND="dev-libs/libxml2:2[${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- >=dev-libs/libcss-0.4.0[${MULTILIB_USEDEP}]
- >=net-libs/libhubbub-0.3.0-r1[${MULTILIB_USEDEP}]
- bmp? ( >=media-libs/libnsbmp-0.1.1[${MULTILIB_USEDEP}] )
- fbcon? ( >=dev-libs/libnsfb-0.1.2[${MULTILIB_USEDEP}]
- truetype? ( media-fonts/dejavu
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- )
- gif? ( >=media-libs/libnsgif-0.1.1[${MULTILIB_USEDEP}] )
- gtk? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- gnome-base/libglade:2.0[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
- gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
- javascript? ( >=dev-libs/nsgenbind-0.1.1[${MULTILIB_USEDEP}]
- dev-lang/spidermonkey:0= )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
- pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
- svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.2[${MULTILIB_USEDEP}] )
- !svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
- webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- rosprite? ( >=media-libs/librosprite-0.1.1[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
- "${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.patch
- "${FILESDIR}"/${P}-conditionally-include-image-headers.patch
- "${FILESDIR}"/${P}-glibc2.20.patch
- "${FILESDIR}"/${P}-pdf-writer.patch )
-DOCS=( fb.modes README Docs/USING-Framebuffer
- Docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
- rm -rf amiga atari beos cocoa monkey riscos windows || die
-
- mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
-
- sed -e 's:-DG_DISABLE_DEPRECATED::' \
- -i gtk/Makefile.target || die
-
- netsurf_src_prepare
-}
-
-src_configure() {
- netsurf_src_configure
-
- netsurf_makeconf+=(
- 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_PNG=$(usex png YES NO)
- NETSURF_USE_MNG=$(usex mng YES NO)
- NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_VIDEO=$(usex gstreamer YES NO)
- NETSURF_USE_MOZJS=$(usex javascript YES NO)
- NETSURF_USE_JS=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)
- $(usex fbcon_frontend_able NETSURF_FB_FRONTEND=able "")
- $(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
- $(usex fbcon_frontend_sdl NETSURF_FB_FRONTEND=sdl "")
- $(usex fbcon_frontend_vnc NETSURF_FB_FRONTEND=vnc "")
- $(usex fbcon_frontend_x NETSURF_FB_FRONTEND=x "")
- NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
- TARGET=dummy
- )
-}
-
-src_compile() {
- if use fbcon ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
- netsurf_src_compile
- fi
- if use gtk ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
- netsurf_src_compile
- fi
-}
-
-src_install() {
- sed -e '1iexit;' \
- -i "${WORKDIR}"/*/utils/git-testament.pl || die
-
- if use fbcon ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
- netsurf_src_install
- elog "framebuffer binary has been installed as netsurf-fb"
- mv -v "${ED}"usr/bin/netsurf{,-fb} || die
- make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
-
- elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
- elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
- elog "Please make /dev/input/mice readable to the account using netsurf-fb."
- elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
- fi
- if use gtk ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
- netsurf_src_install
- elog "netsurf gtk version has been installed as netsurf-gtk"
- mv -v "${ED}"/usr/bin/netsurf{,-gtk} || die
- make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
- fi
-
- insinto /usr/share/pixmaps
- doins gtk/res/netsurf.xpm
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2017-01-24 1:16 Michael Weber
0 siblings, 0 replies; 8+ messages in thread
From: Michael Weber @ 2017-01-24 1:16 UTC (permalink / raw
To: gentoo-commits
commit: f82babb8c1793c61fcb41f56bdb05fc0f3b329da
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 01:14:59 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 01:16:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82babb8
www-client/netsurf: Version bump (bug 602526, thanks Philipp Ammann), add support for GTK3, fix librosprite RDEPEND (bug 604128, thanks Another Mortal).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-client/netsurf/Manifest | 1 +
www-client/netsurf/files/netsurf-3.6-CFLAGS.patch | 67 +++++++++
| 31 +++++
.../netsurf/files/netsurf-3.6-pdf-writer.patch | 80 +++++++++++
www-client/netsurf/metadata.xml | 4 +
www-client/netsurf/netsurf-3.6.ebuild | 153 +++++++++++++++++++++
6 files changed, 336 insertions(+)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index b5fe305..a2c77ca 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,4 +1,5 @@
DIST netsurf-3.4-src.tar.gz 4133201 SHA256 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6 SHA512 d9f95ff88d572a36e906bdb25dddbb51aa683a2105ca9eff53ea61c154a34a888420811f8a2b58a1b5a10f77d8aa914e3201b937934243527edb8a897f7bd60e WHIRLPOOL 1c8e3d6ac8a1ecd7bfa2554d56bd6e6cbd6c025112110f596a1db551d3b18029ee2761ddb288cdbc0cd517a90a54081d9d8aca3399339160addb2aedce14a55b
DIST netsurf-3.5-src.tar.gz 4094532 SHA256 98f3a66d3ae24ab34becdab2ea690f8f20c0f49f86723f133ede6df57e451dcc SHA512 0bbb64d7dfbe105a0c9ace6f17655feef1b63ed8ae1ceaca647d0fce828cef27f4871949351694b5836f0bbc0b2614a3671235a1682b0810b9194cd89a68659a WHIRLPOOL 2c0d7cc6096607105da5049e46ea9c08ba3b20fdf1992853a2a85c78e0937bfb8d5b9a5f55751ea18f46d68e64bd13d24f7a13d7d7d52a63796df62e217a7c3c
+DIST netsurf-3.6-src.tar.gz 4129091 SHA256 59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d WHIRLPOOL 20776d928a60a8da5d1871d2ce1e15af7853a07e3ec995135019bbf579f1b0dde0918f960fe2c51546c6a08b218f9e4143fae5777f52203f831f877382b94740
DIST netsurf-buildsystem-1.5.tar.gz 38196 SHA256 dbc6afc639f6987b704e6ff4427668787ee7efba77e1bbf76b614699b5daaf71 SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4 WHIRLPOOL 7b7d595a2e399b361e71769e509a129af42da5ce823f1b55183efb53898ac2ae731593eb13e1ecc2271ea26ee0948ac35bf99fea280eb72a2bb00164b4b29f09
DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767
diff --git a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
new file mode 100644
index 00000000..8004aa4
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
@@ -0,0 +1,67 @@
+--- 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 \
--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
new file mode 100644
index 00000000..0675446
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
@@ -0,0 +1,31 @@
+--- 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.6-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
new file mode 100644
index 00000000..5824adc
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
@@ -0,0 +1,80 @@
+--- netsurf-3.6/desktop/font_haru.c
++++ netsurf-3.6/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"
+
+--- netsurf-3.6/desktop/save_pdf.c
++++ netsurf-3.6/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"
+@@ -450,11 +452,6 @@
+
+ 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.
+
+@@ -700,7 +697,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 +771,7 @@
+ 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
+@@ -789,7 +786,7 @@
+ {
+ 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);
+--- netsurf-3.6/frontends/gtk/scaffolding.c
++++ netsurf-3.6/frontends/gtk/scaffolding.c
+@@ -731,14 +731,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/metadata.xml b/www-client/netsurf/metadata.xml
index 7d16da3..e53232c 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -19,6 +19,10 @@
<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>
<flag name="webp">WebP image support (media-libs/libwebp)</flag>
+ <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
+ <flag name="gtk">Build GTK GUI, defaults to GTK3</flag>
+ <flag name="gtk2">Build GTK2 GUI</flag>
+ <flag name="gtk3">Build GTK3 GUI</flag>
<flag name="duktape">Use duktape.org javascript engine</flag>
</use>
<longdescription lang="en">
diff --git a/www-client/netsurf/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.6.ebuild
new file mode 100644
index 00000000..1d709ec
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.6.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.5
+inherit netsurf
+
+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
+ http://xmw.de/mirror/netsurf-fb.modes-example.gz
+ ${NETSURF_BUILDSYSTEM_SRC_URI}"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE="+bmp +duktape fbcon truetype +gif gstreamer gtk gtk2 gtk3 +javascript +jpeg +mng
+ pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able
+ fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
+ amd64? ( abi_x86_32? ( javascript? ( duktape ) ) )
+ fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
+ fbcon_frontend_vnc fbcon_frontend_x ) )
+ duktape? ( javascript )"
+
+RDEPEND=">=dev-libs/libnsutils-0.0.2[${MULTILIB_USEDEP}]
+ >=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ >=dev-libs/libcss-0.6.0[${MULTILIB_USEDEP}]
+ >=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
+ >=net-libs/libdom-0.3.0[${MULTILIB_USEDEP}]
+ bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
+ fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
+ truetype? ( media-fonts/dejavu
+ >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+ )
+ gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
+ gtk2? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+ gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+ gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+ gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
+ javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
+ !duktape? ( dev-lang/spidermonkey:0= ) )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+ pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
+ rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )
+ svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
+ !svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
+ webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ dev-libs/check[${MULTILIB_USEDEP}]
+ dev-perl/HTML-Parser"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.6-CFLAGS.patch
+ "${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
+ "${FILESDIR}"/${PN}-3.6-pdf-writer.patch )
+DOCS=( fb.modes README Docs/USING-Framebuffer
+ Docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+ rm -r frontends/{amiga,atari,beos,cocoa,monkey,riscos,windows} || die
+
+ mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
+
+ netsurf_src_prepare
+}
+
+src_configure() {
+ netsurf_src_configure
+
+ netsurf_makeconf+=(
+ 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_VIDEO=$(usex gstreamer 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)
+ $(usex fbcon_frontend_able NETSURF_FB_FRONTEND=able "")
+ $(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
+ $(usex fbcon_frontend_sdl NETSURF_FB_FRONTEND=sdl "")
+ $(usex fbcon_frontend_vnc NETSURF_FB_FRONTEND=vnc "")
+ $(usex fbcon_frontend_x NETSURF_FB_FRONTEND=x "")
+ NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+ NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
+ TARGET=dummy
+ )
+}
+
+src_compile() {
+ if use fbcon ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+ netsurf_src_compile
+ fi
+ if use gtk2 ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+ netsurf_src_compile
+ fi
+ if use gtk3 || use gtk ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+ netsurf_src_compile
+ fi
+}
+
+src_install() {
+ sed -e '1iexit;' \
+ -i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+ if use fbcon ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+ netsurf_src_install
+ elog "framebuffer binary has been installed as netsurf-fb"
+ make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+ elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+ elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+ elog "Please make /dev/input/mice readable to the account using netsurf-fb."
+ elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
+ fi
+ if use gtk2 ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+ netsurf_src_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 gtk3 || use gtk ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+ netsurf_src_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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2017-01-31 0:47 Michael Weber
0 siblings, 0 replies; 8+ messages in thread
From: Michael Weber @ 2017-01-31 0:47 UTC (permalink / raw
To: gentoo-commits
commit: 5eaa2e2b3465597a97aee855fbf5c97e3209d0f8
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 00:47:10 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 00:47:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eaa2e2b
www-client/netsurf: Fix USE=gstreamer (bug 607650, thanks ernsteiswuerfel), limit NETSURF_USE_VIDEO to gtk/gtk3 versions.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../netsurf/files/netsurf-3.6-gstreamer.patch | 31 ++++++++++++++++++++++
www-client/netsurf/netsurf-3.6.ebuild | 11 ++++++--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
new file mode 100644
index 00000000..6aca4f6
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
@@ -0,0 +1,31 @@
+--- 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/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.6.ebuild
index 8de3bdb..5d075be 100644
--- a/www-client/netsurf/netsurf-3.6.ebuild
+++ b/www-client/netsurf/netsurf-3.6.ebuild
@@ -64,7 +64,8 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}"/${PN}-3.6-CFLAGS.patch
"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
- "${FILESDIR}"/${PN}-3.6-pdf-writer.patch )
+ "${FILESDIR}"/${PN}-3.6-pdf-writer.patch
+ "${FILESDIR}"/${PN}-3.6-gstreamer.patch )
DOCS=( fb.modes README Docs/USING-Framebuffer
Docs/ideas/{cache,css-engine,render-library}.txt )
@@ -87,7 +88,6 @@ src_configure() {
NETSURF_USE_NSPSL=$(usex psl YES NO)
NETSURF_USE_MNG=$(usex mng YES NO)
NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_VIDEO=$(usex gstreamer 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)
@@ -104,20 +104,24 @@ src_configure() {
NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
TARGET=dummy
+ NETSURF_USE_VIDEO=dummy
)
}
src_compile() {
if use fbcon ; then
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
netsurf_src_compile
fi
if use gtk2 ; then
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
netsurf_src_compile
fi
if use gtk3 || use gtk ; then
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
netsurf_src_compile
fi
}
@@ -128,6 +132,7 @@ src_install() {
if use fbcon ; then
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
netsurf_src_install
elog "framebuffer binary has been installed as netsurf-fb"
make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
@@ -138,12 +143,14 @@ src_install() {
fi
if use gtk2 ; then
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
netsurf_src_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 gtk3 || use gtk ; then
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" )
netsurf_src_install
elog "netsurf gtk3 version has been installed as netsurf-gtk3"
make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2017-02-05 12:18 Michael Weber
0 siblings, 0 replies; 8+ messages in thread
From: Michael Weber @ 2017-02-05 12:18 UTC (permalink / raw
To: gentoo-commits
commit: d7806bc77176c8ff9793994d7473abd32019b14c
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 09:46:57 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 12:17:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7806bc7
www-client/netsurf: Remove old verion(s).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
www-client/netsurf/Manifest | 2 -
.../netsurf/files/netsurf-3.3-pdf-writer.patch | 85 -----------
www-client/netsurf/files/netsurf-3.4-CFLAGS.patch | 71 ---------
| 49 -------
.../files/netsurf-3.4-framebuffer-pkgconfig.patch | 30 ----
www-client/netsurf/netsurf-3.4.ebuild | 162 ---------------------
www-client/netsurf/netsurf-3.5.ebuild | 162 ---------------------
7 files changed, 561 deletions(-)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index a2c77ca..2b78706 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,5 +1,3 @@
-DIST netsurf-3.4-src.tar.gz 4133201 SHA256 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6 SHA512 d9f95ff88d572a36e906bdb25dddbb51aa683a2105ca9eff53ea61c154a34a888420811f8a2b58a1b5a10f77d8aa914e3201b937934243527edb8a897f7bd60e WHIRLPOOL 1c8e3d6ac8a1ecd7bfa2554d56bd6e6cbd6c025112110f596a1db551d3b18029ee2761ddb288cdbc0cd517a90a54081d9d8aca3399339160addb2aedce14a55b
-DIST netsurf-3.5-src.tar.gz 4094532 SHA256 98f3a66d3ae24ab34becdab2ea690f8f20c0f49f86723f133ede6df57e451dcc SHA512 0bbb64d7dfbe105a0c9ace6f17655feef1b63ed8ae1ceaca647d0fce828cef27f4871949351694b5836f0bbc0b2614a3671235a1682b0810b9194cd89a68659a WHIRLPOOL 2c0d7cc6096607105da5049e46ea9c08ba3b20fdf1992853a2a85c78e0937bfb8d5b9a5f55751ea18f46d68e64bd13d24f7a13d7d7d52a63796df62e217a7c3c
DIST netsurf-3.6-src.tar.gz 4129091 SHA256 59ae4b50eff9e2a00a0a9742ef546c7de17223139c485af9644f195340979a9c SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d WHIRLPOOL 20776d928a60a8da5d1871d2ce1e15af7853a07e3ec995135019bbf579f1b0dde0918f960fe2c51546c6a08b218f9e4143fae5777f52203f831f877382b94740
DIST netsurf-buildsystem-1.5.tar.gz 38196 SHA256 dbc6afc639f6987b704e6ff4427668787ee7efba77e1bbf76b614699b5daaf71 SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4 WHIRLPOOL 7b7d595a2e399b361e71769e509a129af42da5ce823f1b55183efb53898ac2ae731593eb13e1ecc2271ea26ee0948ac35bf99fea280eb72a2bb00164b4b29f09
DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767
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 e2c709e..00000000
--- 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 2dc8a14..00000000
--- 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 e78d71c..00000000
--- 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 31aaa0a..00000000
--- 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))
-
diff --git a/www-client/netsurf/netsurf-3.4.ebuild b/www-client/netsurf/netsurf-3.4.ebuild
deleted file mode 100644
index 5eda2d9..00000000
--- a/www-client/netsurf/netsurf-3.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-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
- http://xmw.de/mirror/netsurf-fb.modes-example.gz
- ${NETSURF_BUILDSYSTEM_SRC_URI}"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="+bmp +duktape fbcon truetype +gif gstreamer gtk +javascript +jpeg +mng
- pdf-writer +png +rosprite +svg +svgtiny +webp fbcon_frontend_able
- fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
-
-REQUIRED_USE="|| ( fbcon gtk )
- amd64? ( abi_x86_32? ( javascript? ( duktape ) ) )
- fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
- fbcon_frontend_vnc fbcon_frontend_x ) )
- duktape? ( javascript )"
-
-RDEPEND=">=dev-libs/libnsutils-0.0.2[${MULTILIB_USEDEP}]
- >=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2:2[${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- >=dev-libs/libcss-0.6.0[${MULTILIB_USEDEP}]
- >=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
- >=net-libs/libdom-0.3.0[${MULTILIB_USEDEP}]
- bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
- fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
- truetype? ( media-fonts/dejavu
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- )
- gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
- gtk? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- gnome-base/libglade:2.0[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
- gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
- javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
- !duktape? ( dev-lang/spidermonkey:0= ) )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
- pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
- svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
- !svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
- webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- dev-libs/check[${MULTILIB_USEDEP}]
- dev-perl/HTML-Parser
- rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
- "${FILESDIR}"/${P}-framebuffer-pkgconfig.patch
- "${FILESDIR}"/${P}-conditionally-include-image-headers.patch
- "${FILESDIR}"/${PN}-3.3-pdf-writer.patch )
-DOCS=( fb.modes README Docs/USING-Framebuffer
- Docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
- rm -rf amiga atari beos cocoa monkey riscos windows || die
-
- mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
-
- sed -e 's:-DG_DISABLE_DEPRECATED::' \
- -i gtk/Makefile.target || die
-
- netsurf_src_prepare
-}
-
-src_configure() {
- netsurf_src_configure
-
- netsurf_makeconf+=(
- 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_PNG=$(usex png YES NO)
- NETSURF_USE_MNG=$(usex mng YES NO)
- NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_VIDEO=$(usex gstreamer 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)
- $(usex fbcon_frontend_able NETSURF_FB_FRONTEND=able "")
- $(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
- $(usex fbcon_frontend_sdl NETSURF_FB_FRONTEND=sdl "")
- $(usex fbcon_frontend_vnc NETSURF_FB_FRONTEND=vnc "")
- $(usex fbcon_frontend_x NETSURF_FB_FRONTEND=x "")
- NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
- TARGET=dummy
- )
-}
-
-src_compile() {
- if use fbcon ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
- netsurf_src_compile
- fi
- if use gtk ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
- netsurf_src_compile
- fi
-}
-
-src_install() {
- sed -e '1iexit;' \
- -i "${WORKDIR}"/*/utils/git-testament.pl || die
-
- if use fbcon ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
- netsurf_src_install
- elog "framebuffer binary has been installed as netsurf-fb"
- pushd "${ED}"usr/bin >/dev/null || die
- eshopts_push -s nullglob
- # bug 552562
- local binaries=(netsurf{,.*})
- eshopts_pop
- for f in "${binaries[@]}" ; do
- mv -v $f ${f/netsurf/netsurf-fb} || die
- make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-fb} NetSurf-framebuffer${f/netsurf} netsurf "Network;WebBrowser"
- done
- popd >/dev/null || die
- elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
- elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
- elog "Please make /dev/input/mice readable to the account using netsurf-fb."
- elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
- fi
- if use gtk ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
- netsurf_src_install
- elog "netsurf gtk version has been installed as netsurf-gtk"
- pushd "${ED}"usr/bin >/dev/null || die
- eshopts_push -s nullglob
- # bug 552562
- local binaries=(netsurf{,.*})
- eshopts_pop
- for f in "${binaries[@]}" ; do
- mv -v $f ${f/netsurf/netsurf-gtk} || die
- make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-gtk} NetSurf-gtk${f/netsurf} netsurf "Network;WebBrowser"
- done
- popd >/dev/null || die
- fi
-
- insinto /usr/share/pixmaps
- doins gtk/res/netsurf.xpm
-}
diff --git a/www-client/netsurf/netsurf-3.5.ebuild b/www-client/netsurf/netsurf-3.5.ebuild
deleted file mode 100644
index aa99c97..00000000
--- a/www-client/netsurf/netsurf-3.5.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-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
- http://xmw.de/mirror/netsurf-fb.modes-example.gz
- ${NETSURF_BUILDSYSTEM_SRC_URI}"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE="+bmp +duktape fbcon truetype +gif gstreamer gtk +javascript +jpeg +mng
- pdf-writer +png +rosprite +svg +svgtiny +webp fbcon_frontend_able
- fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
-
-REQUIRED_USE="|| ( fbcon gtk )
- amd64? ( abi_x86_32? ( javascript? ( duktape ) ) )
- fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
- fbcon_frontend_vnc fbcon_frontend_x ) )
- duktape? ( javascript )"
-
-RDEPEND=">=dev-libs/libnsutils-0.0.2[${MULTILIB_USEDEP}]
- >=dev-libs/libutf8proc-1.1.6-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2:2[${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- >=dev-libs/libcss-0.6.0[${MULTILIB_USEDEP}]
- >=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
- >=net-libs/libdom-0.3.0[${MULTILIB_USEDEP}]
- bmp? ( >=media-libs/libnsbmp-0.1.2-r1[${MULTILIB_USEDEP}] )
- fbcon? ( >=dev-libs/libnsfb-0.1.3-r1[${MULTILIB_USEDEP}]
- truetype? ( media-fonts/dejavu
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- )
- gif? ( >=media-libs/libnsgif-0.1.2-r1[${MULTILIB_USEDEP}] )
- gtk? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- gnome-base/libglade:2.0[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
- gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] )
- javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
- !duktape? ( dev-lang/spidermonkey:0= ) )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
- pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
- svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
- !svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
- webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- dev-libs/check[${MULTILIB_USEDEP}]
- dev-perl/HTML-Parser
- rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4-CFLAGS.patch
- "${FILESDIR}"/${PN}-3.4-framebuffer-pkgconfig.patch
- "${FILESDIR}"/${PN}-3.4-conditionally-include-image-headers.patch
- "${FILESDIR}"/${PN}-3.3-pdf-writer.patch )
-DOCS=( fb.modes README Docs/USING-Framebuffer
- Docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
- rm -rf amiga atari beos cocoa monkey riscos windows || die
-
- mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
-
- sed -e 's:-DG_DISABLE_DEPRECATED::' \
- -i gtk/Makefile.target || die
-
- netsurf_src_prepare
-}
-
-src_configure() {
- netsurf_src_configure
-
- netsurf_makeconf+=(
- 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_PNG=$(usex png YES NO)
- NETSURF_USE_MNG=$(usex mng YES NO)
- NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_VIDEO=$(usex gstreamer 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)
- $(usex fbcon_frontend_able NETSURF_FB_FRONTEND=able "")
- $(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
- $(usex fbcon_frontend_sdl NETSURF_FB_FRONTEND=sdl "")
- $(usex fbcon_frontend_vnc NETSURF_FB_FRONTEND=vnc "")
- $(usex fbcon_frontend_x NETSURF_FB_FRONTEND=x "")
- NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
- TARGET=dummy
- )
-}
-
-src_compile() {
- if use fbcon ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
- netsurf_src_compile
- fi
- if use gtk ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
- netsurf_src_compile
- fi
-}
-
-src_install() {
- sed -e '1iexit;' \
- -i "${WORKDIR}"/*/utils/git-testament.pl || die
-
- if use fbcon ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
- netsurf_src_install
- elog "framebuffer binary has been installed as netsurf-fb"
- pushd "${ED}"usr/bin >/dev/null || die
- eshopts_push -s nullglob
- # bug 552562
- local binaries=(netsurf{,.*})
- eshopts_pop
- for f in "${binaries[@]}" ; do
- mv -v $f ${f/netsurf/netsurf-fb} || die
- make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-fb} NetSurf-framebuffer${f/netsurf} netsurf "Network;WebBrowser"
- done
- popd >/dev/null || die
- elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
- elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
- elog "Please make /dev/input/mice readable to the account using netsurf-fb."
- elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
- fi
- if use gtk ; then
- netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
- netsurf_src_install
- elog "netsurf gtk version has been installed as netsurf-gtk"
- pushd "${ED}"usr/bin >/dev/null || die
- eshopts_push -s nullglob
- # bug 552562
- local binaries=(netsurf{,.*})
- eshopts_pop
- for f in "${binaries[@]}" ; do
- mv -v $f ${f/netsurf/netsurf-gtk} || die
- make_desktop_entry "${EROOT}"usr/bin/${f/netsurf/netsurf-gtk} NetSurf-gtk${f/netsurf} netsurf "Network;WebBrowser"
- done
- popd >/dev/null || die
- fi
-
- insinto /usr/share/pixmaps
- doins gtk/res/netsurf.xpm
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2018-10-21 20:54 Virgil Dupras
0 siblings, 0 replies; 8+ messages in thread
From: Virgil Dupras @ 2018-10-21 20:54 UTC (permalink / raw
To: gentoo-commits
commit: b5b300aad5b4c95789c941d23b528de6f7bb89e7
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 21 20:46:40 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sun Oct 21 20:52:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b300aa
www-client/netsurf: bump to 3.8
I had to drop gstreamer because it depends on a vulnerable version.
Closes: https://bugs.gentoo.org/636224
Closes: https://bugs.gentoo.org/662230
Closes: https://bugs.gentoo.org/629204
Closes: https://bugs.gentoo.org/641846
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
www-client/netsurf/Manifest | 2 +
www-client/netsurf/files/netsurf-3.8-CFLAGS.patch | 79 ++++++++++
.../netsurf/files/netsurf-3.8-pdf-writer.patch | 86 +++++++++++
www-client/netsurf/netsurf-3.8.ebuild | 163 +++++++++++++++++++++
4 files changed, 330 insertions(+)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 4a7b2ef7309..370d0b8b4b7 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,3 +1,5 @@
DIST netsurf-3.6-src.tar.gz 4129091 BLAKE2B d6b08069e34a8fd4f2010c6b3efbde9d7b13e40d3f3fdceeee92eb9d2bbeb92fac6f0a1ca9ac263ebc1904ad04a42c97a6418da7e095d18eda3be952129ac718 SHA512 6141cd94b2b6c8e56f682599e4929690f6ca668d1f6ff20bad93e30cf3a3b27475146f2b3c9dbc9f1b2e44b729d74c346254959b7def1f8d194e1c6efac3078d
+DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
DIST netsurf-fb.modes-example.gz 4586 BLAKE2B 89c76fde1ddc79e46f22d9f628f8d75ec57be2a29d31383550137e3b502aa4d8c0a733b755731c916d4d544679a4253323bc343528c5e2c4f145c3318ac1d86d SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981
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 00000000000..c52422dcb92
--- /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.8-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
new file mode 100644
index 00000000000..e9c2420a33f
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
@@ -0,0 +1,86 @@
+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/netsurf-3.8.ebuild b/www-client/netsurf/netsurf-3.8.ebuild
new file mode 100644
index 00000000000..5722a925d81
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.8.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NETSURF_COMPONENT_TYPE=binary
+NETSURF_BUILDSYSTEM=buildsystem-1.7
+inherit netsurf
+
+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
+ http://xmw.de/mirror/netsurf-fb.modes-example.gz
+ ${NETSURF_BUILDSYSTEM_SRC_URI}"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 gtk3 +javascript +jpeg +mng
+ pdf-writer +png +psl +rosprite +svg +svgtiny +webp fbcon_frontend_able
+ fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 gtk3 )
+ amd64? ( abi_x86_32? ( javascript? ( duktape ) ) )
+ fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl
+ fbcon_frontend_vnc fbcon_frontend_x ) )
+ duktape? ( javascript )"
+
+RDEPEND=">=dev-libs/libnsutils-0.0.5[${MULTILIB_USEDEP}]
+ >=dev-libs/libutf8proc-2.2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ >=dev-libs/libcss-0.8[${MULTILIB_USEDEP}]
+ >=net-libs/libhubbub-0.3[${MULTILIB_USEDEP}]
+ >=net-libs/libdom-0.3[${MULTILIB_USEDEP}]
+ bmp? ( >=media-libs/libnsbmp-0.1[${MULTILIB_USEDEP}] )
+ fbcon? ( >=dev-libs/libnsfb-0.2[${MULTILIB_USEDEP}]
+ truetype? ( media-fonts/dejavu
+ >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+ )
+ gif? ( >=media-libs/libnsgif-0.1[${MULTILIB_USEDEP}] )
+ gtk2? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+ gtk3? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+ gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
+ javascript? ( >=dev-libs/nsgenbind-0.3[${MULTILIB_USEDEP}]
+ !duktape? ( dev-lang/spidermonkey:0= ) )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ mng? ( >=media-libs/libmng-1.0.10-r2[${MULTILIB_USEDEP}] )
+ pdf-writer? ( media-libs/libharu[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.2.51:0[${MULTILIB_USEDEP}] )
+ psl? ( media-libs/libnspsl[${MULTILIB_USEDEP}] )
+ rosprite? ( >=media-libs/librosprite-0.1.2-r1[${MULTILIB_USEDEP}] )
+ svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1[${MULTILIB_USEDEP}] )
+ !svgtiny? ( gnome-base/librsvg:2[${MULTILIB_USEDEP}] ) )
+ webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ dev-libs/check[${MULTILIB_USEDEP}]
+ dev-perl/HTML-Parser"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.8-CFLAGS.patch
+ "${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
+ "${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+)
+
+DOCS=( fb.modes README docs/using-framebuffer.md
+ docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+ # working around broken netsurf eclass
+ default
+ rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
+
+ mv "${WORKDIR}"/netsurf-fb.modes-example fb.modes
+
+ multilib_copy_sources
+}
+
+src_configure() {
+ netsurf_src_configure
+
+ netsurf_makeconf+=(
+ 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)
+ $(usex fbcon_frontend_able NETSURF_FB_FRONTEND=able "")
+ $(usex fbcon_frontend_linux NETSURF_FB_FRONTEND=linux "")
+ $(usex fbcon_frontend_sdl NETSURF_FB_FRONTEND=sdl "")
+ $(usex fbcon_frontend_vnc NETSURF_FB_FRONTEND=vnc "")
+ $(usex fbcon_frontend_x NETSURF_FB_FRONTEND=x "")
+ NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+ NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu
+ TARGET=dummy
+ NETSURF_USE_VIDEO=dummy
+ )
+}
+
+src_compile() {
+ if use fbcon ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+ netsurf_src_compile
+ fi
+ if use gtk2 ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+ netsurf_src_compile
+ fi
+ if use gtk3 || use gtk ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+ netsurf_src_compile
+ fi
+}
+
+src_install() {
+ sed -e '1iexit;' \
+ -i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+ if use fbcon ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+ netsurf_src_install
+ elog "framebuffer binary has been installed as netsurf-fb"
+ make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+ elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+ elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+ elog "Please make /dev/input/mice readable to the account using netsurf-fb."
+ elog "Either use chmod a+r /dev/input/mice (security!!!) or use an group."
+ fi
+ if use gtk2 ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+ netsurf_src_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 gtk3 || use gtk ; then
+ netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" )
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" )
+ netsurf_src_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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/
@ 2024-01-19 9:31 Michael Orlitzky
0 siblings, 0 replies; 8+ messages in thread
From: Michael Orlitzky @ 2024-01-19 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 982f8d1c3f144456489283e3590440823edfb44f
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 07:59:54 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 09:29:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982f8d1c
www-client/netsurf: drop 3.10-r7
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
www-client/netsurf/Manifest | 1 -
.../files/netsurf-3.10-gcc10-fno-common.patch | 23 ----
| 35 -----
www-client/netsurf/netsurf-3.10-r7.ebuild | 150 ---------------------
4 files changed, 209 deletions(-)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 721779486c91..13e202c250a1 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,2 +1 @@
-DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
DIST netsurf-3.11-src.tar.gz 4311767 BLAKE2B aa361b44ddb90fe513e0c34ae7d5f320037c439abb2455f50c224db118cf51da8bbeeac1276f0afdb5763287a6ffaba9d8fad460718ab0659871c1fda143513a SHA512 852ed7afe891828e7e594f1906ed5a7af9c62511b61dbe37ff1ca0700e3b08151db952ad47a18f9c8cfd3f6d78fd93485aa8e39de08eca904f5dbfa747af90c3
diff --git a/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch b/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch
deleted file mode 100644
index 677004c51750..000000000000
--- a/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Backport of upstream fix: https://git.netsurf-browser.org/netsurf.git/commit/?id=434f6c3fe7d1d2c6a3e6ae6338608a4a4421ab1b
-
-https://bugs.netsurf-browser.org/mantis/view.php?id=2778
-https://bugs.gentoo.org/835379
---- a/frontends/framebuffer/convert_font.c
-+++ b/frontends/framebuffer/convert_font.c
-@@ -290,14 +290,14 @@ bool generate_font_header(const char *path, struct font_data *data)
-
-
- for (s = 0; s < 4; s++) {
-- fprintf(fp, "const uint8_t *%s_section_table;\n",
-+ fprintf(fp, "extern const uint8_t *%s_section_table;\n",
- var_lables[s]);
-- fprintf(fp, "const uint16_t *%s_sections;\n",
-+ fprintf(fp, "extern const uint16_t *%s_sections;\n",
- var_lables[s]);
-
- }
-
-- fprintf(fp, "const uint8_t *font_glyph_data;\n");
-+ fprintf(fp, "extern const uint8_t *font_glyph_data;\n");
-
- fprintf(fp, "\n\n");
diff --git a/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch
deleted file mode 100644
index 603c20913da3..000000000000
--- a/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -rup a/content/handlers/image/image.c b/content/handlers/image/image.c
---- a/content/handlers/image/image.c 2019-07-17 10:28:13.000000000 +0000
-+++ b/content/handlers/image/image.c 2019-09-27 15:09:03.860000000 +0000
-@@ -27,15 +27,31 @@
- #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
-+#ifdef WITH_WEBP
- #include "image/webp.h"
-+#endif
- #include "image/image.h"
-
- /**
diff --git a/www-client/netsurf/netsurf-3.10-r7.ebuild b/www-client/netsurf/netsurf-3.10-r7.ebuild
deleted file mode 100644
index 608f2ffaadd7..000000000000
--- a/www-client/netsurf/netsurf-3.10-r7.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop netsurf toolchain-funcs
-
-DESCRIPTION="A free, open source web browser"
-HOMEPAGE="https://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 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="bmp fbcon truetype +gif +gtk +javascript +jpeg
- +png +psl rosprite +svg +svgtiny +webp"
-
-REQUIRED_USE="|| ( fbcon gtk )"
-
-RDEPEND="
- dev-libs/libcss
- dev-libs/libnsutils
- dev-libs/openssl:=
- dev-libs/libutf8proc
- dev-libs/libxml2:2
- net-misc/curl
- net-libs/libdom
- net-libs/libhubbub
- bmp? ( media-libs/libnsbmp )
- fbcon? (
- dev-libs/libnsfb
- truetype? (
- media-fonts/dejavu
- media-libs/freetype
- )
- )
- gif? ( media-libs/libnsgif )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:3
- )
- javascript? (
- dev-libs/nsgenbind
- dev-lang/duktape:=
- )
- jpeg? ( media-libs/libjpeg-turbo:= )
- png? ( media-libs/libpng:0= )
- psl? ( media-libs/libnspsl )
- rosprite? ( media-libs/librosprite )
- svg? (
- svgtiny? ( media-libs/libsvgtiny )
- !svgtiny? ( gnome-base/librsvg:2 )
- )
- webp? ( media-libs/libwebp )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-libs/check
- dev-perl/HTML-Parser
- dev-build/netsurf-buildsystem
- virtual/pkgconfig
- javascript? ( app-editors/vim-core )
-"
-
-PATCHES=(
- "${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"
- "${FILESDIR}/${PN}-3.10-gcc10-fno-common.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() {
- netsurf_define_makeconf
- local netsurf_makeconf=(
- "${NETSURF_MAKECONF[@]}"
- COMPONENT_TYPE=binary
- NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
- NETSURF_USE_BMP=$(usex bmp YES NO)
- NETSURF_USE_DUKTAPE=$(usex javascript 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_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
- NETSURF_USE_OPENSSL=YES
- NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
- NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
- NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_VIDEO=NO
- PKG_CONFIG=$(tc-getPKG_CONFIG)
- )
-
- emake "${netsurf_makeconf[@]}" $@
-}
-
-src_compile() {
- # The build system only runs pkg-config to find librsvg's include
- # dir for the gtk targets. So if you try to build the framebuffer
- # target with NETSURF_USE_RSVG=YES, the build crashes on failing to
- # find rsvg.h. To work around that, we set NETSURF_USE_RSVG=NO. It
- # might be possible to fall back to svgtiny with USE="svg -svgtiny"
- # if svgtiny works in a framebuffer, but then our (R)DEPEND would
- # need some mangling to ensure that svgtiny is installed.
- use fbcon && _emake NETSURF_USE_RSVG=NO TARGET=framebuffer
-
- 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
- # See earlier comments about rsvg.h.
- _emake NETSURF_USE_RSVG=NO TARGET=framebuffer DESTDIR="${D}" install
- elog "framebuffer binary has been installed as netsurf-fb"
- make_desktop_entry "${EPREFIX}/usr/bin/netsurf-fb %u" \
- NetSurf-framebuffer \
- netsurf \
- "Network;WebBrowser"
- fi
- if use gtk ; then
- _emake TARGET=gtk3 DESTDIR="${D}" install
- elog "netsurf gtk3 version has been installed as netsurf-gtk3"
- make_desktop_entry "${EPREFIX}/usr/bin/netsurf-gtk3 %u" \
- NetSurf-gtk3 \
- netsurf \
- "Network;WebBrowser"
- fi
-
- insinto /usr/share/pixmaps
- doins frontends/gtk/res/netsurf.xpm
- doman docs/netsurf-fb.1
- doman docs/netsurf-gtk.1
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-01-19 9:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-19 9:31 [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/, www-client/netsurf/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2018-10-21 20:54 Virgil Dupras
2017-02-05 12:18 Michael Weber
2017-01-31 0:47 Michael Weber
2017-01-24 1:16 Michael Weber
2016-03-02 23:00 Michael Weber
2015-08-11 14:15 Michael Weber
2015-08-10 21:38 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox