sway: update to 1.9.

This commit is contained in:
Luca Matei Pintilie 2024-02-24 19:44:42 +01:00 committed by Andrew J. Hesford
parent 70762d7ef9
commit b796af3992
2 changed files with 4 additions and 41 deletions

View file

@ -1,26 +0,0 @@
diff --git a/sway/config.c b/sway/config.c
index 1f2bb68604..f5efa98a8e 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
static struct xkb_state *keysym_translation_state_create(
struct xkb_rule_names rules) {
- struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+ struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
context,
&rules,
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 3f4a7289b9..45a588ecbf 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
char **error) {
- struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+ struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
if (!sway_assert(context, "cannot create XKB context")) {
return NULL;
}

View file

@ -1,12 +1,12 @@
# Template file for 'sway'
pkgname=sway
version=1.8.1
revision=2
version=1.9
revision=1
build_style=meson
configure_args="-Dwerror=false -Db_ndebug=false"
conf_files="/etc/sway/config"
hostmakedepends="pkg-config wayland-devel scdoc"
makedepends="wlroots0.16-devel pcre2-devel json-c-devel pango-devel cairo-devel
makedepends="wlroots0.17-devel pcre2-devel json-c-devel pango-devel cairo-devel
gdk-pixbuf-devel libevdev-devel"
depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
short_desc="Tiling Wayland compositor compatible with i3"
@ -15,19 +15,8 @@ license="MIT"
homepage="https://swaywm.org"
changelog="https://github.com/swaywm/sway/releases"
distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
checksum=e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff
checksum=b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b
post_install() {
vlicense LICENSE
vbin contrib/grimshot
vman contrib/grimshot.1
}
grimshot_package() {
short_desc="Helper for screenshots within sway"
depends="grim slurp sway wl-clipboard jq libnotify"
pkg_install() {
vmove usr/bin/grimshot
vmove usr/share/man/man1/grimshot.1
}
}