CVS commit: pkgsrc/x11/alacritty

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Jun 20 10:09:36 UTC 2021

Modified Files:
        pkgsrc/x11/alacritty: Makefile distinfo
Removed Files:
        pkgsrc/x11/alacritty/patches: patch-vendor_x11-dl_src_link.rs

Log Message:
alacritty: apply previous workaround only when X11_TYPE is native


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/alacritty/Makefile \
    pkgsrc/x11/alacritty/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/alacritty/Makefile
diff -u pkgsrc/x11/alacritty/Makefile:1.6 pkgsrc/x11/alacritty/Makefile:1.7
--- pkgsrc/x11/alacritty/Makefile:1.6   Sun Jun 20 08:51:19 2021
+++ pkgsrc/x11/alacritty/Makefile       Sun Jun 20 10:09:35 2021
@@ -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
 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
Index: pkgsrc/x11/alacritty/distinfo
diff -u pkgsrc/x11/alacritty/distinfo:1.6 pkgsrc/x11/alacritty/distinfo:1.7
--- pkgsrc/x11/alacritty/distinfo:1.6   Sun Jun 20 08:51:19 2021
+++ pkgsrc/x11/alacritty/distinfo       Sun Jun 20 10:09:35 2021
@@ -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 @@ SHA1 (yaml-rust-0.4.5.crate) = de9261ecb
 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