[arch-commits] Commit in sway/repos (6 files)

Brett Cornwall ainola at gemini.archlinux.org
Wed May 18 02:56:08 UTC 2022


    Date: Wednesday, May 18, 2022 @ 02:56:06
  Author: ainola
Revision: 1207751

archrelease: copy trunk to community-testing-x86_64

Added:
  sway/repos/community-testing-x86_64/
  sway/repos/community-testing-x86_64/50-systemd-user.conf
    (from rev 1207750, sway/trunk/50-systemd-user.conf)
  sway/repos/community-testing-x86_64/PKGBUILD
    (from rev 1207750, sway/trunk/PKGBUILD)
  sway/repos/community-testing-x86_64/sway-session.target
    (from rev 1207750, sway/trunk/sway-session.target)
  sway/repos/community-testing-x86_64/sway.install
    (from rev 1207750, sway/trunk/sway.install)
  sway/repos/community-testing-x86_64/sway.service
    (from rev 1207750, sway/trunk/sway.service)

----------------------+
 50-systemd-user.conf |    7 ++++
 PKGBUILD             |   78 +++++++++++++++++++++++++++++++++++++++++++++++++
 sway-session.target  |    8 +++++
 sway.install         |   31 +++++++++++++++++++
 sway.service         |   16 ++++++++++
 5 files changed, 140 insertions(+)

Copied: sway/repos/community-testing-x86_64/50-systemd-user.conf (from rev 1207750, sway/trunk/50-systemd-user.conf)
===================================================================
--- community-testing-x86_64/50-systemd-user.conf	                        (rev 0)
+++ community-testing-x86_64/50-systemd-user.conf	2022-05-18 02:56:06 UTC (rev 1207751)
@@ -0,0 +1,7 @@
+# sway does not set DISPLAY/WAYLAND_DISPLAY in the systemd user environment
+# See FS#63021
+# Adapted from xorg's 50-systemd-user.sh, which achieves a similar goal.
+
+exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
+exec hash dbus-update-activation-environment 2>/dev/null && \
+     dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP

Copied: sway/repos/community-testing-x86_64/PKGBUILD (from rev 1207750, sway/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2022-05-18 02:56:06 UTC (rev 1207751)
@@ -0,0 +1,78 @@
+# Maintainer: Brett Cornwall <ainola at archlinux.org>
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
+# Contributor: Alexander F. Rødseth <xyproto at archlinux.org>
+
+pkgname=sway
+pkgver=1.7
+epoch=1
+pkgrel=7
+pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager'
+arch=(x86_64)
+url='https://swaywm.org/'
+license=(MIT)
+depends=(
+  'cairo'
+  'gdk-pixbuf2'
+  'libevdev.so'
+  'libinput'
+  'libjson-c.so'
+  'libudev.so'
+  'libwayland-server.so'
+  'libwlroots.so'
+  'libxcb'
+  'libxkbcommon.so'
+  'pango'
+  'pcre'
+  'ttf-font'
+)
+makedepends=(meson ninja scdoc setconf wayland-protocols)
+backup=(etc/sway/config)
+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'
+  'swayidle: Idle management daemon'
+  'swaylock: Screen locker'
+  'waybar: Highly customizable bar'
+  'xorg-xwayland: X11 support'
+)
+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")
+options=(debug)
+install=sway.install
+sha512sums=('028cf5d504d5914bfb78d44156d6a290de660c5ed0638f4e2c56e5be76db9b0baeda035e1fa1ae23559016bd7e4312f7ff70c2fb4904df25358577c1a3d21243'
+            'SKIP'
+            'c2b7d808f4231f318e03789015624fd4cf32b81434b15406570b4e144c0defc54e216d881447e6fd9fc18d7da608cccb61c32e0e1fab2f1fe2750acf812d3137')
+validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48'  # Simon Ser
+              '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A') # Drew DeVault
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # Set the version information to 'Arch Linux' instead of 'makepkg'
+  sed -i "s/branch \\\'@1@\\\'/Arch Linux/g" meson.build
+}
+
+build() {
+  mkdir -p build
+  arch-meson build "$pkgname-$pkgver" -D sd-bus-provider=libsystemd -D werror=false -D b_ndebug=true
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+  install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/"
+
+  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

Copied: sway/repos/community-testing-x86_64/sway-session.target (from rev 1207750, sway/trunk/sway-session.target)
===================================================================
--- community-testing-x86_64/sway-session.target	                        (rev 0)
+++ community-testing-x86_64/sway-session.target	2022-05-18 02:56:06 UTC (rev 1207751)
@@ -0,0 +1,8 @@
+# https://github.com/swaywm/sway/wiki/Systemd-integration
+
+[Unit]
+Description=sway compositor session
+Documentation=man:systemd.special(7)
+BindsTo=graphical-session.target
+Wants=graphical-session-pre.target
+After=graphical-session-pre.target

Copied: sway/repos/community-testing-x86_64/sway.install (from rev 1207750, sway/trunk/sway.install)
===================================================================
--- community-testing-x86_64/sway.install	                        (rev 0)
+++ community-testing-x86_64/sway.install	2022-05-18 02:56:06 UTC (rev 1207751)
@@ -0,0 +1,31 @@
+post_install() {
+cat << EOD
+Sway requires additional setup for privilege escalation. Without this setup,
+sway will fail to start with session activation permission failures. Choose one
+of the two available options (In alphabetical, not recommended, order):
+
+1. polkit: This will make sway "just work" right after installation but may be
+           a weightier solution than desired.
+
+2. seatd: Already required as a sway dependency, this is a lighter-weight
+          solution but requires some user configuration: Enabling the service,
+          adding your user to the "seat" group, then logging out/in again.
+
+Either option should provide the same functionality/stability. Refer to the
+Sway wiki page for information.
+EOD
+}
+
+post_upgrade() {
+cat << EOD
+Sway's necessary privileges can now be obtained through seatd as well as the
+incumbent polkit package. As such, polkit has been relegated to an optional
+dependency.
+
+Note that using seatd instead of polkit means that a user must be a part of the
+"seat" group: Otherwise, the user will not be able to achieve the appropriate
+privileged actions.
+
+For more information, refer to the Sway wiki page.
+EOD
+}

Copied: sway/repos/community-testing-x86_64/sway.service (from rev 1207750, sway/trunk/sway.service)
===================================================================
--- community-testing-x86_64/sway.service	                        (rev 0)
+++ community-testing-x86_64/sway.service	2022-05-18 02:56:06 UTC (rev 1207751)
@@ -0,0 +1,16 @@
+# https://github.com/swaywm/sway/wiki/Systemd-integration
+
+[Unit]
+Description=sway - SirCmpwn's Wayland window manager
+Documentation=man:sway(5)
+BindsTo=graphical-session.target
+Wants=graphical-session-pre.target
+After=graphical-session-pre.target
+
+[Service]
+Type=simple
+EnvironmentFile=-%h/.config/sway/env
+ExecStart=/usr/bin/sway
+Restart=on-failure
+RestartSec=1
+TimeoutStopSec=10



More information about the arch-commits mailing list