Sun Jun 20 10:09:36 2021 UTC ()
alacritty: apply previous workaround only when X11_TYPE is native


(tnn)
diff -r1.6 -r1.7 pkgsrc/x11/alacritty/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/alacritty/distinfo
diff -r1.1 -r0 pkgsrc/x11/alacritty/patches/patch-vendor_x11-dl_src_link.rs
cvs diff -r1.6 -r1.7 pkgsrc/x11/alacritty/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/alacritty/Makefile 2021/06/20 08:51:19 1.6
+++ pkgsrc/x11/alacritty/Makefile 2021/06/20 10:09:35 1.7
@@ -1,40 +1,52 @@ @@ -1,40 +1,52 @@
1# $NetBSD: Makefile,v 1.6 2021/06/20 08:51:19 tnn Exp $ 1# $NetBSD: Makefile,v 1.7 2021/06/20 10:09:35 tnn Exp $
2 2
3DISTNAME= alacritty-0.8.0 3DISTNAME= alacritty-0.8.0
4PKGREVISION= 1 4PKGREVISION= 2
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}
23MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q} 23MAKE_ENV+= RUSTFLAGS=${RUSTFLAGS:Q}
24RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib 24RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
25RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib 25RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.fontconfig}/lib
26RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib 26RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.freetype2}/lib
27 27
 28.include "../../mk/bsd.prefs.mk"
 29
 30.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
 31# This works around XIM errors when RTLD local-binding libX11.
 32# But it might also break GPU accelerated mode.
 33SUBST_CLASSES+= rtld
 34SUBST_MESSAGE.rtld= amend RTLD_GLOBAL
 35SUBST_STAGE.rtld= pre-configure
 36SUBST_FILES.rtld= ../vendor/x11-dl-2.18.5/src/link.rs
 37SUBST_SED.rtld= -e 's,libc::RTLD_LAZY,& | libc::RTLD_GLOBAL,g'
 38.endif
 39
28# The xcb crate depends on any version of python 3. 40# The xcb crate depends on any version of python 3.
29PYTHON_VERSIONS_INCOMPATIBLE= 27 41PYTHON_VERSIONS_INCOMPATIBLE= 27
30PYTHON_FOR_BUILD_ONLY= tool 42PYTHON_FOR_BUILD_ONLY= tool
31 43
32INSTALLATION_DIRS= bin share/examples/alacritty 44INSTALLATION_DIRS= bin share/examples/alacritty
33 45
34do-install: 46do-install:
35 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/alacritty ${DESTDIR}${PREFIX}/bin 47 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/alacritty ${DESTDIR}${PREFIX}/bin
36 ${INSTALL_DATA} ${WRKSRC}/alacritty.yml ${DESTDIR}${PREFIX}/share/examples/alacritty 48 ${INSTALL_DATA} ${WRKSRC}/alacritty.yml ${DESTDIR}${PREFIX}/share/examples/alacritty
37 49
38.include "../../fonts/fontconfig/buildlink3.mk" 50.include "../../fonts/fontconfig/buildlink3.mk"
39.include "../../graphics/freetype2/buildlink3.mk" 51.include "../../graphics/freetype2/buildlink3.mk"
40.include "../../lang/python/tool.mk" 52.include "../../lang/python/tool.mk"
cvs diff -r1.6 -r1.7 pkgsrc/x11/alacritty/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/alacritty/distinfo 2021/06/20 08:51:19 1.6
+++ pkgsrc/x11/alacritty/distinfo 2021/06/20 10:09:35 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.6 2021/06/20 08:51:19 tnn Exp $ 1$NetBSD: distinfo,v 1.7 2021/06/20 10:09:35 tnn Exp $
2 2
3SHA1 (ab_glyph_rasterizer-0.1.4.crate) = 0ef50d98583486c91fc4d40f2bc819ac2873b139 3SHA1 (ab_glyph_rasterizer-0.1.4.crate) = 0ef50d98583486c91fc4d40f2bc819ac2873b139
4RMD160 (ab_glyph_rasterizer-0.1.4.crate) = c3bfaccc51e6d20119128cac07d4a98474fca22f 4RMD160 (ab_glyph_rasterizer-0.1.4.crate) = c3bfaccc51e6d20119128cac07d4a98474fca22f
5SHA512 (ab_glyph_rasterizer-0.1.4.crate) = a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91 5SHA512 (ab_glyph_rasterizer-0.1.4.crate) = a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91
6Size (ab_glyph_rasterizer-0.1.4.crate) = 6641 bytes 6Size (ab_glyph_rasterizer-0.1.4.crate) = 6641 bytes
7SHA1 (adler32-1.2.0.crate) = 5bcc2f4523a85907c7ce8fc0f3478d20985d5048 7SHA1 (adler32-1.2.0.crate) = 5bcc2f4523a85907c7ce8fc0f3478d20985d5048
8RMD160 (adler32-1.2.0.crate) = 7b52baeda841a03e29723959f020b4a32a9cf405 8RMD160 (adler32-1.2.0.crate) = 7b52baeda841a03e29723959f020b4a32a9cf405
9SHA512 (adler32-1.2.0.crate) = 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 9SHA512 (adler32-1.2.0.crate) = 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
10Size (adler32-1.2.0.crate) = 6411 bytes 10Size (adler32-1.2.0.crate) = 6411 bytes
11SHA1 (alacritty-0.8.0.tar.gz) = bbd4c28cb9a16a81066a3956ef744939a3afc1a3 11SHA1 (alacritty-0.8.0.tar.gz) = bbd4c28cb9a16a81066a3956ef744939a3afc1a3
12RMD160 (alacritty-0.8.0.tar.gz) = 79922a79c98376b92e81b3c62c1cc3cedf353a4b 12RMD160 (alacritty-0.8.0.tar.gz) = 79922a79c98376b92e81b3c62c1cc3cedf353a4b
13SHA512 (alacritty-0.8.0.tar.gz) = 723addc3f1e91043c75bb2fb631cafb73b0ce14916d40240fdc14b9f5a5284e5caa74a59dcbe0ff572de35079db068c0e20932f769b1e4382c5a0eb48f70d2f7 13SHA512 (alacritty-0.8.0.tar.gz) = 723addc3f1e91043c75bb2fb631cafb73b0ce14916d40240fdc14b9f5a5284e5caa74a59dcbe0ff572de35079db068c0e20932f769b1e4382c5a0eb48f70d2f7
14Size (alacritty-0.8.0.tar.gz) = 1415318 bytes 14Size (alacritty-0.8.0.tar.gz) = 1415318 bytes
@@ -754,14 +754,13 @@ SHA512 (xcursor-0.3.3.crate) = 09fd0b490 @@ -754,14 +754,13 @@ SHA512 (xcursor-0.3.3.crate) = 09fd0b490
754Size (xcursor-0.3.3.crate) = 6130 bytes 754Size (xcursor-0.3.3.crate) = 6130 bytes
755SHA1 (xdg-2.2.0.crate) = b6a79525f0c3b8b8cefcb308a96d89d543d74cb1 755SHA1 (xdg-2.2.0.crate) = b6a79525f0c3b8b8cefcb308a96d89d543d74cb1
756RMD160 (xdg-2.2.0.crate) = e37d2c536ef45b1bfd42c0b2b09273f5b9d9754c 756RMD160 (xdg-2.2.0.crate) = e37d2c536ef45b1bfd42c0b2b09273f5b9d9754c
757SHA512 (xdg-2.2.0.crate) = 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e 757SHA512 (xdg-2.2.0.crate) = 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
758Size (xdg-2.2.0.crate) = 13387 bytes 758Size (xdg-2.2.0.crate) = 13387 bytes
759SHA1 (xml-rs-0.8.3.crate) = dfa73a1c4b43d635552189e414500a3ae2502136 759SHA1 (xml-rs-0.8.3.crate) = dfa73a1c4b43d635552189e414500a3ae2502136
760RMD160 (xml-rs-0.8.3.crate) = d646338f4d52a53cc70621bfc26fc7d89bffa1e4 760RMD160 (xml-rs-0.8.3.crate) = d646338f4d52a53cc70621bfc26fc7d89bffa1e4
761SHA512 (xml-rs-0.8.3.crate) = e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033 761SHA512 (xml-rs-0.8.3.crate) = e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
762Size (xml-rs-0.8.3.crate) = 52547 bytes 762Size (xml-rs-0.8.3.crate) = 52547 bytes
763SHA1 (yaml-rust-0.4.5.crate) = de9261ecb0d790e56466b6e1c40371b1050a8650 763SHA1 (yaml-rust-0.4.5.crate) = de9261ecb0d790e56466b6e1c40371b1050a8650
764RMD160 (yaml-rust-0.4.5.crate) = 2148b0245a840e26646ae4b0c5f394fd8203ad5b 764RMD160 (yaml-rust-0.4.5.crate) = 2148b0245a840e26646ae4b0c5f394fd8203ad5b
765SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0 765SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
766Size (yaml-rust-0.4.5.crate) = 47783 bytes 766Size (yaml-rust-0.4.5.crate) = 47783 bytes
767SHA1 (patch-vendor_x11-dl_src_link.rs) = 773a9ad0ffdbc852a0fbc375475f1a6fa8101e73 
File Deleted: pkgsrc/x11/alacritty/patches/Attic/patch-vendor_x11-dl_src_link.rs