pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wezterm: finish some more



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Feb 16 20:06:45 2025 +0100
Changeset:	7be5606e6f92b3c9d589946231e4a6b37cf78312

Modified Files:
	wezterm/Makefile
	wezterm/PLIST
	wezterm/TODO

Log Message:
wezterm: finish some more

Install .desktop file, shell completions, and icon.
Do not install terminfo file, ncurses provides one already.

Add missing dependency on fontconfig.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7be5606e6f92b3c9d589946231e4a6b37cf78312

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wezterm/Makefile | 22 ++++++++++++++++++----
 wezterm/PLIST    |  7 ++++++-
 wezterm/TODO     |  9 ---------
 3 files changed, 24 insertions(+), 14 deletions(-)

diffs:
diff --git a/wezterm/Makefile b/wezterm/Makefile
index 5fa058b0bf..8bd6045352 100644
--- a/wezterm/Makefile
+++ b/wezterm/Makefile
@@ -30,16 +30,18 @@ CHECK_PORTABILITY_SKIP=	get-deps
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		pkg-config
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	share/applications
+INSTALLATION_DIRS+=	share/bash-completion/completions
+INSTALLATION_DIRS+=	share/fish/completions
+INSTALLATION_DIRS+=	share/icons/hicolor/symbolic/apps
+INSTALLATION_DIRS+=	share/zsh/site-functions
 
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
 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
 
-post-build:
-	tic -x -o ${WRKSRC}/terminfo ${WRKSRC}/termwiz/data/wezterm.terminfo
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/wezterm \
 		${DESTDIR}${PREFIX}/bin
@@ -53,11 +55,23 @@ do-install:
 		${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 \
+		${DESTDIR}${PREFIX}/share/bash-completion/completions/wezterm
+	${INSTALL_DATA} ${WRKSRC}/assets/shell-completion/fish \
+		${DESTDIR}${PREFIX}/share/fish/completions/wezterm.fish
+	${INSTALL_DATA} ${WRKSRC}/assets/shell-completion/zsh \
+		${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
 
 .include "cargo-depends.mk"
 
 .include "../../lang/rust/cargo.mk"
 .include "../../devel/wayland/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
diff --git a/wezterm/PLIST b/wezterm/PLIST
index 013b67ef2b..ad234bc8f6 100644
--- a/wezterm/PLIST
+++ b/wezterm/PLIST
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2022/01/23 16:14:24 pin Exp $
+@comment $NetBSD$
 bin/generate-bidi
 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/fish/completions/wezterm.fish
+share/icons/hicolor/symbolic/apps/org.wezfurlong.wezterm.svg
+share/zsh/site-functions/_wezterm
diff --git a/wezterm/TODO b/wezterm/TODO
index 60edf5c85c..9ff65f7a9a 100644
--- a/wezterm/TODO
+++ b/wezterm/TODO
@@ -1,8 +1,3 @@
-Additional files to install:
- - icons
- - shell completions
- - desktop file
-
 Additional shared libraries that need linking
 
 => Checking for PIE in wezterm-0.0.20250216
@@ -14,7 +9,3 @@ ERROR: bin/wezterm-gui: missing library: libxkbcommon-x11.so.0
 ERROR: bin/wezterm-gui: missing library: libwayland-egl.so.1
 ERROR: bin/wezterm-gui: missing library: libwayland-client.so.0
 *** Error code 1
-
-Stop.
-
-Also, check if additional build dependencies should be declared.


Home | Main Index | Thread Index | Old Index