From e93da93ff078a311d2446444d8afd56e185c40fb Mon Sep 17 00:00:00 2001 From: Brett Cornwall Date: Sat, 24 Feb 2024 10:53:48 -0800 Subject: [PATCH] upgpkg: 1:1.9-1 * contrib is removed, see sway-contrib package now --- .SRCINFO | 20 ++++++++++---------- PKGBUILD | 31 ++++++++----------------------- sys_nice_user_xkb_configs.patch | 27 --------------------------- 3 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 sys_nice_user_xkb_configs.patch diff --git a/.SRCINFO b/.SRCINFO index 98cfdc3..49a0972 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = sway pkgdesc = Tiling Wayland compositor and replacement for the i3 window manager - pkgver = 1.8.1 - pkgrel = 5 + pkgver = 1.9 + pkgrel = 1 epoch = 1 url = https://swaywm.org/ install = sway.install @@ -17,40 +17,40 @@ pkgbase = sway depends = libevdev.so depends = libinput depends = libjson-c.so + depends = libpixman-1.so depends = libudev.so depends = libwayland-server.so - depends = libwlroots.so=11 + depends = libwlroots.so depends = libxcb depends = libxkbcommon.so depends = pango depends = pcre2 depends = ttf-font - optdepends = bemenu: Wayland-native alternative to dmenu - optdepends = dmenu: Application launcher used in default config + depends = xcb-util-wm optdepends = foot: Terminal emulator used in the default configuration optdepends = i3status: Status line generation optdepends = mako: Lightweight notification daemon optdepends = polkit: System privilege control. Required if not using seatd service optdepends = swaybg: Wallpaper tool for sway + optdepends = sway-contrib: Collection of user-contributed scripts for sway optdepends = swayidle: Idle management daemon optdepends = swaylock: Screen locker optdepends = waybar: Highly customizable bar + optdepends = wmenu: Application launcher used in default config optdepends = xorg-xwayland: X11 support optdepends = xdg-desktop-portal-gtk: Default xdg-desktop-portal for file picking optdepends = xdg-desktop-portal-wlr: xdg-desktop-portal backend backup = etc/sway/config backup = etc/sway/config.d/50-systemd-user.conf - source = https://github.com/swaywm/sway/releases/download/1.8.1/sway-1.8.1.tar.gz - source = https://github.com/swaywm/sway/releases/download/1.8.1/sway-1.8.1.tar.gz.sig + source = https://github.com/swaywm/sway/releases/download/1.9/sway-1.9.tar.gz + source = https://github.com/swaywm/sway/releases/download/1.9/sway-1.9.tar.gz.sig source = 50-systemd-user.conf - source = sys_nice_user_xkb_configs.patch source = sway-portals.conf validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 validpgpkeys = 9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A - sha512sums = 1504312a199608532e22336c5031e8f4749f5102ab321d13d97a1f93d49c8ec435e9097af729d8f7dfa81e2e96cee7de91cf4c04b6a7b7151ea740a1e43eb086 + sha512sums = 1d2a47bb8b838573a32f3719a7329fd744119c2c7efc5e5a4168b2bacfb09a3901a569177e5e10c129141fafe00e823ab78c04b76b502d23caa7621bbccd5919 sha512sums = SKIP sha512sums = d5f9aadbb4bbef067c31d4c8c14dad220eb6f3e559e9157e20e1e3d47faf2f77b9a15e52519c3ffc53dc8a5202cb28757b81a4b3b0cc5dd50a4ddc49e03fe06e - sha512sums = 156719e93d0213d1b54ce6e3a9b2dcc9246da5689dd2d3281546f9c042cbc69072f99b087e112fe777dcd786d2b9d1be1e1c9200feddffb5e2d16f8dfb27515d sha512sums = b9e708c775825c8124d8e154e523c90b8a32715050ba06f6dbcdd08d109eed484d128ccc8dcd6a49dc9cd51a0c9035779c2706b4d7a139115e85c4f54226b775 pkgname = sway diff --git a/PKGBUILD b/PKGBUILD index 71fbefe..34f6d09 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,9 +3,9 @@ # Contributor: Alexander F. Rødseth pkgname=sway -pkgver=1.8.1 +pkgver=1.9 epoch=1 -pkgrel=5 +pkgrel=1 pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager' arch=(x86_64) url='https://swaywm.org/' @@ -16,14 +16,16 @@ depends=( 'libevdev.so' 'libinput' 'libjson-c.so' + 'libpixman-1.so' 'libudev.so' 'libwayland-server.so' - 'libwlroots.so=11' + 'libwlroots.so' 'libxcb' 'libxkbcommon.so' 'pango' 'pcre2' 'ttf-font' + 'xcb-util-wm' ) makedepends=(meson ninja scdoc setconf wayland-protocols) backup=( @@ -31,16 +33,16 @@ backup=( etc/sway/config.d/50-systemd-user.conf ) optdepends=( - 'bemenu: Wayland-native alternative to dmenu' - 'dmenu: Application launcher used in default config' 'foot: Terminal emulator used in the default configuration' 'i3status: Status line generation' 'mako: Lightweight notification daemon' 'polkit: System privilege control. Required if not using seatd service' 'swaybg: Wallpaper tool for sway' + 'sway-contrib: Collection of user-contributed scripts for sway' 'swayidle: Idle management daemon' 'swaylock: Screen locker' 'waybar: Highly customizable bar' + 'wmenu: Application launcher used in default config' 'xorg-xwayland: X11 support' 'xdg-desktop-portal-gtk: Default xdg-desktop-portal for file picking' 'xdg-desktop-portal-wlr: xdg-desktop-portal backend' @@ -48,29 +50,17 @@ optdepends=( source=("https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz" "https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz.sig" "50-systemd-user.conf" - "sys_nice_user_xkb_configs.patch" "sway-portals.conf") install=sway.install -sha512sums=('1504312a199608532e22336c5031e8f4749f5102ab321d13d97a1f93d49c8ec435e9097af729d8f7dfa81e2e96cee7de91cf4c04b6a7b7151ea740a1e43eb086' +sha512sums=('1d2a47bb8b838573a32f3719a7329fd744119c2c7efc5e5a4168b2bacfb09a3901a569177e5e10c129141fafe00e823ab78c04b76b502d23caa7621bbccd5919' 'SKIP' 'd5f9aadbb4bbef067c31d4c8c14dad220eb6f3e559e9157e20e1e3d47faf2f77b9a15e52519c3ffc53dc8a5202cb28757b81a4b3b0cc5dd50a4ddc49e03fe06e' - '156719e93d0213d1b54ce6e3a9b2dcc9246da5689dd2d3281546f9c042cbc69072f99b087e112fe777dcd786d2b9d1be1e1c9200feddffb5e2d16f8dfb27515d' 'b9e708c775825c8124d8e154e523c90b8a32715050ba06f6dbcdd08d109eed484d128ccc8dcd6a49dc9cd51a0c9035779c2706b4d7a139115e85c4f54226b775') validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A') # Drew DeVault prepare() { cd "$pkgname-$pkgver" - - # Enable user xkb configs with cap_sys_nice - otherwise user xkb configs will - # break. - # - # This patch was originally at - # https://github.com/swaywm/sway/commit/2f2cdd60def006f6d3cbe318f9edd7d68fcb239a.patch - # but failed to apply correctly to meson.build. We don't need that part of - # the patch so just drop it. - patch -p1 < ../sys_nice_user_xkb_configs.patch - # Set the version information to 'Arch Linux' instead of 'makepkg' sed -i "s/branch \\\'@1@\\\'/Arch Linux/g" meson.build } @@ -87,11 +77,6 @@ package() { install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/" install -Dm644 sway-portals.conf "$pkgdir/usr/share/xdg-desktop-portal/sway-portals.conf" - - for util in autoname-workspaces.py inactive-windows-transparency.py grimshot; do - install -Dm755 "$pkgname-$pkgver/contrib/$util" -t \ - "$pkgdir/usr/share/$pkgname/scripts" - done } # vim: ts=2 sw=2 et diff --git a/sys_nice_user_xkb_configs.patch b/sys_nice_user_xkb_configs.patch deleted file mode 100644 index fe55dde..0000000 --- a/sys_nice_user_xkb_configs.patch +++ /dev/null @@ -1,27 +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; - } -