* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/
@ 2019-12-04 14:49 Joonas Niilola
0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2019-12-04 14:49 UTC (permalink / raw
To: gentoo-commits
commit: be35c95e8d27d647bb4ffb36ca228bc9a351e13b
Author: Philipp Ammann <philipp.ammann <AT> posteo <DOT> de>
AuthorDate: Sun Oct 27 08:47:31 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Dec 4 14:48:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be35c95e
www-client/netsurf: bump to version 3.9
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Philipp Ammann <philipp.ammann <AT> posteo.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
www-client/netsurf/Manifest | 1 +
| 35 ++++++
www-client/netsurf/netsurf-3.9.ebuild | 130 +++++++++++++++++++++
3 files changed, 166 insertions(+)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 4e5081a0d75..3f36b3d0c86 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1 +1,2 @@
DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
+DIST netsurf-3.9-src.tar.gz 3989742 BLAKE2B a147a99bea00163147cb39b16ff8b7b874c58d386e60eb8aa568b3ce30e4957708c9720a5291a2aa37bc6d8d4bd0eaf4e2dc1a2bc2fff396cb4d972dd887e024 SHA512 061a1c6379b48582d842ed1ca6cea59b87cd84cd13769bdc32b623a56cebc69e94af9d65f4abd959608c98da9d0006f7842f875017569e6a3f7b77cbb928f24a
--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
new file mode 100644
index 00000000000..603c20913da
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.9-conditionally-include-image-headers.patch
@@ -0,0 +1,35 @@
+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.9.ebuild b/www-client/netsurf/netsurf-3.9.ebuild
new file mode 100644
index 00000000000..137876e9e5e
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.9.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs desktop
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
+ pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 )
+ duktape? ( javascript )"
+
+RDEPEND="
+ >=dev-libs/libcss-0.9
+ >=net-libs/libdom-0.3
+ >=net-libs/libhubbub-0.3
+ >=dev-libs/libnsutils-0.0.5
+ >=dev-libs/libutf8proc-2.2
+ dev-libs/libxml2:2
+ net-misc/curl
+ bmp? ( >=media-libs/libnsbmp-0.1 )
+ fbcon? ( >=dev-libs/libnsfb-0.2
+ truetype? ( media-fonts/dejavu
+ >=media-libs/freetype-2.5.0.1 )
+ )
+ gif? ( >=media-libs/libnsgif-0.1 )
+ gtk? ( dev-libs/glib:2
+ x11-libs/gtk+:3 )
+ gtk2? ( dev-libs/glib:2
+ x11-libs/gtk+:2 )
+ javascript? ( >=dev-libs/nsgenbind-0.6
+ !duktape? ( dev-lang/spidermonkey:0= ) )
+ jpeg? ( >=virtual/jpeg-0-r2:0 )
+ mng? ( >=media-libs/libmng-1.0.10-r2 )
+ pdf-writer? ( media-libs/libharu )
+ png? ( >=media-libs/libpng-1.2.51:0 )
+ psl? ( media-libs/libnspsl )
+ rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
+ svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
+ !svgtiny? ( gnome-base/librsvg:2 ) )
+ webp? ( >=media-libs/libwebp-0.3.0 )"
+BDEPEND="
+ dev-libs/check
+ dev-perl/HTML-Parser
+ >=dev-util/netsurf-buildsystem-1.7-r1"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.9-conditionally-include-image-headers.patch
+ "${FILESDIR}"/${PN}-3.8-pdf-writer.patch
+)
+
+DOCS=( README docs/using-framebuffer.md
+ docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+ default
+ rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
+}
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ local netsurf_makeconf=(
+ "${NETSURF_MAKECONF[@]}"
+ COMPONENT_TYPE=binary
+ NETSURF_USE_BMP=$(usex bmp YES NO)
+ NETSURF_USE_GIF=$(usex gif YES NO)
+ NETSURF_USE_JPEG=$(usex jpeg YES NO)
+ NETSURF_USE_PNG=$(usex png YES NO)
+ NETSURF_USE_NSPSL=$(usex psl YES NO)
+ NETSURF_USE_MNG=$(usex mng YES NO)
+ NETSURF_USE_WEBP=$(usex webp YES NO)
+ NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
+ NETSURF_USE_JS=NO
+ NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
+ NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
+ NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+ NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+ NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+ PKG_CONFIG=$(tc-getPKG_CONFIG)
+ NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+ NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
+ NETSURF_USE_VIDEO=NO
+ )
+ emake "${netsurf_makeconf[@]}" $@
+}
+
+src_compile() {
+ use fbcon && _emake TARGET=framebuffer
+ use gtk2 && _emake TARGET=gtk
+ use gtk && _emake TARGET=gtk3
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ sed -e '1iexit;' \
+ -i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+ if use fbcon ; then
+ _emake TARGET=framebuffer DESTDIR="${ED}" install
+ elog "framebuffer binary has been installed as netsurf-fb"
+ make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+ fi
+ if use gtk2 ; then
+ _emake TARGET=gtk DESTDIR="${ED}" install
+ elog "netsurf gtk2 version has been installed as netsurf-gtk"
+ make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+ fi
+ if use gtk ; then
+ _emake TARGET=gtk3 DESTDIR="${ED}" install
+ elog "netsurf gtk3 version has been installed as netsurf-gtk3"
+ make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
+ fi
+
+ insinto /usr/share/pixmaps
+ doins frontends/gtk/res/netsurf.xpm
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/
@ 2022-03-16 19:28 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-03-16 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 200f9dbf94b916f196fabdc523d56f5d7b8b32fa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 19:27:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 19:27:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200f9dbf
www-client/netsurf: fix build with GCC 10 (-fno-common)
Closes: https://bugs.gentoo.org/835379
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/netsurf-3.10-gcc10-fno-common.patch | 23 ++++++++++++++++++++++
www-client/netsurf/netsurf-3.10-r6.ebuild | 1 +
2 files changed, 24 insertions(+)
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
new file mode 100644
index 000000000000..677004c51750
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-gcc10-fno-common.patch
@@ -0,0 +1,23 @@
+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/netsurf-3.10-r6.ebuild b/www-client/netsurf/netsurf-3.10-r6.ebuild
index 4cab447b2f86..a6961c60d25c 100644
--- a/www-client/netsurf/netsurf-3.10-r6.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r6.ebuild
@@ -60,6 +60,7 @@ 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/
@ 2020-06-21 12:18 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2020-06-21 12:18 UTC (permalink / raw
To: gentoo-commits
commit: ca7819ae8a75cab9e401e3106415a6528cdd1f52
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 01:43:05 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 12:17:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7819ae
www-client/netsurf: new version 3.10.
This new version (bug 727882) combined with the removal of the old
versions fixes some outstanding issues:
* Fixes the mixup between ED/D (and EROOT, variously) throughout
the build system (bug 489542).
* Adds a dependency on dev-lang/duktape, but as a result, has to
drop keywords for arm, ppc, and ppc64 (bugs 698650, 728592).
* Adds a patch to fix the location of utf8proc.h (bug 721318)
* Adds a patch to disable failing tests (bug 687378).
* Drops the broken USE=pdf-writer flag (bug 625770).
* Apparently fixes the test failure with USE="-gtk2", since the
test suite now passes (bug 672812).
* Eliminates another test failure in v3.8 (bug 701322).
Bug: https://bugs.gentoo.org/489542
Closes: https://bugs.gentoo.org/625770
Closes: https://bugs.gentoo.org/672812
Closes: https://bugs.gentoo.org/687378
Closes: https://bugs.gentoo.org/698650
Closes: https://bugs.gentoo.org/701322
Closes: https://bugs.gentoo.org/721318
Closes: https://bugs.gentoo.org/727882
Bug: https://bugs.gentoo.org/728592
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
www-client/netsurf/Manifest | 1 +
.../files/netsurf-3.10-disable-failing-tests.patch | 42 +++++++
| 34 ++++++
www-client/netsurf/netsurf-3.10.ebuild | 131 +++++++++++++++++++++
4 files changed, 208 insertions(+)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 3f36b3d0c86..5581ea1266d 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,2 +1,3 @@
+DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
DIST netsurf-3.9-src.tar.gz 3989742 BLAKE2B a147a99bea00163147cb39b16ff8b7b874c58d386e60eb8aa568b3ce30e4957708c9720a5291a2aa37bc6d8d4bd0eaf4e2dc1a2bc2fff396cb4d972dd887e024 SHA512 061a1c6379b48582d842ed1ca6cea59b87cd84cd13769bdc32b623a56cebc69e94af9d65f4abd959608c98da9d0006f7842f875017569e6a3f7b77cbb928f24a
diff --git a/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
new file mode 100644
index 00000000000..6ffcec002e0
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-disable-failing-tests.patch
@@ -0,0 +1,42 @@
+From 4c3d6b10802b6747ba36b6e7c988f6b584352358 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:42:34 -0400
+Subject: [PATCH 1/1] test: disable failing tests.
+
+Just cut them right out of the Makefile if they ain't gonna work.
+
+Bug: https://bugs.gentoo.org/687378
+Upstream-bug: https://bugs.netsurf-browser.org/mantis/view.php?id=2779
+---
+ test/Makefile | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 82ffee6..952d238 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -5,8 +5,6 @@ TESTS := \
+ nsurl \
+ urldbtest \
+ nsoption \
+- bloom \
+- hashtable \
+ hashmap \
+ urlescape \
+ utils \
+@@ -47,12 +45,6 @@ messages_SRCS := utils/messages.c utils/hashtable.c test/log.c test/messages.c
+ # nsoption test sources
+ nsoption_SRCS := utils/nsoption.c test/log.c test/nsoption.c
+
+-# Bloom filter test sources
+-bloom_SRCS := utils/bloom.c test/bloom.c
+-
+-# hash table test sources
+-hashtable_SRCS := utils/hashtable.c test/log.c test/hashtable.c
+-
+ # hashmap test sources
+ hashmap_SRCS := $(NSURL_SOURCES) utils/hashmap.c utils/corestrings.c test/log.c test/hashmap.c
+ hashmap_LD := -lmalloc_fig
+--
+2.26.2
+
--git a/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
new file mode 100644
index 00000000000..3a6ccc2466f
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.10-julia-libutf8proc-header-location.patch
@@ -0,0 +1,34 @@
+From d585a1573819306bb3660db3f13a85b2fd254c63 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 17 Jun 2020 17:23:10 -0400
+Subject: [PATCH 1/1] utils/idna.c: adjust utf8proc.h header location.
+
+There are two upstreams for libutf8proc, and they each put utf8proc.h
+in a different location -- ostensibly as a performance art piece
+intended to remind the programmer that we as human beings are all
+slowly dying, and that our limited time here on earth should not be
+wasted. This commit switches the header location from the netsurf-
+upstream one that used to work, to the julia-upstream location that
+works now (that the Gentoo package follows the julia upstream).
+
+Bug: https://bugs.gentoo.org/721318
+---
+ utils/idna.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/idna.c b/utils/idna.c
+index 628ef1f..f6e498a 100644
+--- a/utils/idna.c
++++ b/utils/idna.c
+@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
+
+ #ifdef WITH_UTF8PROC
+
+-#include <libutf8proc/utf8proc.h>
++#include <utf8proc.h>
+
+ int32_t idna_contexto[] = {
+ /* CONTEXTO codepoints which have a rule defined */
+--
+2.26.2
+
diff --git a/www-client/netsurf/netsurf-3.10.ebuild b/www-client/netsurf/netsurf-3.10.ebuild
new file mode 100644
index 00000000000..ee8c48f41a8
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.10.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs desktop
+
+DESCRIPTION="a free, open source web browser"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
+ +png +psl +rosprite +svg +svgtiny +webp"
+
+REQUIRED_USE="|| ( fbcon gtk gtk2 )
+ duktape? ( javascript )"
+
+RDEPEND="
+ >=dev-libs/libcss-0.9
+ >=net-libs/libdom-0.3
+ >=net-libs/libhubbub-0.3
+ >=dev-libs/libnsutils-0.0.5
+ >=dev-libs/libutf8proc-2.2
+ dev-libs/libxml2:2
+ net-misc/curl
+ bmp? ( >=media-libs/libnsbmp-0.1 )
+ fbcon? ( >=dev-libs/libnsfb-0.2
+ truetype? ( media-fonts/dejavu
+ >=media-libs/freetype-2.5.0.1 )
+ )
+ gif? ( >=media-libs/libnsgif-0.1 )
+ gtk? ( dev-libs/glib:2
+ x11-libs/gtk+:3 )
+ gtk2? ( dev-libs/glib:2
+ x11-libs/gtk+:2 )
+ javascript? (
+ >=dev-libs/nsgenbind-0.7
+ duktape? ( dev-lang/duktape )
+ !duktape? ( dev-lang/spidermonkey:0= )
+ )
+ jpeg? ( >=virtual/jpeg-0-r2:0 )
+ mng? ( >=media-libs/libmng-1.0.10-r2 )
+ png? ( >=media-libs/libpng-1.2.51:0 )
+ psl? ( media-libs/libnspsl )
+ rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
+ svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
+ !svgtiny? ( gnome-base/librsvg:2 ) )
+ webp? ( >=media-libs/libwebp-0.3.0 )"
+BDEPEND="
+ duktape? ( app-editors/vim-core )
+ dev-libs/check
+ dev-perl/HTML-Parser
+ >=dev-util/netsurf-buildsystem-1.7-r1"
+
+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"
+)
+
+DOCS=( README docs/using-framebuffer.md
+ docs/ideas/{cache,css-engine,render-library}.txt )
+
+src_prepare() {
+ default
+ rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
+}
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ local netsurf_makeconf=(
+ "${NETSURF_MAKECONF[@]}"
+ COMPONENT_TYPE=binary
+ NETSURF_USE_BMP=$(usex bmp YES NO)
+ NETSURF_USE_GIF=$(usex gif YES NO)
+ NETSURF_USE_JPEG=$(usex jpeg YES NO)
+ NETSURF_USE_PNG=$(usex png YES NO)
+ NETSURF_USE_NSPSL=$(usex psl YES NO)
+ NETSURF_USE_MNG=$(usex mng YES NO)
+ NETSURF_USE_WEBP=$(usex webp YES NO)
+ NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
+ NETSURF_USE_JS=NO
+ NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
+ NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
+ NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
+ NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
+ PKG_CONFIG=$(tc-getPKG_CONFIG)
+ NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
+ NETSURF_FB_FONTPATH="${EPREFIX}/usr/share/fonts/dejavu"
+ NETSURF_USE_VIDEO=NO
+ )
+ emake "${netsurf_makeconf[@]}" $@
+}
+
+src_compile() {
+ use fbcon && _emake TARGET=framebuffer
+ use gtk2 && _emake TARGET=gtk
+ use gtk && _emake TARGET=gtk3
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ sed -e '1iexit;' \
+ -i "${WORKDIR}"/*/utils/git-testament.pl || die
+
+ if use fbcon ; then
+ _emake TARGET=framebuffer DESTDIR="${D}" install
+ elog "framebuffer binary has been installed as netsurf-fb"
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
+ fi
+ if use gtk2 ; then
+ _emake TARGET=gtk DESTDIR="${D}" install
+ elog "netsurf gtk2 version has been installed as netsurf-gtk"
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk NetSurf-gtk 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 NetSurf-gtk3 netsurf "Network;WebBrowser"
+ fi
+
+ insinto /usr/share/pixmaps
+ doins frontends/gtk/res/netsurf.xpm
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/
@ 2020-06-21 12:18 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2020-06-21 12:18 UTC (permalink / raw
To: gentoo-commits
commit: ea3a0d58c227f32144980fd2039c5948f01493dd
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:59:02 2020 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 12:17:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea3a0d58
www-client/netsurf: remove old "unused" versions.
This drops the keyworded arm, ppc, and ppc64 versions, but somebody
else kind of screwed us on that by simply omitting the javascript
engine as a dependency (???) instead of dealing with the keyword
problem when it first arose. I'll file a re-keyword bug.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
www-client/netsurf/Manifest | 2 -
| 31 -----
www-client/netsurf/files/netsurf-3.8-CFLAGS.patch | 79 -------------
.../netsurf/files/netsurf-3.8-pdf-writer.patch | 86 --------------
www-client/netsurf/metadata.xml | 67 ++++++-----
www-client/netsurf/netsurf-3.8-r2.ebuild | 129 --------------------
www-client/netsurf/netsurf-3.9.ebuild | 131 ---------------------
7 files changed, 36 insertions(+), 489 deletions(-)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 5581ea1266d..974348b603a 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,3 +1 @@
DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
-DIST netsurf-3.8-src.tar.gz 3945752 BLAKE2B 0f4592e53e95cfedb3c34a16ce9df9baeeaed93afb3bac3d68dab1e3d80e67c0498111c123285f6e828d063574e0e5f0cc3aa337ffab066f2283d06d248a308a SHA512 6f4dfdc546cce3b85d32da0dd816adc9a39410ed42bc28f263f4a1db64b35a889a1784a4116715190e756988dd263976933cfac75c9dcd81af01954487ddcaf6
-DIST netsurf-3.9-src.tar.gz 3989742 BLAKE2B a147a99bea00163147cb39b16ff8b7b874c58d386e60eb8aa568b3ce30e4957708c9720a5291a2aa37bc6d8d4bd0eaf4e2dc1a2bc2fff396cb4d972dd887e024 SHA512 061a1c6379b48582d842ed1ca6cea59b87cd84cd13769bdc32b623a56cebc69e94af9d65f4abd959608c98da9d0006f7842f875017569e6a3f7b77cbb928f24a
diff --git a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
deleted file mode 100644
index 06754464cb6..00000000000
--- a/www-client/netsurf/files/netsurf-3.6-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/content/handlers/image/image.c
-+++ netsurf-3.6/content/handlers/image/image.c
-@@ -27,14 +27,28 @@
- #include "netsurf/content.h"
- #include "desktop/gui_internal.h"
-
-+#ifdef WITH_BMP
- #include "image/bmp.h"
-+#endif
-+#ifdef WITH_GIF
- #include "image/gif.h"
-+#endif
- #include "image/ico.h"
-+#ifdef WITH_JPEG
- #include "image/jpeg.h"
-+#endif
-+#ifdef WITH_NSSPRITE
- #include "image/nssprite.h"
-+#endif
-+#ifdef WITH_PNG
- #include "image/png.h"
-+#endif
-+#ifdef WITH_RSVG
- #include "image/rsvg.h"
-+#endif
-+#ifdef WITH_NS_SVG
- #include "image/svg.h"
-+#endif
- #include "image/image.h"
-
- /**
diff --git a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
deleted file mode 100644
index c52422dcb92..00000000000
--- a/www-client/netsurf/files/netsurf-3.8-CFLAGS.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/Makefile.defaults b/Makefile.defaults
-index 51090109e..f1ec46f73 100644
---- a/Makefile.defaults
-+++ b/Makefile.defaults
-@@ -114,12 +114,6 @@ NETSURF_USE_SANITIZERS := NO
- # But recover after sanitizer failure
- NETSURF_RECOVER_SANITIZERS := YES
-
--# Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
--
--# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
--CXXFLAGS :=
--
- # Default installation/execution prefix
- PREFIX ?= /usr/local
-
-diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
-index bdedd903b..35179138a 100644
---- a/frontends/framebuffer/Makefile
-+++ b/frontends/framebuffer/Makefile
-@@ -20,7 +20,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
-
--CFLAGS += -std=c99 -g -Dsmall \
-+CFLAGS += -std=c99 -Dsmall \
- -D_BSD_SOURCE \
- -D_DEFAULT_SOURCE \
- -D_XOPEN_SOURCE=600 \
-diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
-index cc712e992..f132c97d6 100644
---- a/frontends/framebuffer/Makefile.defaults
-+++ b/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
-
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS +=
-
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
-diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
-index ec60ce70c..04af6df8f 100644
---- a/frontends/gtk/Makefile
-+++ b/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@ GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
- endif
-
-
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- $(GTKDEPFLAGS) \
- -D_BSD_SOURCE \
- -D_DEFAULT_SOURCE \
-diff --git a/frontends/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults
-index a98043eb9..bb5371230 100644
---- a/frontends/gtk/Makefile.defaults
-+++ b/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@ NETSURF_FS_BACKING_STORE := YES
- NETSURF_GTK_MAJOR ?= 2
-
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS +=
-diff --git a/test/Makefile b/test/Makefile
-index 4f9dd22c9..8bec9b88a 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -134,7 +134,7 @@ ifneq ($(CC_MAJOR),2)
- COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
-
--BASE_TESTCFLAGS := -std=c99 -g \
-+BASE_TESTCFLAGS := -std=c99 \
- $(COMMON_WARNFLAGS) \
- -D_DEFAULT_SOURCE \
- -D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
deleted file mode 100644
index e9c2420a33f..00000000000
--- a/www-client/netsurf/files/netsurf-3.8-pdf-writer.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/desktop/font_haru.c b/desktop/font_haru.c
-index 4ee9824f0..3304ba82a 100644
---- a/desktop/font_haru.c
-+++ b/desktop/font_haru.c
-@@ -37,7 +37,7 @@
- #include <hpdf.h>
-
- #include "utils/nsoption.h"
--#include "desktop/save_pdf/font_haru.h"
-+#include "desktop/font_haru.h"
- #include "desktop/font.h"
- #include "utils/log.h"
-
-diff --git a/desktop/save_pdf.c b/desktop/save_pdf.c
-index 889190089..9e6265cfb 100644
---- a/desktop/save_pdf.c
-+++ b/desktop/save_pdf.c
-@@ -60,6 +60,8 @@
- #include "utils/useragent.h"
- #include "content/hlcache.h"
- #include "utils/nsoption.h"
-+#include "desktop/gui_misc.h"
-+#include "desktop/gui_internal.h"
- #include "netsurf/bitmap.h"
-
- #include "netsurf/plotters.h"
-@@ -455,11 +457,6 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap)
-
- switch(content_get_type(content)){
- /*Handle "embeddable" types of images*/
-- case CONTENT_JPEG:
-- image = HPDF_LoadJpegImageFromMem(pdf_doc,
-- (const HPDF_BYTE *) source_data,
-- source_size);
-- break;
-
- /*Disabled until HARU PNG support will be more stable.
-
-@@ -706,7 +703,7 @@ bool pdf_begin(struct print_settings *print_settings)
-
-
- #ifndef PDF_DEBUG
-- if (option_enable_PDF_compression)
-+ if (nsoption_bool(enable_PDF_compression))
- HPDF_SetCompressionMode(pdf_doc, HPDF_COMP_ALL); /*Compression on*/
- #endif
- HPDF_SetInfoAttr(pdf_doc, HPDF_INFO_CREATOR, user_agent_string());
-@@ -780,7 +777,7 @@ void pdf_end(void)
- assert(settings->output != NULL);
-
- /*Encryption on*/
-- if (option_enable_PDF_password)
-+ if (nsoption_bool(enable_PDF_password))
- guit->misc->pdf_password(&owner_pass, &user_pass,
- (void *)settings->output);
- else
-@@ -795,7 +792,7 @@ nserror save_pdf(const char *path)
- {
- nserror res = NSERROR_OK;
-
-- if (option_enable_PDF_password && owner_pass != NULL ) {
-+ if (nsoption_bool(enable_PDF_password) && owner_pass != NULL ) {
- HPDF_SetPassword(pdf_doc, owner_pass, user_pass);
- HPDF_SetEncryptionMode(pdf_doc, HPDF_ENCRYPT_R3, 16);
- free(owner_pass);
-diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
-index 8c46fd884..748518fdc 100644
---- a/frontends/gtk/scaffolding.c
-+++ b/frontends/gtk/scaffolding.c
-@@ -853,14 +853,14 @@ MULTIHANDLER(pdf)
-
- free(url_name);
-
-- strncpy(dirname, option_downloads_directory, PATH_MAX);
-+ strncpy(dirname, nsoption_charp(downloads_directory), PATH_MAX);
- strncat(dirname, "/", PATH_MAX - strlen(dirname));
- dirname[PATH_MAX - 1] = '\0';
-
- /* this way the scale used by PDF functions is synchronised with that
- * used by the all-purpose print interface
- */
-- haru_nsfont_set_scale((float)option_export_scale / 100);
-+ haru_nsfont_set_scale((float)nsoption_int(export_scale) / 100);
-
- save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
- GTK_FILE_CHOOSER_ACTION_SAVE,
diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index c0afc038030..4abc84a70da 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,36 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>philipp.ammann@posteo.de</email>
- <name>Philipp Ammann</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <upstream>
- <changelog>http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt</changelog>
- </upstream>
- <use>
- <flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
- <flag name="duktape">Use duktape.org javascript engine</flag>
- <flag name="gtk">Build GTK3 GUI</flag>
- <flag name="gtk2">Build GTK2 GUI</flag>
- <flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
- <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
- <flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
- <flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
- </use>
- <longdescription lang="en">
- NetSurf is a free, open source web browser. It is written in C, has
- its own layout and rendering engine entirely written from scratch. It
- is small and capable of handling many of the web standards in use
- today.
+ <maintainer type="person">
+ <email>philipp.ammann@posteo.de</email>
+ <name>Philipp Ammann</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <changelog>
+ https://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt
+ </changelog>
+ </upstream>
+ <use>
+ <flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
+ <flag name="duktape">Use duktape.org javascript engine</flag>
+ <flag name="gtk">Build GTK3 GUI</flag>
+ <flag name="gtk2">Build GTK2 GUI</flag>
+ <flag name="psl">Use public suffix list via media-libs/libnspsl</flag>
+ <flag name="rosprite">
+ RISC OS Sprite bitmap image support (media-libs/librosprite)
+ </flag>
+ <flag name="svgtiny">
+ SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
+ </flag>
+ </use>
+ <longdescription lang="en">
+ NetSurf is a free, open source web browser. It is written in C,
+ has its own layout and rendering engine entirely written from
+ scratch. It is small and capable of handling many of the web
+ standards in use today.
- Whether you want to check your webmail, read the news or post to
- discussion forums, NetSurf is your lightweight gateway to the world
- wide web. Actively developed, NetSurf is continually evolving and
- improving.
- </longdescription>
+ Whether you want to check your webmail, read the news or post to
+ discussion forums, NetSurf is your lightweight gateway to the
+ world wide web. Actively developed, NetSurf is continually
+ evolving and improving.
+ </longdescription>
</pkgmetadata>
diff --git a/www-client/netsurf/netsurf-3.8-r2.ebuild b/www-client/netsurf/netsurf-3.8-r2.ebuild
deleted file mode 100644
index e9cd87acae4..00000000000
--- a/www-client/netsurf/netsurf-3.8-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs desktop
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
- pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 )
- duktape? ( javascript )"
-
-RDEPEND="
- >=dev-libs/libcss-0.8
- >=net-libs/libdom-0.3
- >=net-libs/libhubbub-0.3
- >=dev-libs/libnsutils-0.0.5
- >=dev-libs/libutf8proc-2.2
- dev-libs/libxml2:2
- net-misc/curl
- bmp? ( >=media-libs/libnsbmp-0.1 )
- fbcon? ( >=dev-libs/libnsfb-0.2
- truetype? ( media-fonts/dejavu
- >=media-libs/freetype-2.5.0.1 )
- )
- gif? ( >=media-libs/libnsgif-0.1 )
- gtk? ( dev-libs/glib:2
- x11-libs/gtk+:3 )
- gtk2? ( dev-libs/glib:2
- x11-libs/gtk+:2 )
- javascript? ( >=dev-libs/nsgenbind-0.6
- !duktape? ( dev-lang/spidermonkey:0= ) )
- jpeg? ( >=virtual/jpeg-0-r2:0 )
- mng? ( >=media-libs/libmng-1.0.10-r2 )
- pdf-writer? ( media-libs/libharu )
- png? ( >=media-libs/libpng-1.2.51:0 )
- psl? ( media-libs/libnspsl )
- rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
- svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
- !svgtiny? ( gnome-base/librsvg:2 ) )
- webp? ( >=media-libs/libwebp-0.3.0 )"
-DEPEND="${RDEPEND}
- dev-libs/check
- dev-perl/HTML-Parser
- >=dev-util/netsurf-buildsystem-1.7-r1"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8-CFLAGS.patch
- "${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch
- "${FILESDIR}"/${PN}-3.8-pdf-writer.patch
-)
-
-DOCS=( README docs/using-framebuffer.md
- docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
- default
- rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
-}
-
-_emake() {
- source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
- netsurf_define_makeconf
- local netsurf_makeconf=(
- "${NETSURF_MAKECONF[@]}"
- COMPONENT_TYPE=binary
- NETSURF_USE_BMP=$(usex bmp YES NO)
- NETSURF_USE_GIF=$(usex gif YES NO)
- NETSURF_USE_JPEG=$(usex jpeg YES NO)
- NETSURF_USE_PNG=$(usex png YES NO)
- NETSURF_USE_NSPSL=$(usex psl YES NO)
- NETSURF_USE_MNG=$(usex mng YES NO)
- NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
- NETSURF_USE_JS=NO
- NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
- NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
- NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
- NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
- NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
- PKG_CONFIG=$(tc-getPKG_CONFIG)
- NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
- NETSURF_USE_VIDEO=NO
- )
- emake "${netsurf_makeconf[@]}" $@
-}
-
-src_compile() {
- use fbcon && _emake TARGET=framebuffer
- use gtk2 && _emake TARGET=gtk
- use gtk && _emake TARGET=gtk3
-}
-
-src_test() {
- _emake test
-}
-
-src_install() {
- sed -e '1iexit;' \
- -i "${WORKDIR}"/*/utils/git-testament.pl || die
-
- if use fbcon ; then
- _emake TARGET=framebuffer DESTDIR="${ED}" install
- elog "framebuffer binary has been installed as netsurf-fb"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
- fi
- if use gtk2 ; then
- _emake TARGET=gtk DESTDIR="${ED}" install
- elog "netsurf gtk2 version has been installed as netsurf-gtk"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
- fi
- if use gtk ; then
- _emake TARGET=gtk3 DESTDIR="${ED}" install
- elog "netsurf gtk3 version has been installed as netsurf-gtk3"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
- fi
-
- insinto /usr/share/pixmaps
- doins frontends/gtk/res/netsurf.xpm
-}
diff --git a/www-client/netsurf/netsurf-3.9.ebuild b/www-client/netsurf/netsurf-3.9.ebuild
deleted file mode 100644
index 89bfe438c73..00000000000
--- a/www-client/netsurf/netsurf-3.9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs desktop
-
-DESCRIPTION="a free, open source web browser"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="+bmp +duktape fbcon truetype +gif gtk gtk2 +javascript +jpeg +mng
- pdf-writer +png +psl +rosprite +svg +svgtiny +webp"
-
-REQUIRED_USE="|| ( fbcon gtk gtk2 )
- duktape? ( javascript )"
-
-RDEPEND="
- >=dev-libs/libcss-0.9
- >=net-libs/libdom-0.3
- >=net-libs/libhubbub-0.3
- >=dev-libs/libnsutils-0.0.5
- >=dev-libs/libutf8proc-2.2
- dev-libs/libxml2:2
- net-misc/curl
- bmp? ( >=media-libs/libnsbmp-0.1 )
- fbcon? ( >=dev-libs/libnsfb-0.2
- truetype? ( media-fonts/dejavu
- >=media-libs/freetype-2.5.0.1 )
- )
- gif? ( >=media-libs/libnsgif-0.1 )
- gtk? ( dev-libs/glib:2
- x11-libs/gtk+:3 )
- gtk2? ( dev-libs/glib:2
- x11-libs/gtk+:2 )
- javascript? ( >=dev-libs/nsgenbind-0.7
- !duktape? ( dev-lang/spidermonkey:0= ) )
- jpeg? ( >=virtual/jpeg-0-r2:0 )
- mng? ( >=media-libs/libmng-1.0.10-r2 )
- pdf-writer? ( media-libs/libharu )
- png? ( >=media-libs/libpng-1.2.51:0 )
- psl? ( media-libs/libnspsl )
- rosprite? ( >=media-libs/librosprite-0.1.2-r1 )
- svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 )
- !svgtiny? ( gnome-base/librsvg:2 ) )
- webp? ( >=media-libs/libwebp-0.3.0 )"
-BDEPEND="
- duktape? ( app-editors/vim-core )
- dev-libs/check
- dev-perl/HTML-Parser
- >=dev-util/netsurf-buildsystem-1.7-r1"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.9-conditionally-include-image-headers.patch
- "${FILESDIR}"/${PN}-3.8-pdf-writer.patch
-)
-
-DOCS=( README docs/using-framebuffer.md
- docs/ideas/{cache,css-engine,render-library}.txt )
-
-src_prepare() {
- default
- rm -r frontends/{amiga,atari,beos,monkey,riscos,windows} || die
-}
-
-_emake() {
- source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
- netsurf_define_makeconf
- local netsurf_makeconf=(
- "${NETSURF_MAKECONF[@]}"
- COMPONENT_TYPE=binary
- NETSURF_USE_BMP=$(usex bmp YES NO)
- NETSURF_USE_GIF=$(usex gif YES NO)
- NETSURF_USE_JPEG=$(usex jpeg YES NO)
- NETSURF_USE_PNG=$(usex png YES NO)
- NETSURF_USE_NSPSL=$(usex psl YES NO)
- NETSURF_USE_MNG=$(usex mng YES NO)
- NETSURF_USE_WEBP=$(usex webp YES NO)
- NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO)
- NETSURF_USE_JS=NO
- NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO)
- NETSURF_USE_HARU_PDF=$(usex pdf-writer YES NO)
- NETSURF_USE_NSSVG=$(usex svg $(usex svgtiny YES NO) NO)
- NETSURF_USE_RSVG=$(usex svg $(usex svgtiny NO YES) NO)
- NETSURF_USE_ROSPRITE=$(usex rosprite YES NO)
- PKG_CONFIG=$(tc-getPKG_CONFIG)
- NETSURF_FB_FONTLIB=$(usex truetype freetype internal)
- NETSURF_FB_FONTPATH=${EROOT}/usr/share/fonts/dejavu
- NETSURF_USE_VIDEO=NO
- )
- emake "${netsurf_makeconf[@]}" $@
-}
-
-src_compile() {
- use fbcon && _emake TARGET=framebuffer
- use gtk2 && _emake TARGET=gtk
- use gtk && _emake TARGET=gtk3
-}
-
-src_test() {
- _emake test
-}
-
-src_install() {
- sed -e '1iexit;' \
- -i "${WORKDIR}"/*/utils/git-testament.pl || die
-
- if use fbcon ; then
- _emake TARGET=framebuffer DESTDIR="${ED}" install
- elog "framebuffer binary has been installed as netsurf-fb"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
- fi
- if use gtk2 ; then
- _emake TARGET=gtk DESTDIR="${ED}" install
- elog "netsurf gtk2 version has been installed as netsurf-gtk"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
- fi
- if use gtk ; then
- _emake TARGET=gtk3 DESTDIR="${ED}" install
- elog "netsurf gtk3 version has been installed as netsurf-gtk3"
- make_desktop_entry "${EROOT}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser"
- fi
-
- insinto /usr/share/pixmaps
- doins frontends/gtk/res/netsurf.xpm
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/
@ 2018-10-21 20:54 Virgil Dupras
0 siblings, 0 replies; 7+ messages in thread
From: Virgil Dupras @ 2018-10-21 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 643eb59dbdba8025ef6f023ea77773cfdba06eca
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 21 20:51:52 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sun Oct 21 20:52:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643eb59d
www-client/netsurf: remove old
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.6-CFLAGS.patch | 67 ---------
.../netsurf/files/netsurf-3.6-gstreamer.patch | 31 ----
.../netsurf/files/netsurf-3.6-pdf-writer.patch | 80 -----------
www-client/netsurf/netsurf-3.6.ebuild | 160 ---------------------
5 files changed, 340 deletions(-)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 370d0b8b4b7..b47aff4703c 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,5 +1,3 @@
-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.6-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
deleted file mode 100644
index 8004aa4c620..00000000000
--- a/www-client/netsurf/files/netsurf-3.6-CFLAGS.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- netsurf-3.6/Makefile.defaults
-+++ netsurf-3.6/Makefile.defaults
-@@ -96,12 +96,6 @@
- # Valid options: YES, NO
- NETSURF_FS_BACKING_STORE := NO
-
--# Initial CFLAGS. Optimisation level etc. tend to be target specific.
--CFLAGS :=
--
--# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
--CXXFLAGS :=
--
- # Default installation/execution prefix
- PREFIX ?= /usr/local
-
---- netsurf-3.6/frontends/framebuffer/Makefile
-+++ netsurf-3.6/frontends/framebuffer/Makefile
-@@ -20,7 +20,7 @@
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
-
--CFLAGS += -std=c99 -g -Dsmall \
-+CFLAGS += -std=c99 -Dsmall \
- -D_BSD_SOURCE \
- -D_DEFAULT_SOURCE \
- -D_XOPEN_SOURCE=600 \
---- netsurf-3.6/frontends/framebuffer/Makefile.defaults
-+++ netsurf-3.6/frontends/framebuffer/Makefile.defaults
-@@ -3,7 +3,7 @@
- # ----------------------------------------------------------------------------
-
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS +=
-
- # Framebuffer default surface provider.
- # Valid values are: x, sdl, linux, vnc, able,
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -33,7 +33,7 @@
- endif
-
-
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- $(GTKDEPFLAGS) \
- -D_BSD_SOURCE \
- -D_DEFAULT_SOURCE \
---- netsurf-3.6/frontends/gtk/Makefile.defaults
-+++ netsurf-3.6/frontends/gtk/Makefile.defaults
-@@ -39,4 +39,4 @@
- NETSURF_GTK_MAJOR ?= 2
-
- # Optimisation levels
--CFLAGS += -O2
-+CFLAGS +=
---- netsurf-3.6/test/Makefile
-+++ netsurf-3.6/test/Makefile
-@@ -105,7 +105,7 @@
- COMMON_WARNFLAGS += -Wno-unused-parameter
- endif
-
--TESTCFLAGS := -std=c99 -g \
-+TESTCFLAGS := -std=c99 \
- $(COMMON_WARNFLAGS) \
- -D_BSD_SOURCE \
- -D_POSIX_C_SOURCE=200809L \
diff --git a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
deleted file mode 100644
index 6aca4f6abdf..00000000000
--- a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- netsurf-3.6/frontends/gtk/Makefile
-+++ netsurf-3.6/frontends/gtk/Makefile
-@@ -16,7 +16,6 @@
-
- # GTK and GLIB flags to disable depricated usage
- GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
-- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_SINGLE_INCLUDES \
- -DGTK_MULTIHEAD_SAFE \
- -DPANGO_DISABLE_DEPRECATED
---- netsurf-3.6/content/handlers/image/video.c
-+++ netsurf-3.6/content/handlers/image/video.c
-@@ -22,6 +22,8 @@
- #include "content/content_protected.h"
-
- #include "image/video.h"
-+#include "utils/http/parameter.h"
-+#include "content/llcache.h"
-
- typedef struct nsvideo_content {
- struct content base;
---- netsurf-3.6/content/content_factory.h
-+++ netsurf-3.6/content/content_factory.h
-@@ -25,6 +25,7 @@
-
- #include "netsurf/content_type.h"
- #include "utils/errors.h"
-+#include "utils/utils.h"
-
- #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER) \
- \
diff --git a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch b/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
deleted file mode 100644
index 5824adc1ecb..00000000000
--- a/www-client/netsurf/files/netsurf-3.6-pdf-writer.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- 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/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.6.ebuild
deleted file mode 100644
index 4397fe9dfaa..00000000000
--- a/www-client/netsurf/netsurf-3.6.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}] )
- 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.6-CFLAGS.patch
- "${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.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 )
-
-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_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=$(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
-}
-
-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=$(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"
- fi
-
- insinto /usr/share/pixmaps
- doins frontends/gtk/res/netsurf.xpm
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/
@ 2016-05-07 21:44 Michael Weber
0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2016-05-07 21:44 UTC (permalink / raw
To: gentoo-commits
commit: f3fb0f6eb62bdca2de9483c1ad9d503fc881b6fe
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 21:07:13 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat May 7 21:43:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3fb0f6e
www-client/netsurf: drop old.
Package-Manager: portage-2.2.28
www-client/netsurf/Manifest | 2 -
.../files/netsurf-3.0-framebuffer-pkgconfig.patch | 29 ----
| 67 ---------
www-client/netsurf/files/netsurf-3.3-CFLAGS.patch | 85 -----------
www-client/netsurf/netsurf-3.3-r1.ebuild | 158 ---------------------
5 files changed, 341 deletions(-)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index eda672a..c6466df 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,5 +1,3 @@
-DIST netsurf-3.3-src.tar.gz 3198799 SHA256 23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686 SHA512 5796ce007d438309ef809dbb972cafab29efce04a22912bb3318a1cd93f6cca73ddb6ab2f7916c6819f7f63378a27180b380759611a3c88bf00d705a1dd9c5a6 WHIRLPOOL fb5793a7502c27a7adf6cfdcaa029be19e7d750039f7a901b9004cb2a6ea390cd76d1e3bec0598d9986ea4c0203bbb6dabbe8d71955c30becb827753d20f5156
DIST netsurf-3.4-src.tar.gz 4133201 SHA256 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6 SHA512 d9f95ff88d572a36e906bdb25dddbb51aa683a2105ca9eff53ea61c154a34a888420811f8a2b58a1b5a10f77d8aa914e3201b937934243527edb8a897f7bd60e WHIRLPOOL 1c8e3d6ac8a1ecd7bfa2554d56bd6e6cbd6c025112110f596a1db551d3b18029ee2761ddb288cdbc0cd517a90a54081d9d8aca3399339160addb2aedce14a55b
-DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
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.0-framebuffer-pkgconfig.patch b/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch
deleted file mode 100644
index 50c9f8b..0000000
--- a/www-client/netsurf/files/netsurf-3.0-framebuffer-pkgconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- netsurf-3.0/framebuffer/Makefile.target
-+++ netsurf-3.0/framebuffer/Makefile.target
-@@ -13,12 +13,16 @@
-
- # 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_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
-
-@@ -41,6 +45,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/files/netsurf-3.2-conditionally-include-image-headers.patch b/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch
deleted file mode 100644
index 9c73c23..0000000
--- a/www-client/netsurf/files/netsurf-3.2-conditionally-include-image-headers.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- netsurf-3.2/image/image.c
-+++ netsurf-3.2/image/image.c
-@@ -28,15 +28,42 @@
- #include "content/content.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"
--#include "image/nssprite.h"
-+#endif
-+
-+#ifdef WITH_MNG
-+#include "image/mng.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"
-
-@@ -73,7 +100,18 @@
- 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
-+ /* Prefer libpng over libmng for pngs by registering later */
- error = nspng_init();
- if (error != NSERROR_OK)
- return error;
diff --git a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
deleted file mode 100644
index 7a3f234..0000000
--- a/www-client/netsurf/files/netsurf-3.3-CFLAGS.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- netsurf-3.3/Makefile.defaults
-+++ netsurf-3.3/Makefile.defaults
-@@ -91,12 +91,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.3/framebuffer/Makefile.defaults
-+++ netsurf-3.3/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.3/framebuffer/Makefile.target
-+++ netsurf-3.3/framebuffer/Makefile.target
-@@ -42,8 +42,8 @@
- $(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 \
-- -D_BSD_SOURCE \
-+CFLAGS += -std=c99 -Dsmall \
-+ -D_DEFAULT_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L \
- $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
---- netsurf-3.3/gtk/Makefile.defaults
-+++ netsurf-3.3/gtk/Makefile.defaults
-@@ -26,6 +26,3 @@
-
- # Set default GTK version to build for (2 or 3)
- NETSURF_GTK_MAJOR ?= 2
--
--# Optimisation levels
--CFLAGS += -O2
---- netsurf-3.3/gtk/Makefile.target
-+++ netsurf-3.3/gtk/Makefile.target
-@@ -46,9 +46,9 @@
- # libsexy currently means we cannot enable this
- # -DGDK_DISABLE_DEPRECATED
-
--GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
-+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.3/test/Makefile
-+++ 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_BSD_SOURCE -D_DEFAULT_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/netsurf-3.3-r1.ebuild b/www-client/netsurf/netsurf-3.3-r1.ebuild
deleted file mode 100644
index 4c3e786..0000000
--- a/www-client/netsurf/netsurf-3.3-r1.ebuild
+++ /dev/null
@@ -1,158 +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.3
-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/libnsutils-0.0.1-r1[${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.5.0-r1[${MULTILIB_USEDEP}]
- >=net-libs/libhubbub-0.3.1-r1[${MULTILIB_USEDEP}]
- net-libs/libdom[${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.1.2-r1[${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.3-r1[${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.2-r1[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-CFLAGS.patch
- "${FILESDIR}"/${PN}-3.0-framebuffer-pkgconfig.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 )
-
-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"
- 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] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/
@ 2016-03-02 22:53 Michael Weber
0 siblings, 0 replies; 7+ messages in thread
From: Michael Weber @ 2016-03-02 22:53 UTC (permalink / raw
To: gentoo-commits
commit: 63565d6603116ac6bd824cfb7870d4704fcaa59c
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 22:15:52 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 22:53:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63565d66
www-client/netsurf: Version bump.
Package-Manager: portage-2.2.27
www-client/netsurf/Manifest | 2 +
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 | 160 +++++++++++++++++++++
5 files changed, 312 insertions(+)
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index a66925b..6e841e0 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -1,5 +1,7 @@
DIST netsurf-3.2-src.tar.gz 3232987 SHA256 04ffeb8335c59cbc23371b79ae3b178002e6e95c35225ef62db4b155ecc7e213 SHA512 d1ef15503bd7f59bea6a0bf41333e5da7a8657ab1cd6412b7cb9588b4d6e17908bd5f9b22e71c9e72574df9bb1aa5413a6ccd79a6bdd62ea5ff63c15876f1b60 WHIRLPOOL 98f343fefa39ab5f7f4e1d7e97305323d57bd4f0c1c97cee35e94f7d485d25b86b7012c95bfd2db88620f334ca2ce7cbe6eb4975cda7ac98a99f531bd10ed70b
DIST netsurf-3.3-src.tar.gz 3198799 SHA256 23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686 SHA512 5796ce007d438309ef809dbb972cafab29efce04a22912bb3318a1cd93f6cca73ddb6ab2f7916c6819f7f63378a27180b380759611a3c88bf00d705a1dd9c5a6 WHIRLPOOL fb5793a7502c27a7adf6cfdcaa029be19e7d750039f7a901b9004cb2a6ea390cd76d1e3bec0598d9986ea4c0203bbb6dabbe8d71955c30becb827753d20f5156
+DIST netsurf-3.4-src.tar.gz 4133201 SHA256 1648f437994fc18090237430f30d645ff06bab0768ae973575f9391d07613bf6 SHA512 d9f95ff88d572a36e906bdb25dddbb51aa683a2105ca9eff53ea61c154a34a888420811f8a2b58a1b5a10f77d8aa914e3201b937934243527edb8a897f7bd60e WHIRLPOOL 1c8e3d6ac8a1ecd7bfa2554d56bd6e6cbd6c025112110f596a1db551d3b18029ee2761ddb288cdbc0cd517a90a54081d9d8aca3399339160addb2aedce14a55b
DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
+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.4-CFLAGS.patch b/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch
new file mode 100644
index 0000000..2dc8a14
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.4-CFLAGS.patch
@@ -0,0 +1,71 @@
+--- 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.. \
--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
new file mode 100644
index 0000000..e78d71c
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.4-conditionally-include-image-headers.patch
@@ -0,0 +1,49 @@
+--- 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
new file mode 100644
index 0000000..31aaa0a
--- /dev/null
+++ b/www-client/netsurf/files/netsurf-3.4-framebuffer-pkgconfig.patch
@@ -0,0 +1,30 @@
+--- 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
new file mode 100644
index 0000000..de78a06
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.4.ebuild
@@ -0,0 +1,160 @@
+# 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 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/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.1.2-r1[${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.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}]
+ 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 YES NO)
+ NETSURF_USE_JS=NO
+ NETSURF_USE_DUKTAPE=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] 7+ messages in thread
end of thread, other threads:[~2022-03-16 19:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-04 14:49 [gentoo-commits] repo/gentoo:master commit in: www-client/netsurf/files/, www-client/netsurf/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2022-03-16 19:28 Sam James
2020-06-21 12:18 Michael Orlitzky
2020-06-21 12:18 Michael Orlitzky
2018-10-21 20:54 Virgil Dupras
2016-05-07 21:44 Michael Weber
2016-03-02 22:53 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox