Wed Jan 26 00:24:22 2022 UTC ()
x11/alacritty: Update SUBST_FILES for the XIM bug workaround

The vendored x11-dl crate was updated to version 2.19.1 in alacritty 0.10.0
and so the build was failing on NetBSD 9.2, using base X due to the outdated
version being referenced.


(tpaul)
diff -r1.14 -r1.15 pkgsrc/x11/alacritty/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/x11/alacritty/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/alacritty/Makefile 2022/01/23 16:14:24 1.14
+++ pkgsrc/x11/alacritty/Makefile 2022/01/26 00:24:22 1.15
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.14 2022/01/23 16:14:24 pin Exp $ 1# $NetBSD: Makefile,v 1.15 2022/01/26 00:24:22 tpaul Exp $
2 2
3DISTNAME= alacritty-0.10.0 3DISTNAME= alacritty-0.10.0
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_GITHUB:=alacritty/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=alacritty/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/alacritty/alacritty 10HOMEPAGE= https://github.com/alacritty/alacritty
10COMMENT= Cross-platform, GPU-accelerated terminal emulator 11COMMENT= Cross-platform, GPU-accelerated terminal emulator
11LICENSE= apache-2.0 12LICENSE= apache-2.0
12 13
13BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 14BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
14BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 15BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
15 16
16.include "cargo-depends.mk" 17.include "cargo-depends.mk"
@@ -25,27 +26,27 @@ MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFI @@ -25,27 +26,27 @@ MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFI
25.if ${OPSYS} != "Darwin" 26.if ${OPSYS} != "Darwin"
26RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib 27RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
27RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib 28RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib
28RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib 29RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib
29.endif 30.endif
30 31
31.if ${OPSYS} == "NetBSD" && exists(${X11BASE}/lib/X11/locale/lib/common/xlcUTF8Load.so) 32.if ${OPSYS} == "NetBSD" && exists(${X11BASE}/lib/X11/locale/lib/common/xlcUTF8Load.so)
32# This works around XIM errors when RTLD local-binding libX11. 33# This works around XIM errors when RTLD local-binding libX11.
33# https://mail-index.netbsd.org/tech-x11/2021/07/12/msg002222.html 34# https://mail-index.netbsd.org/tech-x11/2021/07/12/msg002222.html
34# https://mail-index.netbsd.org/source-changes/2021/07/13/msg130884.html 35# https://mail-index.netbsd.org/source-changes/2021/07/13/msg130884.html
35SUBST_CLASSES+= rtld 36SUBST_CLASSES+= rtld
36SUBST_MESSAGE.rtld= amend RTLD_GLOBAL 37SUBST_MESSAGE.rtld= amend RTLD_GLOBAL
37SUBST_STAGE.rtld= pre-configure 38SUBST_STAGE.rtld= pre-configure
38SUBST_FILES.rtld= ../vendor/x11-dl-2.18.5/src/link.rs 39SUBST_FILES.rtld= ../vendor/x11-dl-2.19.1/src/link.rs
39SUBST_SED.rtld= -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g' 40SUBST_SED.rtld= -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g'
40.endif 41.endif
41 42
42# The xcb crate depends on any version of python 3. 43# The xcb crate depends on any version of python 3.
43PYTHON_VERSIONS_INCOMPATIBLE= 27 44PYTHON_VERSIONS_INCOMPATIBLE= 27
44PYTHON_FOR_BUILD_ONLY= tool 45PYTHON_FOR_BUILD_ONLY= tool
45 46
46INSTALLATION_DIRS= bin share/examples/alacritty ${PKGMANDIR}/man1 47INSTALLATION_DIRS= bin share/examples/alacritty ${PKGMANDIR}/man1
47 48
48do-install: 49do-install:
49 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/alacritty ${DESTDIR}${PREFIX}/bin 50 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/alacritty ${DESTDIR}${PREFIX}/bin
50 ${INSTALL_DATA} ${WRKSRC}/alacritty.yml ${DESTDIR}${PREFIX}/share/examples/alacritty 51 ${INSTALL_DATA} ${WRKSRC}/alacritty.yml ${DESTDIR}${PREFIX}/share/examples/alacritty
51 ${INSTALL_MAN} ${WRKSRC}/extra/alacritty.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/alacritty.1 52 ${INSTALL_MAN} ${WRKSRC}/extra/alacritty.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/alacritty.1