Received: by mail.netbsd.org (Postfix, from userid 605) id 5351484D77; Sat, 3 Aug 2019 07:18:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D0A4D84CFD for ; Sat, 3 Aug 2019 07:18:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id IPIZ6SU2s7oh for ; Sat, 3 Aug 2019 07:18:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 393FB84C85 for ; Sat, 3 Aug 2019 07:18:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 32AACFBF4; Sat, 3 Aug 2019 07:18:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1564816698271220" MIME-Version: 1.0 Date: Sat, 3 Aug 2019 07:18:18 +0000 From: "Santhosh Raju" Subject: CVS commit: pkgsrc/www/cliqz To: pkgsrc-changes@NetBSD.org Reply-To: fox@netbsd.org X-Mailer: log_accum Message-Id: <20190803071818.32AACFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1564816698271220 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fox Date: Sat Aug 3 07:18:18 UTC 2019 Modified Files: pkgsrc/www/cliqz: distinfo Added Files: pkgsrc/www/cliqz/patches: patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h Log Message: cliqz: Fixes builds in i386 platform. NetBSD/i386 build were broken due to an internal compiler error when compiling with gcc. Upstream bug report - https://bugzilla.mozilla.org/show_bug.cgi?id=1562886 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/cliqz/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1564816698271220 Content-Disposition: inline Content-Length: 3126 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/cliqz/distinfo diff -u pkgsrc/www/cliqz/distinfo:1.9 pkgsrc/www/cliqz/distinfo:1.10 --- pkgsrc/www/cliqz/distinfo:1.9 Wed Jul 31 01:35:27 2019 +++ pkgsrc/www/cliqz/distinfo Sat Aug 3 07:18:17 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2019/07/31 01:35:27 fox Exp $ +$NetBSD: distinfo,v 1.10 2019/08/03 07:18:17 fox Exp $ SHA1 (cliqz-1.28.0/adult-domains.bin) = 9dd0756b67aa17357ef61f3bea8303dad63540a1 RMD160 (cliqz-1.28.0/adult-domains.bin) = 78f46f31b27b4172a6aa6125619f92f751172a75 @@ -28,6 +28,7 @@ SHA1 (patch-mozilla-release_dom_base_nsA SHA1 (patch-mozilla-release_gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = c696b0dc6d2f25773ac4d928857b00b4f3799838 SHA1 (patch-mozilla-release_gfx_angle_checkout_src_compiler_translator_InfoSink.h) = e5f9cb8fac413267546a268ca0e50611b9965542 SHA1 (patch-mozilla-release_gfx_gl_GLContextProviderGLX.cpp) = 6153772492f099e806378b9f2d79c41923b1cefa +SHA1 (patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h) = 6d7a7c0ebde552ea85ff6c90e71c71c9628091e9 SHA1 (patch-mozilla-release_ipc_chromium_src_base_lock__impl__posix.cc) = 11283db62c0a392dc592b1a82c2d9c0788ee11bb SHA1 (patch-mozilla-release_ipc_chromium_src_base_message__pump__libevent.cc) = 49051c927711fd5558f90aa651dccd99a887e95f SHA1 (patch-mozilla-release_ipc_chromium_src_base_platform__thread__posix.cc) = 4ea5441d5dbcfbe71444e2f7eaa412c262c9804a Added files: Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h:1.1 --- /dev/null Sat Aug 3 07:18:18 2019 +++ pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h Sat Aug 3 07:18:18 2019 @@ -0,0 +1,23 @@ +$NetBSD: patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h,v 1.1 2019/08/03 07:18:18 fox Exp $ + +Fixes the internal compiler error in skia Transform_inl.h + +This happens for MIPS 64 and GCC as documented in the code section, +this has been extended for checks in s390x and the i*86 platforms. + +https://bugzilla.mozilla.org/show_bug.cgi?id=1562886 + +PS: Probably remove this once upstream gcc fixes the issue. + +--- mozilla-release/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.orig 2019-08-02 17:49:51.197475983 +0000 ++++ mozilla-release/gfx/skia/skia/third_party/skcms/src/Transform_inl.h +@@ -559,7 +559,8 @@ SI void sample_clut_16(const skcms_A2B* + + // GCC 7.2.0 hits an internal compiler error with -finline-functions (or -O3) + // when targeting MIPS 64, I think attempting to inline clut() into exec_ops(). +-#if 1 && defined(__GNUC__) && !defined(__clang__) && defined(__mips64) ++// s390x and i*86 also hit this with GCC 7.4 and -O2 ++#if 1 && defined(__GNUC__) && !defined(__clang__) && ( defined(__mips64) || defined(__s390x__) || defined( __i586__ ) || defined( __i486__ ) || defined( __i386__ )) + #define MAYBE_NOINLINE __attribute__((noinline)) + #else + #define MAYBE_NOINLINE --_----------=_1564816698271220--