CVS commit: pkgsrc/x11/alacritty

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Jul 22 18:46:28 UTC 2021

Modified Files:
        pkgsrc/x11/alacritty: Makefile

Log Message:
alacritty: XIM bug workaround no longer necessary on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/alacritty/Makefile

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.9 pkgsrc/x11/alacritty/Makefile:1.10
--- pkgsrc/x11/alacritty/Makefile:1.9   Thu Jul 22 16:16:38 2021
+++ pkgsrc/x11/alacritty/Makefile       Thu Jul 22 18:46:27 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2021/07/22 16:16:38 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2021/07/22 18:46:27 tnn Exp $
 
 DISTNAME=      alacritty-0.8.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=alacritty/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -26,10 +26,10 @@ RUSTFLAGS+= -C link-arg=${COMPILER_RPATH
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
+.if ${OPSYS} == "NetBSD" && exists(${X11BASE}/lib/X11/locale/lib/common/xlcUTF8Load.so)
 # This works around XIM errors when RTLD local-binding libX11.
-# See: https://mail-index.netbsd.org/tech-x11/2021/07/12/msg002222.html
-# But it might also break GPU accelerated mode.
+# https://mail-index.netbsd.org/tech-x11/2021/07/12/msg002222.html
+# https://mail-index.netbsd.org/source-changes/2021/07/13/msg130884.html
 SUBST_CLASSES+=                rtld
 SUBST_MESSAGE.rtld=    amend RTLD_GLOBAL
 SUBST_STAGE.rtld=      pre-configure