git: c8fd301cde31 - main - x11/foot: update to 1.12.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Apr 2022 17:45:27 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c8fd301cde31009e2b7d525b3559366f6b3f5c04
commit c8fd301cde31009e2b7d525b3559366f6b3f5c04
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-04-22 15:14:41 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-04-22 17:44:14 +0000
x11/foot: update to 1.12.0
Changes: https://codeberg.org/dnkl/foot/releases/tag/1.12.0
Reported by: upstream (via mail)
---
x11/foot/Makefile | 12 +++++++++++-
x11/foot/distinfo | 6 +++---
x11/foot/files/patch-pgo | 30 ++++++++++++++++++++++++++++++
x11/foot/pkg-plist | 6 +++++-
4 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/x11/foot/Makefile b/x11/foot/Makefile
index 7a993bb0a93c..a65befb1390e 100644
--- a/x11/foot/Makefile
+++ b/x11/foot/Makefile
@@ -1,5 +1,5 @@
PORTNAME= foot
-DISTVERSION= 1.11.0
+DISTVERSION= 1.12.0
CATEGORIES= x11
MASTER_SITES= https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
@@ -61,6 +61,16 @@ PLIST_FILES+= share/site-terminfo/${PORTNAME:C,^.,&/&,} \
MESON_ARGS+= -Dterminfo=disabled -Ddefault-terminfo=xterm-256color
.endif
+post-patch:
+# Respect PREFIX for system-wide config
+ @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
+ ${WRKSRC}/config.c \
+ ${WRKSRC}/doc/${PORTNAME}.1.scd \
+ ${WRKSRC}/doc/${PORTNAME}.ini.5.scd
+# Let @sample handle default files under etc/
+ @${REINPLACE_CMD} -e "/install.*sysconfdir/s/'[^']*/&', rename: &.sample/1" \
+ ${WRKSRC}/meson.build
+
.if !defined(DEFAULT_POST_BUILD)
post-build-PGO-on:
(cd ${BUILD_WRKSRC} && ./tests/test-config) # -Wbackend-plugin/-Wmissing-profile
diff --git a/x11/foot/distinfo b/x11/foot/distinfo
index 0d91ad22155c..d88b0d386c86 100644
--- a/x11/foot/distinfo
+++ b/x11/foot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644078676
-SHA256 (foot-1.11.0.tar.gz) = 2b4f737eb4d266224e5dd0126168c6d770b0139d4b572078baf158d2f7166e4e
-SIZE (foot-1.11.0.tar.gz) = 468899
+TIMESTAMP = 1650640481
+SHA256 (foot-1.12.0.tar.gz) = d8c27f735d2f361ee627cce282bee2462545f4df9532ee6ac28fd86a193404fa
+SIZE (foot-1.12.0.tar.gz) = 482717
diff --git a/x11/foot/files/patch-pgo b/x11/foot/files/patch-pgo
new file mode 100644
index 000000000000..5db3774cb486
--- /dev/null
+++ b/x11/foot/files/patch-pgo
@@ -0,0 +1,30 @@
+FAILED: pgo
+ld: error: undefined symbol: key_binding_unref_term
+>>> referenced by ld-temp.o
+>>> lto.tmp:(term_destroy)
+
+ld: error: undefined symbol: key_binding_new_for_term
+>>> referenced by ld-temp.o
+>>> lto.tmp:(term_init)
+cc: error: linker command failed with exit code 1 (use -v to see invocation)
+
+--- pgo/pgo.c.orig 2022-04-22 15:14:41 UTC
++++ pgo/pgo.c
+@@ -193,6 +193,17 @@ key_binding_for(
+ return &kbd;
+ }
+
++void
++key_binding_new_for_term(struct key_binding_manager *mgr,
++ const struct terminal *term)
++{
++}
++void
++key_binding_unref_term(struct key_binding_manager *mgr,
++ const struct terminal *term)
++{
++}
++
+ int
+ main(int argc, const char *const *argv)
+ {
diff --git a/x11/foot/pkg-plist b/x11/foot/pkg-plist
index 8f410a4d4f06..9af2ceb618ad 100644
--- a/x11/foot/pkg-plist
+++ b/x11/foot/pkg-plist
@@ -1,5 +1,6 @@
bin/foot
bin/footclient
+@sample etc/xdg/foot/foot.ini.sample
%%PORTDOCS%%man/man1/foot.1.gz
%%PORTDOCS%%man/man1/footclient.1.gz
%%PORTDOCS%%man/man5/foot.ini.5.gz
@@ -14,17 +15,20 @@ share/bash-completion/completions/footclient
%%PORTDOCS%%%%DOCSDIR%%/README.md
share/fish/vendor_completions.d/foot.fish
share/fish/vendor_completions.d/footclient.fish
-%%PORTDOCS%%%%DATADIR%%/foot.ini
%%DATADIR%%/themes/apprentice
%%DATADIR%%/themes/derp
%%DATADIR%%/themes/dracula
%%DATADIR%%/themes/gruvbox-dark
%%DATADIR%%/themes/gruvbox-light
%%DATADIR%%/themes/hacktober
+%%DATADIR%%/themes/jetbrains-darcula
%%DATADIR%%/themes/kitty
+%%DATADIR%%/themes/material-design
+%%DATADIR%%/themes/nord
%%DATADIR%%/themes/nordiq
%%DATADIR%%/themes/paper-color-dark
%%DATADIR%%/themes/paper-color-light
+%%DATADIR%%/themes/rezza
%%DATADIR%%/themes/selenized-black
%%DATADIR%%/themes/selenized-dark
%%DATADIR%%/themes/selenized-light