From 95d5db4137380edd8aad399493f932c4e223d9f5 Mon Sep 17 00:00:00 2001 From: git-bruh Date: Sun, 6 Mar 2022 19:38:53 +0530 Subject: [PATCH] sway: 1.7 --- wayland/sway/build | 1 - wayland/sway/checksums | 5 +- wayland/sway/patches/llvm-13.patch | 77 ----------------------------- wayland/sway/patches/no-evdev.patch | 34 +++++++------ wayland/sway/sources | 1 - wayland/sway/version | 2 +- 6 files changed, 21 insertions(+), 99 deletions(-) delete mode 100644 wayland/sway/patches/llvm-13.patch diff --git a/wayland/sway/build b/wayland/sway/build index 7a5ef50d..82404dd7 100755 --- a/wayland/sway/build +++ b/wayland/sway/build @@ -1,7 +1,6 @@ #!/bin/sh -e patch -p1 < no-evdev.patch -patch -p1 < llvm-13.patch # Default background color. sed 's/0.25f, 0.25f, 0.25f/0.929, 0.870, 0.678/' \ diff --git a/wayland/sway/checksums b/wayland/sway/checksums index 54d516b3..ad0122d4 100644 --- a/wayland/sway/checksums +++ b/wayland/sway/checksums @@ -1,3 +1,2 @@ -8b138867cd83217de07138144b1279fe58e0421eb10c91122aa33c8770fe7391 -a41a469d43e58c3c877c72750c6564deb8e6384e2b42080d17e9ec74622a5e42 -9803de05490e2e84b2c79d634837aeb880ba5b29c1c485707593af40fdddc3f6 +0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84 +089a4e120c4c99ff784f7e5fc0f050f8416b4d5b98d418c2d36afe3f31da3349 diff --git a/wayland/sway/patches/llvm-13.patch b/wayland/sway/patches/llvm-13.patch deleted file mode 100644 index 46f7a9f8..00000000 --- a/wayland/sway/patches/llvm-13.patch +++ /dev/null @@ -1,77 +0,0 @@ -From ff468584abddcb3f703d407aecf78137fb656472 Mon Sep 17 00:00:00 2001 -From: Evgeniy Khramtsov -Date: Fri, 1 Oct 2021 16:11:39 +0300 -Subject: [PATCH] commands: Remove unused code after 1d3681f52135 - -Clang 13 reports: - -../sway/commands.c:470:23: error: variable 'context' set but not used -[-Werror,-Wunused-but-set-variable] - enum command_context context = 0; - ^ -Last use of was removed in commit 1d3681f52135. - -Downstream PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258813 ---- - include/sway/config.h | 8 -------- - sway/commands.c | 28 ---------------------------- - 2 files changed, 36 deletions(-) - -diff --git a/include/sway/config.h b/include/sway/config.h -index 52867fa665..46dd4ffe4d 100644 ---- a/include/sway/config.h -+++ b/include/sway/config.h -@@ -418,14 +418,6 @@ enum sway_popup_during_fullscreen { - POPUP_LEAVE, - }; - --enum command_context { -- CONTEXT_CONFIG = 1 << 0, -- CONTEXT_BINDING = 1 << 1, -- CONTEXT_IPC = 1 << 2, -- CONTEXT_CRITERIA = 1 << 3, -- CONTEXT_ALL = 0xFFFFFFFF, --}; -- - enum focus_follows_mouse_mode { - FOLLOWS_NO, - FOLLOWS_YES, -diff --git a/sway/commands.c b/sway/commands.c -index b09a04c71d..205406ad2a 100644 ---- a/sway/commands.c -+++ b/sway/commands.c -@@ -465,34 +465,6 @@ struct cmd_results *config_commands_command(char *exec) { - goto cleanup; - } - -- enum command_context context = 0; -- -- struct { -- char *name; -- enum command_context context; -- } context_names[] = { -- { "config", CONTEXT_CONFIG }, -- { "binding", CONTEXT_BINDING }, -- { "ipc", CONTEXT_IPC }, -- { "criteria", CONTEXT_CRITERIA }, -- { "all", CONTEXT_ALL }, -- }; -- -- for (int i = 1; i < argc; ++i) { -- size_t j; -- for (j = 0; j < sizeof(context_names) / sizeof(context_names[0]); ++j) { -- if (strcmp(context_names[j].name, argv[i]) == 0) { -- break; -- } -- } -- if (j == sizeof(context_names) / sizeof(context_names[0])) { -- results = cmd_results_new(CMD_INVALID, -- "Invalid command context %s", argv[i]); -- goto cleanup; -- } -- context |= context_names[j].context; -- } -- - results = cmd_results_new(CMD_SUCCESS, NULL); - - cleanup: diff --git a/wayland/sway/patches/no-evdev.patch b/wayland/sway/patches/no-evdev.patch index 4d1d94d9..8173e071 100644 --- a/wayland/sway/patches/no-evdev.patch +++ b/wayland/sway/patches/no-evdev.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 747cab5..ed0ac77 100644 +index 5e4de87..091798d 100644 --- a/meson.build +++ b/meson.build @@ -49,7 +49,6 @@ pangocairo = dependency('pangocairo') @@ -11,7 +11,7 @@ index 747cab5..ed0ac77 100644 xcb = dependency('xcb', required: get_option('xwayland')) drm_full = dependency('libdrm') # only needed for drm_fourcc.h diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c -index b4b5bc4..2770312 100644 +index b4b5bc4..5087bff 100644 --- a/sway/commands/bar/bind.c +++ b/sway/commands/bar/bind.c @@ -1,4 +1,4 @@ @@ -21,7 +21,7 @@ index b4b5bc4..2770312 100644 #include #include diff --git a/sway/commands/bind.c b/sway/commands/bind.c -index 4c67b3c..e9c0eab 100644 +index 25be415..93f751b 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -1,5 +1,4 @@ @@ -31,7 +31,7 @@ index 4c67b3c..e9c0eab 100644 #include #include diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c -index 6b33141..039f533 100644 +index 6b33141..7d4cab4 100644 --- a/sway/commands/input/scroll_button.c +++ b/sway/commands/input/scroll_button.c @@ -1,4 +1,4 @@ @@ -41,7 +41,7 @@ index 6b33141..039f533 100644 #include "sway/commands.h" #include "sway/input/cursor.h" diff --git a/sway/input/cursor.c b/sway/input/cursor.c -index c89d516..e1bbabd 100644 +index 6fddee9..5f405bd 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -1,7 +1,7 @@ @@ -53,7 +53,7 @@ index c89d516..e1bbabd 100644 #include #include #include -@@ -1203,7 +1203,7 @@ uint32_t get_mouse_bindsym(const char *name, char **error) { +@@ -1231,7 +1231,7 @@ uint32_t get_mouse_bindsym(const char *name, char **error) { return buttons[number - 1]; } else if (strncmp(name, "BTN_", strlen("BTN_")) == 0) { // Get event code from name @@ -62,7 +62,7 @@ index c89d516..e1bbabd 100644 if (code == -1) { size_t len = snprintf(NULL, 0, "Unknown event %s", name) + 1; *error = malloc(len); -@@ -1229,7 +1229,7 @@ uint32_t get_mouse_bindcode(const char *name, char **error) { +@@ -1257,7 +1257,7 @@ uint32_t get_mouse_bindcode(const char *name, char **error) { *error = strdup("Button event code out of range."); return 0; } @@ -71,9 +71,9 @@ index c89d516..e1bbabd 100644 if (!event || strncmp(event, "BTN_", strlen("BTN_")) != 0) { size_t len = snprintf(NULL, 0, "Event code %d (%s) is not a button", code, event ? event : "(null)") + 1; -@@ -1252,7 +1252,7 @@ uint32_t get_mouse_button(const char *name, char **error) { +@@ -1280,7 +1280,7 @@ uint32_t get_mouse_button(const char *name, char **error) { } - + const char *get_mouse_button_name(uint32_t button) { - const char *name = libevdev_event_code_get_name(EV_KEY, button); + const char *name = libinput_event_code_get_name(EV_KEY, button); @@ -81,7 +81,7 @@ index c89d516..e1bbabd 100644 if (button == SWAY_SCROLL_UP) { name = "SWAY_SCROLL_UP"; diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c -index f9eb8c8..681ca26 100644 +index 4320a3b..7dda2f0 100644 --- a/sway/input/seatop_default.c +++ b/sway/input/seatop_default.c @@ -1,6 +1,6 @@ @@ -93,21 +93,23 @@ index f9eb8c8..681ca26 100644 #include #include diff --git a/sway/ipc-json.c b/sway/ipc-json.c -index 2c4c52a..1c09ba4 100644 +index 1b64f86..a65a009 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c -@@ -1,5 +1,5 @@ +@@ -1,7 +1,7 @@ + #include + #include #include -#include +#include #include - #include - #include "config.h" + #include + #include diff --git a/sway/meson.build b/sway/meson.build -index b52fada..97e4b84 100644 +index 8eab31a..d52b855 100644 --- a/sway/meson.build +++ b/sway/meson.build -@@ -206,7 +206,6 @@ sway_deps = [ +@@ -208,7 +208,6 @@ sway_deps = [ cairo, drm, jsonc, diff --git a/wayland/sway/sources b/wayland/sway/sources index 21ce9e95..1d0d2061 100644 --- a/wayland/sway/sources +++ b/wayland/sway/sources @@ -1,3 +1,2 @@ https://github.com/swaywm/sway/releases/download/VERSION/sway-VERSION.tar.gz patches/no-evdev.patch -patches/llvm-13.patch diff --git a/wayland/sway/version b/wayland/sway/version index c88f302e..46b73aef 100644 --- a/wayland/sway/version +++ b/wayland/sway/version @@ -1 +1 @@ -1.6.1 2 +1.7 1