Cc: Maintainer
Updates x11/alacritty to 0.13.2
Drops patch to alacritty.yml - config file format changed to toml, and alacritty
no longer requires a configuration file.
I removed the part disabling wayland support, because the cause of the problem
has since been fixed by a patch from semarie@ that has been merged upstream:
https://github.com/Smithay/client-toolkit/pull/198
Unfortunately it still doesn't run under wayland, though :-)
Tests pass, removed the comment explaining previous test failures.
Tested on amd64. OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/alacritty/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile1 Jan 2024 09:02:17 - 1.17
+++ Makefile15 Apr 2024 20:48:06 -
@@ -5,7 +5,7 @@ MAINTAINER =Eric Auge https://alacritty.org/
@@ -21,16 +21,12 @@ MODULES = devel/cargo \
RUN_DEPENDS = devel/desktop-file-utils
+BUILD_DEPENDS =textproc/scdoc
+
# for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113
MODCARGO_CRATES_UPDATE = cc libc
MODCARGO_RUSTFLAGS += -L${PREFIX}/lib
-# Disable wayland feature. Breaks the build if libxkbcommon is absent
-# copypasta/wayland -> smithay-client-toolkit, glutin.
-# ld: error: unable to find library -lxkbcommon
-MODCARGO_NO_DEFAULT_FEATURES = Yes
-MODCARGO_FEATURES =x11
-
MAKE_ENV = ${MODCARGO_ENV}
CONFIGURE_STYLE = cargo
@@ -40,14 +36,16 @@ SEPARATE_BUILD =Yes
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
EXTRA_DIR =${WRKSRC}/extra
-# test result: FAILED. 68 passed; 1 failed;
-# failed test: config::tests::config_read_eof
-# because we patch the default configuration value
-# for live_config_reload
+pre-install:
+ scdoc < ${EXTRA_DIR}/man/alacritty.1.scd > ${EXTRA_DIR}/alacritty.1
+ scdoc < ${EXTRA_DIR}/man/alacritty.5.scd > ${EXTRA_DIR}/alacritty.5
+ scdoc < ${EXTRA_DIR}/man/alacritty-msg.1.scd >
${EXTRA_DIR}/alacritty-msg.1
+ scdoc < ${EXTRA_DIR}/man/alacritty-bindings.5.scd >
${EXTRA_DIR}/alacritty-bindings.5
do-install:
${INSTALL_PROGRAM} ${RELEASE_DIR}/alacritty ${PREFIX}/bin/
- ${INSTALL_MAN} ${EXTRA_DIR}/alacritty.man ${PREFIX}/man/man1/alacritty.1
+ ${INSTALL_MAN} ${EXTRA_DIR}/*.1 ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${EXTRA_DIR}/*.5 ${PREFIX}/man/man5/
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions
${INSTALL_DATA} ${EXTRA_DIR}/completions/alacritty.bash \
${PREFIX}/share/bash-completion/completions/alacritty
@@ -63,9 +61,6 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${EXTRA_DIR}/logo/alacritty-term.svg \
${PREFIX}/share/pixmaps/Alacritty.svg
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/alacritty
- ${INSTALL_DATA} ${WRKSRC}/alacritty.yml \
- ${PREFIX}/share/examples/alacritty/alacritty.yml
tic -s -x -o ${PREFIX}/share/terminfo ${EXTRA_DIR}/alacritty.info
.include "crates.inc"
Index: crates.inc
===
RCS file: /cvs/ports/x11/alacritty/crates.inc,v
retrieving revision 1.7
diff -u -p -r1.7 crates.inc
--- crates.inc 3 Nov 2023 12:55:05 - 1.7
+++ crates.inc 15 Apr 2024 20:48:06 -
@@ -1,232 +1,249 @@
MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0
-MODCARGO_CRATES += android-activity0.4.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash 0.8.11 # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick1.1.2 # Unlicense OR MIT
+MODCARGO_CRATES += android-activity0.5.2 # MIT OR Apache-2.0
MODCARGO_CRATES += android-properties 0.2.2 # MIT
-MODCARGO_CRATES += arrayref0.3.6 # BSD-2-Clause
-MODCARGO_CRATES += arrayvec0.7.2 # MIT OR Apache-2.0
-MODCARGO_CRATES += atty0.2.14 # MIT
+MODCARGO_CRATES += anstream0.6.13 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle 1.0.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-parse 0.2.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-query 1.0.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-wincon 3.0.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += arrayref0.3.7 # BSD-2-Clause
+MODCARGO_CRATES += arrayvec0.7.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += as-raw-xcb-connection 1.0.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += atomic-waker1.1.2 # Apache-2.0 OR MIT
MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
-MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
+MODCARGO_CRATES += base64 0.22.0 # MIT OR Apache-2.0
MODCARGO_CRATES += bitflags1.3.2 # MIT/Apache-2.0
+MODCARGO_CRATES += bitflags2.4.2 # MIT OR Apache-2.0
MODCARGO_CRATES += block 0.1.6 # MIT
-MODCARGO_CRATES += block-sys 0.1.0-beta.1#
