CVS commit: pkgsrc/www/firefox/files

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Fri Jun  9 21:48:11 UTC 2023

Modified Files:
        pkgsrc/www/firefox/files: firefox.sh

Log Message:
Apply check for fixed libGL.so to NetBSD workaround

copy additional check from szyszka, but with extra comment for
the bonus firefox issue


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox/files/firefox.sh

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/files/firefox.sh
diff -u pkgsrc/www/firefox/files/firefox.sh:1.1 pkgsrc/www/firefox/files/firefox.sh:1.2
--- pkgsrc/www/firefox/files/firefox.sh:1.1     Tue May 30 08:37:37 2023
+++ pkgsrc/www/firefox/files/firefox.sh Fri Jun  9 21:48:11 2023
@@ -1,9 +1,14 @@
 #!/bin/sh
-if [ -f /usr/X11R7/lib/libEGL.so ] && [ -z "$LD_PRELOAD" ]; then
+if [ -f /usr/X11R7/lib/libEGL.so ] && [ -z "$LD_PRELOAD" ] && \
+  nm /usr/X11R7/lib/libGL.so | grep -Fq "B _glapi_tls_Dispatch"; then
     # Temporary workaround for PR#57445
     # This may not avoid a crash 100% of the time, but changes at least some
     # cases of 100% crash on startup to "have not yet seen crash on startup"
     echo "Applying libEGL LD_PRELOAD workaround for NetBSD" >&2
     export LD_PRELOAD=/usr/X11R7/lib/libEGL.so
+    # Note that there is an _additional_ issue with firefox >= 111 that
+    # needs to be addressed, and that is worked around by disabling webgl
+    # by default, but its not even worth looking at that on a system without
+    # the fixed libGL
 fi
 exec /usr/pkg/lib/firefox/firefox "$@"