Thu Jul 22 18:46:28 2021 UTC ()
alacritty: XIM bug workaround no longer necessary on NetBSD-current


(tnn)
diff -r1.9 -r1.10 pkgsrc/x11/alacritty/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/x11/alacritty/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/alacritty/Makefile 2021/07/22 16:16:38 1.9
+++ pkgsrc/x11/alacritty/Makefile 2021/07/22 18:46:27 1.10
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: Makefile,v 1.9 2021/07/22 16:16:38 tnn Exp $ 1# $NetBSD: Makefile,v 1.10 2021/07/22 18:46:27 tnn Exp $
2 2
3DISTNAME= alacritty-0.8.0 3DISTNAME= alacritty-0.8.0
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=alacritty/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=alacritty/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/alacritty/alacritty 10HOMEPAGE= https://github.com/alacritty/alacritty
11COMMENT= Cross-platform, GPU-accelerated terminal emulator 11COMMENT= Cross-platform, GPU-accelerated terminal emulator
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 14BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
15BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 15BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
16 16
17.include "cargo-depends.mk" 17.include "cargo-depends.mk"
18 18
19USE_LANGUAGES+= c c++ 19USE_LANGUAGES+= c c++
20USE_TOOLS+= gmake pkg-config # for fontconfig-sys 20USE_TOOLS+= gmake pkg-config # for fontconfig-sys
21 21
22MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q} 22MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
23RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib 23RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
24RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib 24RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib
25RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib 25RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native" 29.if ${OPSYS} == "NetBSD" && exists(${X11BASE}/lib/X11/locale/lib/common/xlcUTF8Load.so)
30# This works around XIM errors when RTLD local-binding libX11. 30# This works around XIM errors when RTLD local-binding libX11.
31# See: https://mail-index.netbsd.org/tech-x11/2021/07/12/msg002222.html 31# https://mail-index.netbsd.org/tech-x11/2021/07/12/msg002222.html
32# But it might also break GPU accelerated mode. 32# https://mail-index.netbsd.org/source-changes/2021/07/13/msg130884.html
33SUBST_CLASSES+= rtld 33SUBST_CLASSES+= rtld
34SUBST_MESSAGE.rtld= amend RTLD_GLOBAL 34SUBST_MESSAGE.rtld= amend RTLD_GLOBAL
35SUBST_STAGE.rtld= pre-configure 35SUBST_STAGE.rtld= pre-configure
36SUBST_FILES.rtld= ../vendor/x11-dl-2.18.5/src/link.rs 36SUBST_FILES.rtld= ../vendor/x11-dl-2.18.5/src/link.rs
37SUBST_SED.rtld= -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g' 37SUBST_SED.rtld= -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g'
38.endif 38.endif
39 39
40# The xcb crate depends on any version of python 3. 40# The xcb crate depends on any version of python 3.
41PYTHON_VERSIONS_INCOMPATIBLE= 27 41PYTHON_VERSIONS_INCOMPATIBLE= 27
42PYTHON_FOR_BUILD_ONLY= tool 42PYTHON_FOR_BUILD_ONLY= tool
43 43
44INSTALLATION_DIRS= bin share/examples/alacritty 44INSTALLATION_DIRS= bin share/examples/alacritty
45 45