CVS commit: pkgsrc/www/firefox

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Aug 29 09:36:16 UTC 2021

Modified Files:
        pkgsrc/www/firefox: distinfo
        pkgsrc/www/firefox/patches: patch-gfx_wr_swgl_build.rs

Log Message:
www/firefox: fix a broken patch file

Quick fix for "make patch" failure.


To generate a diff of this commit:
cvs rdiff -u -r1.445 -r1.446 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/firefox/patches/patch-gfx_wr_swgl_build.rs

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.445 pkgsrc/www/firefox/distinfo:1.446
--- pkgsrc/www/firefox/distinfo:1.445   Fri Aug 27 01:04:49 2021
+++ pkgsrc/www/firefox/distinfo Sun Aug 29 09:36:16 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.445 2021/08/27 01:04:49 manu Exp $
+$NetBSD: distinfo,v 1.446 2021/08/29 09:36:16 taca Exp $
 
 SHA1 (firefox-91.0.2.source.tar.xz) = 953eb52799ae1da9ea63e154e1b3194c10bca8ce
 RMD160 (firefox-91.0.2.source.tar.xz) = 22b066a0f891aca3c9512501b01e556a6b5414e5
@@ -19,7 +19,7 @@ SHA1 (patch-gfx_angle_checkout_src_compi
 SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
 SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = f6f8996f0818a1b890698c7cc5054d49cb1e8924
-SHA1 (patch-gfx_wr_swgl_build.rs) = b0fddbcf1d3cebffc28caa86e431df7be18bf1ee
+SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836

Index: pkgsrc/www/firefox/patches/patch-gfx_wr_swgl_build.rs
diff -u pkgsrc/www/firefox/patches/patch-gfx_wr_swgl_build.rs:1.2 pkgsrc/www/firefox/patches/patch-gfx_wr_swgl_build.rs:1.3
--- pkgsrc/www/firefox/patches/patch-gfx_wr_swgl_build.rs:1.2   Fri Aug 27 01:04:49 2021
+++ pkgsrc/www/firefox/patches/patch-gfx_wr_swgl_build.rs       Sun Aug 29 09:36:16 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-gfx_wr_swgl_build.rs,v 1.2 2021/08/27 01:04:49 manu Exp $
+$NetBSD: patch-gfx_wr_swgl_build.rs,v 1.3 2021/08/29 09:36:16 taca Exp $
 
 Work around an internal compiler error on i386 when optimization is enabled:
 
@@ -9,10 +9,9 @@ Work around an internal compiler error o
   cargo:warning=                    ^~~~~~~~~~~~~~~
 
 
---- gfx/wr/swgl/build.rs.orig  2021-08-24 17:33:31.320811394 +0200
-+++ gfx/wr/swgl/build.rs       2021-08-25 03:00:14.918972216 +0200
-@@ -195,8 +195,16 @@
-                  .flag("-mrecip=none");
+--- gfx/wr/swgl/build.rs.orig  2021-08-23 14:57:16.000000000 +0000
++++ gfx/wr/swgl/build.rs
+@@ -196,6 +196,13 @@ fn main() {
          }
      }
  
@@ -26,4 +25,3 @@ Work around an internal compiler error o
      build.file("src/gl.cc")
          .define("_GLIBCXX_USE_CXX11_ABI", Some("0"))
          .include(shader_dir)
-         .include("src")