CVS commit: pkgsrc/www/palemoon

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Aug  6 20:58:11 UTC 2024

Modified Files:
        pkgsrc/www/palemoon: Makefile distinfo
        pkgsrc/www/palemoon/patches: patch-platform_toolkit_xre_glxtest.cpp

Log Message:
palemoon: Don't attempt to dlopen gtk3, causes issues on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/palemoon/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/palemoon/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_glxtest.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/palemoon/Makefile
diff -u pkgsrc/www/palemoon/Makefile:1.5 pkgsrc/www/palemoon/Makefile:1.6
--- pkgsrc/www/palemoon/Makefile:1.5    Tue Aug  6 09:58:26 2024
+++ pkgsrc/www/palemoon/Makefile        Tue Aug  6 20:58:11 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2024/08/06 09:58:26 nia Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/06 20:58:11 nia Exp $
 # for build instructions see
 # https://developer.palemoon.org/build/linux/
 
 PKGNAME=       palemoon-33.2.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 
 DIST_SUBDIR=   palemoon-${PKGVERSION_NOREV}

Index: pkgsrc/www/palemoon/distinfo
diff -u pkgsrc/www/palemoon/distinfo:1.7 pkgsrc/www/palemoon/distinfo:1.8
--- pkgsrc/www/palemoon/distinfo:1.7    Mon Aug  5 22:29:56 2024
+++ pkgsrc/www/palemoon/distinfo        Tue Aug  6 20:58:11 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2024/08/05 22:29:56 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/08/06 20:58:11 nia Exp $
 
 BLAKE2s (palemoon-33.2.1/palemoon.tar.gz) = 5963bc12be28b07ded0558bb20bc27108f3aebd1895e4730e6a6ac2013a7ae9d
 SHA512 (palemoon-33.2.1/palemoon.tar.gz) = 72e6a4858af679a88fd079ed28020a8d845366d0b3ea5cb00b5a17dd9d6b7a4171397ceaa156b3e9f1d185e39e7ba8c82864641bd21f704350ef4b6473cc693d
@@ -29,7 +29,7 @@ SHA1 (patch-platform_old-configure.in) =
 SHA1 (patch-platform_security_generate__mapfile.py) = ae457a8e85c4ce95014dff442b8afd0e20ded543
 SHA1 (patch-platform_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 73b57772d29b0567c0aa1faea8a3f345dbc0488a
 SHA1 (patch-platform_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops__internals__arm__gcc.h) = 2a5ccc95fb5860b1be97947f3aee8307f4a25bc1
-SHA1 (patch-platform_toolkit_xre_glxtest.cpp) = f8bd5705f5cf87651df59ba22f4566136e3bc4ef
+SHA1 (patch-platform_toolkit_xre_glxtest.cpp) = dbcc6dd96317305093b5af78582fc3c108b1a69b
 SHA1 (patch-platform_toolkit_xre_nsX11ErrorHandler.cpp) = 164d93a5b1aaeba15b524fdaef0483b4a9400ac1
 SHA1 (patch-platform_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 5b6a5c6eea2668cc5eaaf775400c382114876d86
 SHA1 (patch-platform_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = de7188f7ac09fd3d4a65968a12ae324b3a0415c4

Index: pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_glxtest.cpp
diff -u pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_glxtest.cpp:1.1 pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_glxtest.cpp:1.2
--- pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_glxtest.cpp:1.1      Fri Jul 26 08:05:23 2024
+++ pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_glxtest.cpp  Tue Aug  6 20:58:11 2024
@@ -1,9 +1,20 @@
-$NetBSD: patch-platform_toolkit_xre_glxtest.cpp,v 1.1 2024/07/26 08:05:23 nia Exp $
+$NetBSD: patch-platform_toolkit_xre_glxtest.cpp,v 1.2 2024/08/06 20:58:11 nia Exp $
 
-NetBSD does not have the libGL.so.1 version.
+- We are not building with Gtk+3.  Doing this dlopen() causes a SIGTRAP
+  in NetBSD libc in _rtld_unref_dag.
+- NetBSD does not have the libGL.so.1 version.
 
---- platform/toolkit/xre/glxtest.cpp.orig      2024-07-25 22:12:30.934622714 +0000
+--- platform/toolkit/xre/glxtest.cpp.orig      2024-07-10 08:54:53.000000000 +0000
 +++ platform/toolkit/xre/glxtest.cpp
+@@ -127,7 +127,7 @@ void glxtest()
+     dup2(fd, i);
+   close(fd);
+ 
+-#if MOZ_WIDGET_GTK == 2
++#if 0
+   // On Gtk+2 builds, try to get the Gtk+3 version if it's installed, and
+   // use that in nsSystemInfo for secondaryLibrary. Better safe than sorry,
+   // we want to load the Gtk+3 library in a subprocess, and since we already
 @@ -161,7 +161,7 @@ void glxtest()
      fatal_error("The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");