[pkgsrc/trunk]: pkgsrc/x11/alacritty alacritty: apply previous workaround onl...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/22d196dbe1da
branches:  trunk
changeset: 454800:22d196dbe1da
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Jun 20 10:09:35 2021 +0000

description:
alacritty: apply previous workaround only when X11_TYPE is native

diffstat:

 x11/alacritty/Makefile                                |  16 ++++++++++++++--
 x11/alacritty/distinfo                                |   3 +--
 x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs |  16 ----------------
 3 files changed, 15 insertions(+), 20 deletions(-)

diffs (66 lines):

diff -r adaeafdce0bc -r 22d196dbe1da x11/alacritty/Makefile
--- a/x11/alacritty/Makefile    Sun Jun 20 08:51:19 2021 +0000
+++ b/x11/alacritty/Makefile    Sun Jun 20 10:09:35 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/06/20 08:51:19 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2021/06/20 10:09:35 tnn Exp $
 
 DISTNAME=      alacritty-0.8.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=alacritty/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -25,6 +25,18 @@
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
+# This works around XIM errors when RTLD local-binding libX11.
+# But it might also break GPU accelerated mode.
+SUBST_CLASSES+=                rtld
+SUBST_MESSAGE.rtld=    amend RTLD_GLOBAL
+SUBST_STAGE.rtld=      pre-configure
+SUBST_FILES.rtld=      ../vendor/x11-dl-2.18.5/src/link.rs
+SUBST_SED.rtld=                -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g'
+.endif
+
 # The xcb crate depends on any version of python 3.
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 PYTHON_FOR_BUILD_ONLY=         tool
diff -r adaeafdce0bc -r 22d196dbe1da x11/alacritty/distinfo
--- a/x11/alacritty/distinfo    Sun Jun 20 08:51:19 2021 +0000
+++ b/x11/alacritty/distinfo    Sun Jun 20 10:09:35 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/06/20 08:51:19 tnn Exp $
+$NetBSD: distinfo,v 1.7 2021/06/20 10:09:35 tnn Exp $
 
 SHA1 (ab_glyph_rasterizer-0.1.4.crate) = 0ef50d98583486c91fc4d40f2bc819ac2873b139
 RMD160 (ab_glyph_rasterizer-0.1.4.crate) = c3bfaccc51e6d20119128cac07d4a98474fca22f
@@ -764,4 +764,3 @@
 RMD160 (yaml-rust-0.4.5.crate) = 2148b0245a840e26646ae4b0c5f394fd8203ad5b
 SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 Size (yaml-rust-0.4.5.crate) = 47783 bytes
-SHA1 (patch-vendor_x11-dl_src_link.rs) = 773a9ad0ffdbc852a0fbc375475f1a6fa8101e73
diff -r adaeafdce0bc -r 22d196dbe1da x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs
--- a/x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs     Sun Jun 20 08:51:19 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-vendor_x11-dl_src_link.rs,v 1.1 2021/06/20 08:51:19 tnn Exp $
-
-Work around XIM error on NetBSD with native X11.
-https://mail-index.netbsd.org/tech-x11/2021/06/20/msg002210.html
-
---- ../vendor/x11-dl-2.18.5/src/link.rs.orig   2020-01-26 08:06:45.000000000 +0000
-+++ ../vendor/x11-dl-2.18.5/src/link.rs
-@@ -87,7 +87,7 @@ impl DynamicLibrary {
-         },
-       };
- 
--      let handle = libc::dlopen(cname.as_ptr(), libc::RTLD_LAZY);
-+      let handle = libc::dlopen(cname.as_ptr(), libc::RTLD_LAZY | libc::RTLD_GLOBAL);
- 
-       if handle.is_null() {
-         let msg = libc::dlerror();