package/netsurf: remove package
PATCH 1/1 package/netsurf: remove package
The package causes a large amount of build failures, E.G.:
http://autobuild.buildroot.net/results/eaf/eafc3e4be571d5ecee549a11530ac4e508f31782/
Caused by the custom build system mixing up host and target compiler flags. The original submitter seems no longer active in fixing the package, so lets drop it rather than releasing with a known broken package.
If these issues gets fixed upstream then the package can be re-added.
--- DEVELOPERS | 1 - package/Config.in | 1 - .../0001-avoid-system-perl-dependencies.patch | 29 ------ package/netsurf/0002-fix-freetype-detection.patch | 32 ------- .../0003-do-not-cross-compile-nsgenbind.patch | 30 ------ .../0004-fix-compilation-without-curl.patch | 27 ------ package/netsurf/Config.in | 46 ---------- package/netsurf/netsurf.hash | 3 - package/netsurf/netsurf.mk | 101 --------------------- 9 files changed, 270 deletions(-) delete mode 100644 package/netsurf/0001-avoid-system-perl-dependencies.patch delete mode 100644 package/netsurf/0002-fix-freetype-detection.patch delete mode 100644 package/netsurf/0003-do-not-cross-compile-nsgenbind.patch delete mode 100644 package/netsurf/0004-fix-compilation-without-curl.patch delete mode 100644 package/netsurf/Config.in delete mode 100644 package/netsurf/netsurf.hash delete mode 100644 package/netsurf/netsurf.mk
DEVELOPERS +0 -1
@@ -878,7 +878,6 @@ F: package/lsqlite3/ F: package/lua* F: package/lzlib/ F: package/moarvm/ -F: package/netsurf/ F: package/perl* F: package/pkg-perl.mk F: package/pkg-luarocks.mk
package/Config.in +0 -1
@@ -276,7 +276,6 @@ comment "Graphic applications" source "package/kmscube/Config.in" source "package/libva-utils/Config.in" source "package/mesa3d-demos/Config.in" - source "package/netsurf/Config.in" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in"
package/netsurf/0001-avoid-system-perl-dependencies.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From b42e4b5bfca030965dcfca993a47a6ddaa941287 Mon Sep 17 00:00:00 2001 -From: Francois Perrad <[email protected]> -Date: Sun, 25 Nov 2018 18:27:54 +0100 -Subject: [PATCH] avoid system perl dependencies - -this subroutine format is used for android target. -with eval the load of HTML::Entities is deferred. - -Signed-off-by: Francois Perrad <[email protected]> ---- - netsurf/utils/split-messages.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/netsurf/utils/split-messages.pl b/netsurf/utils/split-messages.pl -index 4b50dde..e47dded 100644 ---- a/netsurf/utils/split-messages.pl -+++ b/netsurf/utils/split-messages.pl -@@ -311,7 +311,7 @@ TXT - sub footer { qq|</resources>| } - sub format - { -- use HTML::Entities qw(encode_entities); -+ eval q|use HTML::Entities qw(encode_entities);|; - my $escaped = encode_entities( $_[1], '<>&"' ); - qq| <string name="$_[0]">$escaped</string>\n|; - } --- -2.17.1 -
package/netsurf/0002-fix-freetype-detection.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 85336f2404b9583267019650ea0112ebf1bb571a Mon Sep 17 00:00:00 2001 -From: Francois Perrad <[email protected]> -Date: Wed, 28 Nov 2018 17:59:44 +0100 -Subject: [PATCH] fix freetype detection - -Using freetype-config doesn't work well, because it's going to use the -system freetype-config instead of the one installed in the -cross-compilation sysroot. So, let's use pkg-config instead. - -Signed-off-by: Francois Perrad <[email protected]> ---- - netsurf/frontends/framebuffer/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/netsurf/frontends/framebuffer/Makefile b/netsurf/frontends/framebuffer/Makefile -index bdedd90..249c7c4 100644 ---- a/netsurf/frontends/framebuffer/Makefile -+++ b/netsurf/frontends/framebuffer/Makefile -@@ -35,8 +35,8 @@ LDFLAGS += -Wl,--no-whole-archive - - # freetype is optional but does not use pkg-config - ifeq ($(NETSURF_FB_FONTLIB),freetype) -- CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags) -- LDFLAGS += $(shell freetype-config --libs) -+ CFLAGS += -DFB_USE_FREETYPE $(shell $(PKG_CONFIG) --cflags freetype2) -+ LDFLAGS += $(shell $(PKG_CONFIG) --libs freetype2) - endif - - --- -2.17.1 -
package/netsurf/0003-do-not-cross-compile-nsgenbind.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 2419ad79b25fcc1746178aba609fddbb0aa8c9e0 Mon Sep 17 00:00:00 2001 -From: Francois Perrad <[email protected]> -Date: Sat, 1 Dec 2018 16:10:13 +0100 -Subject: [PATCH] build nsgenbind for the build machine - -The nsgenbind tool is meant to be executed on the build machine during -the build, so it should not be built with the cross-compiler, but with -the native compiler. - -Signed-off-by: Francois Perrad <[email protected]> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index f279f01..5698c87 100644 ---- a/Makefile -+++ b/Makefile -@@ -109,7 +109,7 @@ endef - - # prefixed install macro for each host sub target - define do_build_prefix_install -- $(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= -+ $(MAKE) install --directory=$1 HOST=$(BUILD) CC=$(BUILD_CC) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= - - endef - --- -2.17.1 -
package/netsurf/0004-fix-compilation-without-curl.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 7d7c59dbfc92fcbcd0eac2c84e0fb98662c4bd71 Mon Sep 17 00:00:00 2001 -From: Francois Perrad <[email protected]> -Date: Sat, 8 Dec 2018 09:43:40 +0100 -Subject: [PATCH] fix compilation without curl - -Signed-off-by: Francois Perrad <[email protected]> ---- - netsurf/content/fetch.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/netsurf/content/fetch.c b/netsurf/content/fetch.c -index 7665029..0f41c49 100644 ---- a/netsurf/content/fetch.c -+++ b/netsurf/content/fetch.c -@@ -54,7 +54,9 @@ - #include "content/fetchers.h" - #include "content/fetchers/resource.h" - #include "content/fetchers/about.h" -+#ifdef WITH_CURL - #include "content/fetchers/curl.h" -+#endif - #include "content/fetchers/data.h" - #include "content/fetchers/file.h" - #include "javascript/fetcher.h" --- -2.17.1 -
package/netsurf/Config.in deleted +0 -46
46 lines not on this page · raw message
package/netsurf/netsurf.hash deleted +0 -3
@@ -1,3 +0,0 @@ -# Locally computed -sha256 eb4864d4459d6f9958dd10a3301c272ea7f5df72667a7db0aad5bc5ae06c0e10 netsurf-all-3.8.tar.gz -sha256 55c4a7ae3953d720a462e69d1f128a20004933d12538be5314a33f8821675378 netsurf/COPYING
package/netsurf/netsurf.mk deleted +0 -101
101 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH 1/1 package/netsurf: remove package
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
The package causes a large amount of build failures, E.G.:
http://autobuild.buildroot.net/results/eaf/eafc3e4be571d5ecee549a11530ac4e508f31782/
Quoted 7 lines
Caused by the custom build system mixing up host and target compiler flags. The original submitter seems no longer active in fixing the package, so lets drop it rather than releasing with a known broken package.
If these issues gets fixed upstream then the package can be re-added.
Signed-off-by Peter Korsgaard <[email protected]>
During discussions about this on IRC there was some doubts about removing the package this close to the release, so I have instead sent a patch disabling it for architectures where we pass ABI specific CFLAGS (as the build system ends up passing those to the host compiler as well) and marked this patch as superseeded.
Signature · 1 line
Bye, Peter Korsgaard