CVS commit: pkgsrc/www/palemoon

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

Module Name:    pkgsrc
Committed By:   abs
Date:           Sat Jul 27 14:04:16 UTC 2024

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

Log Message:
Avoid X_CopyArea BadDrawable crash on NetBSD

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/palemoon/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/palemoon/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_nsX11ErrorHandler.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.1 pkgsrc/www/palemoon/Makefile:1.2
--- pkgsrc/www/palemoon/Makefile:1.1    Fri Jul 26 08:05:23 2024
+++ pkgsrc/www/palemoon/Makefile        Sat Jul 27 14:04:15 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2024/07/26 08:05:23 nia Exp $
+# $NetBSD: Makefile,v 1.2 2024/07/27 14:04:15 abs Exp $
 # for build instructions see
 # https://developer.palemoon.org/build/linux/
 
 PKGNAME=       palemoon-33.2.1
+PKGREVISION=   1
 CATEGORIES=    www
 
 DIST_SUBDIR=   palemoon-${PKGVERSION_NOREV}

Index: pkgsrc/www/palemoon/distinfo
diff -u pkgsrc/www/palemoon/distinfo:1.2 pkgsrc/www/palemoon/distinfo:1.3
--- pkgsrc/www/palemoon/distinfo:1.2    Fri Jul 26 09:57:46 2024
+++ pkgsrc/www/palemoon/distinfo        Sat Jul 27 14:04:15 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2024/07/26 09:57:46 wiz Exp $
+$NetBSD: distinfo,v 1.3 2024/07/27 14:04:15 abs Exp $
 
 BLAKE2s (palemoon-33.2.1/palemoon.tar.gz) = 5963bc12be28b07ded0558bb20bc27108f3aebd1895e4730e6a6ac2013a7ae9d
 SHA512 (palemoon-33.2.1/palemoon.tar.gz) = 72e6a4858af679a88fd079ed28020a8d845366d0b3ea5cb00b5a17dd9d6b7a4171397ceaa156b3e9f1d185e39e7ba8c82864641bd21f704350ef4b6473cc693d
@@ -21,3 +21,4 @@ SHA1 (patch-platform_media_libcubeb_src_
 SHA1 (patch-platform_old-configure.in) = 05711cd91f7adca8c7325d01dc6e6553ce5bedb5
 SHA1 (patch-platform_security_generate__mapfile.py) = ae457a8e85c4ce95014dff442b8afd0e20ded543
 SHA1 (patch-platform_toolkit_xre_glxtest.cpp) = f8bd5705f5cf87651df59ba22f4566136e3bc4ef
+SHA1 (patch-platform_toolkit_xre_nsX11ErrorHandler.cpp) = 164d93a5b1aaeba15b524fdaef0483b4a9400ac1

Added files:

Index: pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_nsX11ErrorHandler.cpp
diff -u /dev/null pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_nsX11ErrorHandler.cpp:1.1
--- /dev/null   Sat Jul 27 14:04:16 2024
+++ pkgsrc/www/palemoon/patches/patch-platform_toolkit_xre_nsX11ErrorHandler.cpp        Sat Jul 27 14:04:15 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-platform_toolkit_xre_nsX11ErrorHandler.cpp,v 1.1 2024/07/27 14:04:15 abs Exp $
+
+Switch NS_RUNTIMEABORT to NS_WARNING to avoid crash seen on NetBSD with
+"X_CopyArea: BadDrawable (invalid Pixmap or Window parameter);"
+
+--- platform/toolkit/xre/nsX11ErrorHandler.cpp.orig    2024-07-10 08:54:53.000000000 +0000
++++ platform/toolkit/xre/nsX11ErrorHandler.cpp
+@@ -131,7 +131,14 @@ X11Error(Display *display, XErrorEvent *
+ #endif
+ #endif
+ 
+-  NS_RUNTIMEABORT(notes.get());
++  if (message.EqualsLiteral("62")) { // 62 == X_CopyArea
++    // Avoid NS_RUNTIMEABORT seen on NetBSD with
++    // "X_CopyArea: BadDrawable (invalid Pixmap or Window parameter);"
++    NS_WARNING(notes.get());
++  } else {
++    NS_RUNTIMEABORT(notes.get());
++  }
++
+   return 0; // not reached
+ }
+ }