[arch-commits] Commit in sway/repos/community-staging-x86_64 (10 files)
Brett Cornwall
ainola at gemini.archlinux.org
Wed May 11 21:33:23 UTC 2022
Date: Wednesday, May 11, 2022 @ 21:33:22
Author: ainola
Revision: 1198387
archrelease: copy trunk to community-staging-x86_64
Added:
sway/repos/community-staging-x86_64/50-systemd-user.conf
(from rev 1198386, sway/trunk/50-systemd-user.conf)
sway/repos/community-staging-x86_64/PKGBUILD
(from rev 1198386, sway/trunk/PKGBUILD)
sway/repos/community-staging-x86_64/sway-session.target
(from rev 1198386, sway/trunk/sway-session.target)
sway/repos/community-staging-x86_64/sway.install
(from rev 1198386, sway/trunk/sway.install)
sway/repos/community-staging-x86_64/sway.service
(from rev 1198386, sway/trunk/sway.service)
Deleted:
sway/repos/community-staging-x86_64/50-systemd-user.conf
sway/repos/community-staging-x86_64/PKGBUILD
sway/repos/community-staging-x86_64/sway-session.target
sway/repos/community-staging-x86_64/sway.install
sway/repos/community-staging-x86_64/sway.service
----------------------+
50-systemd-user.conf | 14 ++--
PKGBUILD | 142 ++++++++++++++++++++++++-------------------------
sway-session.target | 16 ++---
sway.install | 62 ++++++++++-----------
sway.service | 32 +++++------
5 files changed, 133 insertions(+), 133 deletions(-)
Deleted: 50-systemd-user.conf
===================================================================
--- 50-systemd-user.conf 2022-05-11 21:32:48 UTC (rev 1198386)
+++ 50-systemd-user.conf 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -1,7 +0,0 @@
-# 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-staging-x86_64/50-systemd-user.conf (from rev 1198386, sway/trunk/50-systemd-user.conf)
===================================================================
--- 50-systemd-user.conf (rev 0)
+++ 50-systemd-user.conf 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -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
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-05-11 21:32:48 UTC (rev 1198386)
+++ PKGBUILD 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -1,71 +0,0 @@
-# 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=4
-pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager'
-arch=(x86_64)
-url='https://swaywm.org/'
-license=(MIT)
-depends=(
- 'cairo'
- 'gdk-pixbuf2'
- 'json-c'
- 'pango'
- 'pcre'
- 'seatd'
- 'swaybg'
- 'ttf-font'
- 'wlroots'
-)
-makedepends=(git meson ninja scdoc setconf wayland-protocols)
-backup=(etc/sway/config)
-optdepends=(
- 'dmenu: Application launcher'
- 'i3status: Status line'
- 'foot: Terminal emulator used in the default configuration'
- 'mako: Lightweight notification daemon'
- 'polkit: System privilege control. Required if not using seatd service'
- '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)
-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-staging-x86_64/PKGBUILD (from rev 1198386, sway/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -0,0 +1,71 @@
+# 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=5
+pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager'
+arch=(x86_64)
+url='https://swaywm.org/'
+license=(MIT)
+depends=(
+ 'cairo'
+ 'gdk-pixbuf2'
+ 'json-c'
+ 'pango'
+ 'pcre'
+ 'seatd'
+ 'ttf-font'
+ 'wlroots'
+)
+makedepends=(git meson ninja scdoc setconf wayland-protocols)
+backup=(etc/sway/config)
+optdepends=(
+ 'dmenu: Application launcher'
+ 'i3status: Status line'
+ 'foot: Terminal emulator used in the default configuration'
+ '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)
+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
Deleted: sway-session.target
===================================================================
--- sway-session.target 2022-05-11 21:32:48 UTC (rev 1198386)
+++ sway-session.target 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -1,8 +0,0 @@
-# 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-staging-x86_64/sway-session.target (from rev 1198386, sway/trunk/sway-session.target)
===================================================================
--- sway-session.target (rev 0)
+++ sway-session.target 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -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
Deleted: sway.install
===================================================================
--- sway.install 2022-05-11 21:32:48 UTC (rev 1198386)
+++ sway.install 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -1,31 +0,0 @@
-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-staging-x86_64/sway.install (from rev 1198386, sway/trunk/sway.install)
===================================================================
--- sway.install (rev 0)
+++ sway.install 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -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
+}
Deleted: sway.service
===================================================================
--- sway.service 2022-05-11 21:32:48 UTC (rev 1198386)
+++ sway.service 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -1,16 +0,0 @@
-# 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
Copied: sway/repos/community-staging-x86_64/sway.service (from rev 1198386, sway/trunk/sway.service)
===================================================================
--- sway.service (rev 0)
+++ sway.service 2022-05-11 21:33:22 UTC (rev 1198387)
@@ -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