Sat Aug 3 07:18:18 2019 UTC ()
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


(fox)
diff -r1.9 -r1.10 pkgsrc/www/cliqz/distinfo
diff -r0 -r1.1 pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h
cvs diff -r1.9 -r1.10 pkgsrc/www/cliqz/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/cliqz/Attic/distinfo 2019/07/31 01:35:27 1.9
+++ pkgsrc/www/cliqz/Attic/distinfo 2019/08/03 07:18:17 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.9 2019/07/31 01:35:27 fox Exp $ 1$NetBSD: distinfo,v 1.10 2019/08/03 07:18:17 fox Exp $
2 2
3SHA1 (cliqz-1.28.0/adult-domains.bin) = 9dd0756b67aa17357ef61f3bea8303dad63540a1 3SHA1 (cliqz-1.28.0/adult-domains.bin) = 9dd0756b67aa17357ef61f3bea8303dad63540a1
4RMD160 (cliqz-1.28.0/adult-domains.bin) = 78f46f31b27b4172a6aa6125619f92f751172a75 4RMD160 (cliqz-1.28.0/adult-domains.bin) = 78f46f31b27b4172a6aa6125619f92f751172a75
5SHA512 (cliqz-1.28.0/adult-domains.bin) = d0229800e0e1bf6d60e5510d2995a8ba800ab933adc0de44791c2b4a9ca39de7ad6cfe9b9563bdac67ecbc96c48d1277866da94d6ea635e1435a9e95a63dff08 5SHA512 (cliqz-1.28.0/adult-domains.bin) = d0229800e0e1bf6d60e5510d2995a8ba800ab933adc0de44791c2b4a9ca39de7ad6cfe9b9563bdac67ecbc96c48d1277866da94d6ea635e1435a9e95a63dff08
6Size (cliqz-1.28.0/adult-domains.bin) = 528392 bytes 6Size (cliqz-1.28.0/adult-domains.bin) = 528392 bytes
7SHA1 (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = f3d216763cd777c15d52945d1715a64656e61c57 7SHA1 (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = f3d216763cd777c15d52945d1715a64656e61c57
8RMD160 (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = a9831e1dafaa48ae75f6558c3114b3ac7c0c929e 8RMD160 (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = a9831e1dafaa48ae75f6558c3114b3ac7c0c929e
9SHA512 (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = 1d982fba382ea87e6d742e74fba1848244da9939f4ec8aaa652f65f9b237641157c7934d85f194d302ec4b30e20c35ece24f457a1bcd11e6a7ef6d4473a194f3 9SHA512 (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = 1d982fba382ea87e6d742e74fba1848244da9939f4ec8aaa652f65f9b237641157c7934d85f194d302ec4b30e20c35ece24f457a1bcd11e6a7ef6d4473a194f3
10Size (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = 496805258 bytes 10Size (cliqz-1.28.0/cliqz-1.28.0.tar.gz) = 496805258 bytes
11SHA1 (cliqz-1.28.0/cliqz@cliqz.com.xpi) = b9a10acda6e5cde4529aefca23524ce2288f64a0 11SHA1 (cliqz-1.28.0/cliqz@cliqz.com.xpi) = b9a10acda6e5cde4529aefca23524ce2288f64a0
12RMD160 (cliqz-1.28.0/cliqz@cliqz.com.xpi) = 8608d8f00bec98e731cfe379d15d6d5124d02b5b 12RMD160 (cliqz-1.28.0/cliqz@cliqz.com.xpi) = 8608d8f00bec98e731cfe379d15d6d5124d02b5b
13SHA512 (cliqz-1.28.0/cliqz@cliqz.com.xpi) = 9478ef23717596a0ed8076702ce9cd798675e49bd5ba00efa265cc8cd62ea10e4082f5863809090f357f6128821ff27cf173ea1f47b80404f7281d212479c709 13SHA512 (cliqz-1.28.0/cliqz@cliqz.com.xpi) = 9478ef23717596a0ed8076702ce9cd798675e49bd5ba00efa265cc8cd62ea10e4082f5863809090f357f6128821ff27cf173ea1f47b80404f7281d212479c709
14Size (cliqz-1.28.0/cliqz@cliqz.com.xpi) = 7794918 bytes 14Size (cliqz-1.28.0/cliqz@cliqz.com.xpi) = 7794918 bytes
@@ -18,24 +18,25 @@ SHA512 (cliqz-1.28.0/gdprtool@cliqz.com. @@ -18,24 +18,25 @@ SHA512 (cliqz-1.28.0/gdprtool@cliqz.com.
18Size (cliqz-1.28.0/gdprtool@cliqz.com.xpi) = 222806 bytes 18Size (cliqz-1.28.0/gdprtool@cliqz.com.xpi) = 222806 bytes
19SHA1 (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = 591d44a9e45551c3978a649814df4f65e267cf0a 19SHA1 (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = 591d44a9e45551c3978a649814df4f65e267cf0a
20RMD160 (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = 6ad1943bc8b075e2e02469344b44cda64369ba59 20RMD160 (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = 6ad1943bc8b075e2e02469344b44cda64369ba59
21SHA512 (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = c9449821ce55c647969d6c877dacc21f50096f574403092e39fee2eb2df6f0ae69575bc5bd20ae7473b28cb67635c7dc3645eedc0a758ee9e1e5072b4d5caaf5 21SHA512 (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = c9449821ce55c647969d6c877dacc21f50096f574403092e39fee2eb2df6f0ae69575bc5bd20ae7473b28cb67635c7dc3645eedc0a758ee9e1e5072b4d5caaf5
22Size (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = 1765469 bytes 22Size (cliqz-1.28.0/https-everywhere@cliqz.com.xpi) = 1765469 bytes
23SHA1 (patch-cliqz__env.sh) = 6f7aba36875e86960a8fd674fdff2f576d9b479d 23SHA1 (patch-cliqz__env.sh) = 6f7aba36875e86960a8fd674fdff2f576d9b479d
24SHA1 (patch-mozilla-release_browser_app_profile_firefox.js) = e76a7a023a72fe9c5c621da416a8be3111ed8894 24SHA1 (patch-mozilla-release_browser_app_profile_firefox.js) = e76a7a023a72fe9c5c621da416a8be3111ed8894
25SHA1 (patch-mozilla-release_browser_config_cliqz.mozconfig) = f59e4c0405ed2f8a5fbb0f3e3ce7c62206c1bca8 25SHA1 (patch-mozilla-release_browser_config_cliqz.mozconfig) = f59e4c0405ed2f8a5fbb0f3e3ce7c62206c1bca8
26SHA1 (patch-mozilla-release_config_rules.mk) = f78ba7e312616c3b347d584d9e37ac380621248b 26SHA1 (patch-mozilla-release_config_rules.mk) = f78ba7e312616c3b347d584d9e37ac380621248b
27SHA1 (patch-mozilla-release_dom_base_nsAttrName.h) = 5583d7f6aafb29f4b8e8be794902adf2850e1b5f 27SHA1 (patch-mozilla-release_dom_base_nsAttrName.h) = 5583d7f6aafb29f4b8e8be794902adf2850e1b5f
28SHA1 (patch-mozilla-release_gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = c696b0dc6d2f25773ac4d928857b00b4f3799838 28SHA1 (patch-mozilla-release_gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = c696b0dc6d2f25773ac4d928857b00b4f3799838
29SHA1 (patch-mozilla-release_gfx_angle_checkout_src_compiler_translator_InfoSink.h) = e5f9cb8fac413267546a268ca0e50611b9965542 29SHA1 (patch-mozilla-release_gfx_angle_checkout_src_compiler_translator_InfoSink.h) = e5f9cb8fac413267546a268ca0e50611b9965542
30SHA1 (patch-mozilla-release_gfx_gl_GLContextProviderGLX.cpp) = 6153772492f099e806378b9f2d79c41923b1cefa 30SHA1 (patch-mozilla-release_gfx_gl_GLContextProviderGLX.cpp) = 6153772492f099e806378b9f2d79c41923b1cefa
 31SHA1 (patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h) = 6d7a7c0ebde552ea85ff6c90e71c71c9628091e9
31SHA1 (patch-mozilla-release_ipc_chromium_src_base_lock__impl__posix.cc) = 11283db62c0a392dc592b1a82c2d9c0788ee11bb 32SHA1 (patch-mozilla-release_ipc_chromium_src_base_lock__impl__posix.cc) = 11283db62c0a392dc592b1a82c2d9c0788ee11bb
32SHA1 (patch-mozilla-release_ipc_chromium_src_base_message__pump__libevent.cc) = 49051c927711fd5558f90aa651dccd99a887e95f 33SHA1 (patch-mozilla-release_ipc_chromium_src_base_message__pump__libevent.cc) = 49051c927711fd5558f90aa651dccd99a887e95f
33SHA1 (patch-mozilla-release_ipc_chromium_src_base_platform__thread__posix.cc) = 4ea5441d5dbcfbe71444e2f7eaa412c262c9804a 34SHA1 (patch-mozilla-release_ipc_chromium_src_base_platform__thread__posix.cc) = 4ea5441d5dbcfbe71444e2f7eaa412c262c9804a
34SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore.h) = 741a8fc9eb83bd58415d70a3be1718ccd8b8c888 35SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore.h) = 741a8fc9eb83bd58415d70a3be1718ccd8b8c888
35SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore__posix.cpp) = be74788a5bafcf306438cd18afc3e40586038997 36SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore__posix.cpp) = be74788a5bafcf306438cd18afc3e40586038997
36SHA1 (patch-mozilla-release_ipc_glue_GeckoChildProcessHost.cpp) = 2667be0de782205e62a7b0a5359de83223bd4fc3 37SHA1 (patch-mozilla-release_ipc_glue_GeckoChildProcessHost.cpp) = 2667be0de782205e62a7b0a5359de83223bd4fc3
37SHA1 (patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp) = c439a1612f8d8ce4ceae5bbbff164cfc6e90e525 38SHA1 (patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp) = c439a1612f8d8ce4ceae5bbbff164cfc6e90e525
38SHA1 (patch-mozilla-release_toolkit_modules_subprocess_subprocess__shared__unix.js) = d72e47521ed87cf00a01981de15d8512fc2b43b8 39SHA1 (patch-mozilla-release_toolkit_modules_subprocess_subprocess__shared__unix.js) = d72e47521ed87cf00a01981de15d8512fc2b43b8
39SHA1 (patch-mozilla-release_toolkit_xre_glxtest.cpp) = b999e79dbda56914d25341e5dd09c4b5bed8d87c 40SHA1 (patch-mozilla-release_toolkit_xre_glxtest.cpp) = b999e79dbda56914d25341e5dd09c4b5bed8d87c
40SHA1 (patch-mozilla-release_xpcom_base_nscore.h) = c1a72f0ea63aacde6dbe321031e82aec99d4350f 41SHA1 (patch-mozilla-release_xpcom_base_nscore.h) = c1a72f0ea63aacde6dbe321031e82aec99d4350f
41SHA1 (patch-mozilla-release_xpcom_build_BinaryPath.h) = a351eed0681872d50193a0232e61752c223026d1 42SHA1 (patch-mozilla-release_xpcom_build_BinaryPath.h) = a351eed0681872d50193a0232e61752c223026d1
File Added: pkgsrc/www/cliqz/patches/Attic/patch-mozilla-release_gfx_skia_skia_third__party_skcms_src_Transform__inl.h
$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