CVS commit: pkgsrc/www/firefox

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Mon Aug 12 01:04:38 UTC 2019

Modified Files:
        pkgsrc/www/firefox: distinfo
Added Files:
        pkgsrc/www/firefox/patches:
            patch-gfx_skia_skia_third__party_skcms_src_Transform__inl.h

Log Message:
firefox: fix ICE on NetBSD/i386 8.1 build. (PR pkg/54383)

Thanks to Santhosh Raju for information of the upstream fix.


To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-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.

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.362 pkgsrc/www/firefox/distinfo:1.363
--- pkgsrc/www/firefox/distinfo:1.362   Wed Jul 24 13:52:52 2019
+++ pkgsrc/www/firefox/distinfo Mon Aug 12 01:04:38 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.362 2019/07/24 13:52:52 ryoon Exp $
+$NetBSD: distinfo,v 1.363 2019/08/12 01:04:38 tsutsui Exp $
 
 SHA1 (firefox-68.0.1.source.tar.xz) = 67ff91a5eba98495e3f44c2539780f0bc54a0123
 RMD160 (firefox-68.0.1.source.tar.xz) = 646c4962b7719a7f9c7e9c933ef9f6166ffcfb60
@@ -13,6 +13,7 @@ SHA1 (patch-gfx_angle_checkout_src_commo
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
+SHA1 (patch-gfx_skia_skia_third__party_skcms_src_Transform__inl.h) = 8a922748ac7fecf7f2ce47e5a7e761b2d1d2d94c
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658

Added files:

Index: pkgsrc/www/firefox/patches/patch-gfx_skia_skia_third__party_skcms_src_Transform__inl.h
diff -u /dev/null pkgsrc/www/firefox/patches/patch-gfx_skia_skia_third__party_skcms_src_Transform__inl.h:1.1
--- /dev/null   Mon Aug 12 01:04:38 2019
+++ pkgsrc/www/firefox/patches/patch-gfx_skia_skia_third__party_skcms_src_Transform__inl.h      Mon Aug 12 01:04:38 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-gfx_skia_skia_third__party_skcms_src_Transform__inl.h,v 1.1 2019/08/12 01:04:38 tsutsui Exp $
+
+- pull upstream change to fix ICE on NetBSD/i386 8.1 build (PR pkg/54383)
+ https://hg.mozilla.org/releases/mozilla-esr68/rev/420c07d42512
+
+--- gfx/skia/skia/third_party/skcms/src/Transform_inl.h.orig   2019-07-17 20:51:26.000000000 +0000
++++ gfx/skia/skia/third_party/skcms/src/Transform_inl.h
+@@ -559,7 +559,7 @@ 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)
++#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