diff --git a/wayland/foot-pgo/build b/wayland/foot-pgo/build index 57c0d1e8..3292d8df 100755 --- a/wayland/foot-pgo/build +++ b/wayland/foot-pgo/build @@ -5,6 +5,8 @@ exit 1 } +patch -p1 < fix-pgo.patch + case $("$CC" --version) in *clang*) # Clang requires this for PGO. diff --git a/wayland/foot-pgo/checksums b/wayland/foot-pgo/checksums deleted file mode 120000 index 0ee46252..00000000 --- a/wayland/foot-pgo/checksums +++ /dev/null @@ -1 +0,0 @@ -../foot/checksums \ No newline at end of file diff --git a/wayland/foot-pgo/checksums b/wayland/foot-pgo/checksums new file mode 100644 index 00000000..6e6b49b8 --- /dev/null +++ b/wayland/foot-pgo/checksums @@ -0,0 +1,4 @@ +d8c27f735d2f361ee627cce282bee2462545f4df9532ee6ac28fd86a193404fa +0d9b9f3add24aef5efcf42a32e8ad0e50060e1441a491e04fff3d79a36a526ea +b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd +f90254ec08b34407f4f4194c35b438bdbe66219a5d8e23d292bdee08035ec562 diff --git a/wayland/foot-pgo/patches/fix-pgo.patch b/wayland/foot-pgo/patches/fix-pgo.patch new file mode 100644 index 00000000..8cb4ebfb --- /dev/null +++ b/wayland/foot-pgo/patches/fix-pgo.patch @@ -0,0 +1,76 @@ +diff --git a/meson.build b/meson.build +index 49611dc..24d74cf 100644 +--- a/meson.build ++++ b/meson.build +@@ -181,9 +181,13 @@ vtlib = static_library( + + pgolib = static_library( + 'pgolib', ++ 'config.c', 'config.h', + 'grid.c', 'grid.h', ++ 'key-binding.c', 'key-binding.h', + 'selection.c', 'selection.h', + 'terminal.c', 'terminal.h', ++ 'tokenize.c', 'tokenize.h', ++ 'user-notification.c', 'user-notification.h', + wl_proto_src + wl_proto_headers, + dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb, utf8proc], + link_with: vtlib, +@@ -203,14 +207,12 @@ executable( + 'foot', + 'async.c', 'async.h', + 'box-drawing.c', 'box-drawing.h', +- 'config.c', 'config.h', + 'commands.c', 'commands.h', + 'extract.c', 'extract.h', + 'fdm.c', 'fdm.h', + 'foot-features.h', + 'ime.c', 'ime.h', + 'input.c', 'input.h', +- 'key-binding.c', 'key-binding.h', + 'main.c', + 'notify.c', 'notify.h', + 'quirks.c', 'quirks.h', +@@ -221,9 +223,7 @@ executable( + 'shm.c', 'shm.h', + 'slave.c', 'slave.h', + 'spawn.c', 'spawn.h', +- 'tokenize.c', 'tokenize.h', + 'url-mode.c', 'url-mode.h', +- 'user-notification.c', 'user-notification.h', + 'wayland.c', 'wayland.h', + wl_proto_src + wl_proto_headers, version, + dependencies: [math, threads, libepoll, pixman, wayland_client, wayland_cursor, xkb, fontconfig, utf8proc, +diff --git a/pgo/pgo.c b/pgo/pgo.c +index 26e0c10..ba92efd 100644 +--- a/pgo/pgo.c ++++ b/pgo/pgo.c +@@ -171,28 +171,6 @@ void get_current_modifiers(const struct seat *seat, + xkb_mod_mask_t *effective, + xkb_mod_mask_t *consumed, uint32_t key) {} + +-static struct key_binding_set kbd; +-static bool kbd_initialized = false; +- +-struct key_binding_set * +-key_binding_for( +- struct key_binding_manager *mgr, const struct terminal *term, +- const struct seat *seat) +-{ +- if (!kbd_initialized) { +- kbd_initialized = true; +- kbd = (struct key_binding_set){ +- .key = tll_init(), +- .search = tll_init(), +- .url = tll_init(), +- .mouse = tll_init(), +- .selection_overrides = 0, +- }; +- } +- +- return &kbd; +-} +- + int + main(int argc, const char *const *argv) + { diff --git a/wayland/foot-pgo/sources b/wayland/foot-pgo/sources deleted file mode 120000 index f1633ffc..00000000 --- a/wayland/foot-pgo/sources +++ /dev/null @@ -1 +0,0 @@ -../foot/sources \ No newline at end of file diff --git a/wayland/foot-pgo/sources b/wayland/foot-pgo/sources new file mode 100644 index 00000000..e0772db0 --- /dev/null +++ b/wayland/foot-pgo/sources @@ -0,0 +1,4 @@ +https://codeberg.org/dnkl/foot/archive/VERSION.tar.gz +https://codeberg.org/dnkl/fcft/archive/3.0.1.tar.gz subprojects/fcft +https://codeberg.org/dnkl/tllist/archive/1.0.5.tar.gz subprojects/tllist +patches/fix-pgo.patch diff --git a/wayland/foot/checksums b/wayland/foot/checksums index b0c6cbc2..fcfaccda 100644 --- a/wayland/foot/checksums +++ b/wayland/foot/checksums @@ -1,3 +1,3 @@ -2b4f737eb4d266224e5dd0126168c6d770b0139d4b572078baf158d2f7166e4e +d8c27f735d2f361ee627cce282bee2462545f4df9532ee6ac28fd86a193404fa 0d9b9f3add24aef5efcf42a32e8ad0e50060e1441a491e04fff3d79a36a526ea b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd diff --git a/wayland/foot/version b/wayland/foot/version index 0da43b10..880a3f4c 100644 --- a/wayland/foot/version +++ b/wayland/foot/version @@ -1 +1 @@ -1.11.0 1 +1.12.0 1