CVS commit: pkgsrc/www/firefox

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Tue May 30 08:37:37 UTC 2023

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

Log Message:
Add temporary workaround for PR#57445 for native X11 NetBSD

Calling "export LD_PRELOAD=/usr/X11R7/lib/libEGL.so" before starting firefox
avoids the crash on startup in many cases

To be removed once PR#57445 is resolved (or restricted to non fixed installs)


To generate a diff of this commit:
cvs rdiff -u -r1.554 -r1.555 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r0 -r1.1 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/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.554 pkgsrc/www/firefox/Makefile:1.555
--- pkgsrc/www/firefox/Makefile:1.554   Sat May  6 19:09:50 2023
+++ pkgsrc/www/firefox/Makefile Tue May 30 08:37:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.554 2023/05/06 19:09:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.555 2023/05/30 08:37:37 abs Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            112.0
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
@@ -166,7 +166,11 @@ post-build:
 INSTALLATION_DIRS+=    share/applications
 
 post-install:
+.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
+       ${INSTALL_SCRIPT} ${FILESDIR}/firefox.sh ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+.else
        ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+.endif
        ${ECHO} '${PREFIX}/lib/${MOZILLA}/${MOZILLA} "$$@"' >> \
                ${DESTDIR}${PREFIX}/bin/${MOZILLA}
        ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}

Added files:

Index: pkgsrc/www/firefox/files/firefox.sh
diff -u /dev/null pkgsrc/www/firefox/files/firefox.sh:1.1
--- /dev/null   Tue May 30 08:37:37 2023
+++ pkgsrc/www/firefox/files/firefox.sh Tue May 30 08:37:37 2023
@@ -0,0 +1,9 @@
+#!/bin/sh
+if [ -f /usr/X11R7/lib/libEGL.so ] && [ -z "$LD_PRELOAD" ]; 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
+fi
+exec /usr/pkg/lib/firefox/firefox "$@"