pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wezterm: more cleanups
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sun Feb 16 21:33:36 2025 +0100
Changeset: 35cba5be6315a952fa3ae3649a3afed6025c75f0
Modified Files:
wezterm/Makefile
wezterm/PLIST
wezterm/distinfo
Log Message:
wezterm: more cleanups
Install more files according to the distro README and the arch
package, stop installing some others.
Make PKGNAME match the upstream version number.
Depend on fonts instead of compiling them in.
Turn on distro-features, basically just disabling the update-check.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=35cba5be6315a952fa3ae3649a3afed6025c75f0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wezterm/Makefile | 31 +++++++++++++++++++++++++++----
wezterm/PLIST | 5 +++--
wezterm/distinfo | 6 +++---
3 files changed, 33 insertions(+), 9 deletions(-)
diffs:
diff --git a/wezterm/Makefile b/wezterm/Makefile
index 8bd6045352..7c6d3a04b2 100644
--- a/wezterm/Makefile
+++ b/wezterm/Makefile
@@ -1,6 +1,7 @@
# $NetBSD$
-DISTNAME= wezterm-0.0.20250216
+# update tag information in post-extract below when updating this
+DISTNAME= wezterm-2025023.133349
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=wezterm/}
GITHUB_TAG= ee0c04e735fb94cb5119681f704fb7fa6731e713
@@ -10,6 +11,11 @@ HOMEPAGE= https://wezterm.org/
COMMENT= Powerful cross-platform terminal emulator and multiplexer
LICENSE= mit AND ofl-v1.1
+DEPENDS+= JetBrainsMono-ttf-[0-9]*:../../fonts/JetBrainsMono-ttf
+DEPENDS+= nerd-fonts-Symbols-[0-9]*:../../fonts/nerd-fonts-Symbols
+DEPENDS+= roboto-fonts-[0-9]*:../../fonts/roboto-fonts
+DEPENDS+= noto-emoji-ttf-[0-9]*:../../fonts/noto-emoji-ttf
+
# wezterm just takes HEAD, but that will lead to distfile problems; hardcode the heads as of 20250216
GITHUB_SUBMODULES+= harfbuzz harfbuzz b97ef6c702910f4317cc364c7d67c380047b237f deps/harfbuzz/harfbuzz
GITHUB_SUBMODULES+= glennrp libpng b525503b78392335a43558c6a053e0209140762d deps/freetype/libpng
@@ -33,8 +39,10 @@ USE_TOOLS+= pkg-config
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/applications
INSTALLATION_DIRS+= share/bash-completion/completions
+INSTALLATION_DIRS+= share/examples/wezterm
INSTALLATION_DIRS+= share/fish/completions
INSTALLATION_DIRS+= share/icons/hicolor/symbolic/apps
+INSTALLATION_DIRS+= share/metainfo
INSTALLATION_DIRS+= share/zsh/site-functions
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
@@ -42,6 +50,15 @@ RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
RUSTFLAGS+= -C link-arg=-L${BUILDLINK_PREFIX.libX11}/lib
RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib
+CARGO_NO_DEFAULT_FEATURES= yes
+CARGO_FEATURES+= distro-defaults
+
+# get the magic value below by running
+# git -c "core.abbrev=8" show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S"
+# in a git checkout.
+post-extract:
+ ${ECHO} 20250213-133349-ee0c04e7 > ${WRKSRC}/.tag
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/target/release/wezterm \
${DESTDIR}${PREFIX}/bin
@@ -51,10 +68,12 @@ do-install:
${DESTDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/target/release/strip-ansi-escapes \
${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/target/release/sync-color-schemes \
- ${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/target/release/generate-bidi \
+ ${INSTALL_PROGRAM} ${WRKSRC}/assets/open-wezterm-here \
${DESTDIR}${PREFIX}/bin
+# ${INSTALL_PROGRAM} ${WRKSRC}/target/release/sync-color-schemes \
+# ${DESTDIR}${PREFIX}/bin
+# ${INSTALL_PROGRAM} ${WRKSRC}/target/release/generate-bidi \
+# ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/assets/wezterm.desktop \
${DESTDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/assets/shell-completion/bash \
@@ -65,6 +84,10 @@ do-install:
${DESTDIR}${PREFIX}/share/zsh/site-functions/_wezterm
${INSTALL_DATA} ${WRKSRC}/assets/icon/wezterm-icon.svg \
${DESTDIR}${PREFIX}/share/icons/hicolor/symbolic/apps/org.wezfurlong.wezterm.svg
+ ${INSTALL_DATA} ${WRKSRC}/assets/wezterm.appdata.xml \
+ ${DESTDIR}${PREFIX}/share/metainfo
+ ${INSTALL_DATA} ${WRKSRC}/assets/shell-integration/wezterm.sh \
+ ${DESTDIR}${PREFIX}/share/examples/wezterm
.include "cargo-depends.mk"
diff --git a/wezterm/PLIST b/wezterm/PLIST
index ad234bc8f6..0a799f93e5 100644
--- a/wezterm/PLIST
+++ b/wezterm/PLIST
@@ -1,12 +1,13 @@
@comment $NetBSD$
-bin/generate-bidi
+bin/open-wezterm-here
bin/strip-ansi-escapes
-bin/sync-color-schemes
bin/wezterm
bin/wezterm-gui
bin/wezterm-mux-server
share/applications/wezterm.desktop
share/bash-completion/completions/wezterm
+share/examples/wezterm/wezterm.sh
share/fish/completions/wezterm.fish
share/icons/hicolor/symbolic/apps/org.wezfurlong.wezterm.svg
+share/metainfo/wezterm.appdata.xml
share/zsh/site-functions/_wezterm
diff --git a/wezterm/distinfo b/wezterm/distinfo
index 692daeea88..05952ceca8 100644
--- a/wezterm/distinfo
+++ b/wezterm/distinfo
@@ -1797,9 +1797,9 @@ Size (web-sys-0.3.77.crate) = 638246 bytes
BLAKE2s (weezl-0.1.8.crate) = ca6120df03224228d4c7ee055875524f19ee17a006fe7be60e0bdb6aa1ce8382
SHA512 (weezl-0.1.8.crate) = 6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97
Size (weezl-0.1.8.crate) = 42175 bytes
-BLAKE2s (wezterm-0.0.20250216-ee0c04e735fb94cb5119681f704fb7fa6731e713.tar.gz) = a33afc2f95b32c13470730d14abed979e1a5c0bf89de8815253c7fa69bc02d93
-SHA512 (wezterm-0.0.20250216-ee0c04e735fb94cb5119681f704fb7fa6731e713.tar.gz) = 8c7af86a6ca130f5619ceacac450d8f3d6ce1b968bab8ebdbdcc559936b355f76967ad6cd9c185ce51083e6c038077d443fef9ad22a954810218fb0fc62077a7
-Size (wezterm-0.0.20250216-ee0c04e735fb94cb5119681f704fb7fa6731e713.tar.gz) = 82433452 bytes
+BLAKE2s (wezterm-2025023.133349-ee0c04e735fb94cb5119681f704fb7fa6731e713.tar.gz) = a33afc2f95b32c13470730d14abed979e1a5c0bf89de8815253c7fa69bc02d93
+SHA512 (wezterm-2025023.133349-ee0c04e735fb94cb5119681f704fb7fa6731e713.tar.gz) = 8c7af86a6ca130f5619ceacac450d8f3d6ce1b968bab8ebdbdcc559936b355f76967ad6cd9c185ce51083e6c038077d443fef9ad22a954810218fb0fc62077a7
+Size (wezterm-2025023.133349-ee0c04e735fb94cb5119681f704fb7fa6731e713.tar.gz) = 82433452 bytes
BLAKE2s (wgpu-24.0.1.crate) = 408c6dee4943825e656c06034f8328fc55463bfeeb11c7f379bfe22f2501d96f
SHA512 (wgpu-24.0.1.crate) = d6552814853fbae718ae2d8fdd246a5ca6ad9a11c5bc566da66d295b29d844c424a4480484ec571b147251e63de01208dba278e4284d513497dd696331bc8276
Size (wgpu-24.0.1.crate) = 171334 bytes
Home |
Main Index |
Thread Index |
Old Index