From ec0c87211e58cfc22130d6e373224f6a7473c67a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 12 Feb 2016 18:47:47 +0100 Subject: [PATCH] icecat: apply patch from firefox to make this build with binutils-2.26 and musl. Also get rid of BROTLI_BUILD_PORTABLE which causes a signifact performance penalty that you must get rid of. --- .../patches/patch-xpcom_components_Module.h | 15 +++++++++++++++ srcpkgs/icecat/template | 9 +-------- 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/icecat/patches/patch-xpcom_components_Module.h diff --git a/srcpkgs/icecat/patches/patch-xpcom_components_Module.h b/srcpkgs/icecat/patches/patch-xpcom_components_Module.h new file mode 100644 index 00000000000..866c7b4a585 --- /dev/null +++ b/srcpkgs/icecat/patches/patch-xpcom_components_Module.h @@ -0,0 +1,15 @@ +$NetBSD: patch-xpcom_components_Module.h,v 1.1 2016/02/06 22:13:22 ryoon Exp $ + +* Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26 + +--- xpcom/components/Module.h.orig 2016-01-23 23:23:51.000000000 +0000 ++++ xpcom/components/Module.h +@@ -125,7 +125,7 @@ struct Module + # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) + # elif defined(__GNUC__) + # if defined(__ELF__) +-# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected"))) ++# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default"))) + # elif defined(__MACH__) + # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default"))) + # elif defined (_WIN32) diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 8eea31dd139..7430a1b7530 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -1,7 +1,7 @@ # Template build file for 'icecat'. pkgname=icecat version=38.6.0 -revision=1 +revision=2 short_desc="GNU version of the Firefox browser" maintainer="Jürgen Buchmüller " homepage="https://www.gnu.org/software/${pkgname}/" @@ -12,13 +12,6 @@ checksum="9d0e10005c28d130d262176280656dc3cf374717723bd715d3d6a3cc5999a42d" nopie=yes lib32disabled=yes -case "$XBPS_TARGET_MACHINE" in - x86_64-musl) broken=http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9023/steps/shell_3/logs/stdio -esac - -# https://bugzilla.mozilla.org/show_bug.cgi?id=1243724 -CFLAGS="-DBROTLI_BUILD_PORTABLE" - hostmakedepends="unzip zip pkg-config perl python yasm" makedepends="nss-devel libjpeg-turbo-devel icu-devel pixman-devel sqlite-devel gst-plugins-base1-devel gtk+-devel