CVS commit: pkgsrc/www/firefox

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri May 31 10:38:59 UTC 2019

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
Added Files:
        pkgsrc/www/firefox/patches: patch-gfx_gl_GLContextProviderGLX.cpp

Log Message:
firefox: tolerate libGL.so with a different major number on netbsd

Fixes WebGL. PR pkg/54247
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.352 -r1.353 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/www/firefox/patches/patch-gfx_gl_GLContextProviderGLX.cpp

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/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.377 pkgsrc/www/firefox/Makefile:1.378
--- pkgsrc/www/firefox/Makefile:1.377   Mon May 27 14:19:26 2019
+++ pkgsrc/www/firefox/Makefile Fri May 31 10:38:59 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.377 2019/05/27 14:19:26 tsutsui Exp $
+# $NetBSD: Makefile,v 1.378 2019/05/31 10:38:59 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            67.0
 MOZ_BRANCH_MINOR=      
-PKGREVISION=           1
+PKGREVISION=           2
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.352 pkgsrc/www/firefox/distinfo:1.353
--- pkgsrc/www/firefox/distinfo:1.352   Mon May 27 14:19:26 2019
+++ pkgsrc/www/firefox/distinfo Fri May 31 10:38:59 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.352 2019/05/27 14:19:26 tsutsui Exp $
+$NetBSD: distinfo,v 1.353 2019/05/31 10:38:59 maya Exp $
 
 SHA1 (firefox-67.0.source.tar.xz) = c7a5f3182999e5efed5c714653adc538bb75aa53
 RMD160 (firefox-67.0.source.tar.xz) = 48e96058ef1bfb2939d8da93fd6807d212d0df4e
@@ -11,6 +11,7 @@ SHA1 (patch-dom_base_nsAttrName.h) = ac7
 SHA1 (patch-dom_media_CubebUtils.cpp) = cafbfb2781967ebe96b4f77b8a0630fff537fd02
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 383f25417ad74f3ef8034437b52fc23f3bcbfc24
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
+SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 02a212618df146b2b56f5f0aaf282eafa1df6653
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c

Added files:

Index: pkgsrc/www/firefox/patches/patch-gfx_gl_GLContextProviderGLX.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-gfx_gl_GLContextProviderGLX.cpp:1.3
--- /dev/null   Fri May 31 10:38:59 2019
+++ pkgsrc/www/firefox/patches/patch-gfx_gl_GLContextProviderGLX.cpp    Fri May 31 10:38:59 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-gfx_gl_GLContextProviderGLX.cpp,v 1.3 2019/05/31 10:38:59 maya Exp $
+
+NetBSD doesn't ship libGL.so.1 due to a major bump. Look for the unversioned
+name.
+
+--- gfx/gl/GLContextProviderGLX.cpp.orig       2019-05-17 00:33:26.000000000 +0000
++++ gfx/gl/GLContextProviderGLX.cpp
+@@ -80,7 +80,7 @@ bool GLXLibrary::EnsureInitialized() {
+     // which trigger glibc bug
+     // http://sourceware.org/bugzilla/show_bug.cgi?id=12225
+     const char* libGLfilename = "libGL.so.1";
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+     libGLfilename = "libGL.so";
+ #endif
+