Update to parity with community/sway.

This commit is contained in:
Antonin Décimo 2020-10-23 12:18:57 +02:00
parent c7e9044317
commit 5508e76470
3 changed files with 74 additions and 31 deletions

View File

@ -1,36 +1,45 @@
pkgbase = sway-git pkgbase = sway-git
pkgdesc = i3-compatible Wayland compositor pkgdesc = Tiling Wayland compositor and replacement for the i3 window manager
pkgver = r5942.3f77591b pkgver = r6506.1be66c98
pkgrel = 1 pkgrel = 1
url = https://swaywm.org url = https://swaywm.org
arch = i686 arch = i686
arch = x86_64 arch = x86_64
license = MIT license = MIT
makedepends = meson
makedepends = git makedepends = git
makedepends = meson
makedepends = ninja
makedepends = scdoc makedepends = scdoc
makedepends = wayland-protocols makedepends = wayland-protocols
makedepends = ninja
depends = json-c
depends = pcre
depends = wlroots-git
depends = cairo depends = cairo
depends = pango
depends = gdk-pixbuf2 depends = gdk-pixbuf2
depends = pam depends = json-c
depends = xorg-server-xwayland depends = pango
depends = polkit
depends = pcre
depends = swaybg-git depends = swaybg-git
optdepends = alacritty: Default terminal emulator. depends = ttf-font
optdepends = dmenu: Default for launching applications. depends = wlroots-git
optdepends = i3status: To display system information with a bar. depends = xorg-server-xwayland
optdepends = swayidle-git: Idle management daemon for Sway. optdepends = alacritty: Terminal emulator used by the default config
optdepends = swaylock-git: Screen locker for Sway. optdepends = dmenu: Application launcher
optdepends = grim: Screenshot utility
optdepends = i3status: Status line
optdepends = mako: Lightweight notification daemon
optdepends = slurp: Select a region
optdepends = swayidle: Idle management daemon
optdepends = swaylock: Screen locker
optdepends = wallutils: Timed wallpapers
optdepends = waybar: Highly customizable bar
provides = sway provides = sway
conflicts = sway conflicts = sway
options = debug options = debug
options = !strip options = !strip
backup = etc/sway/config
source = sway::git+https://github.com/swaywm/sway.git source = sway::git+https://github.com/swaywm/sway.git
source = 50-systemd-user.conf
sha512sums = SKIP sha512sums = SKIP
sha512sums = 57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e
pkgname = sway-git pkgname = sway-git

7
50-systemd-user.conf Normal file
View File

@ -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
exec hash dbus-update-activation-environment 2>/dev/null && \
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK

View File

@ -1,26 +1,49 @@
# Maintainer: Drew DeVault <sir@cmpwn.com> # Maintainer: Drew DeVault <sir@cmpwn.com>
# Contributor: Antonin Décimo <antonin dot decimo at gmail dot com>
pkgname=sway-git pkgname=sway-git
_pkgname=sway _pkgname=sway
pkgver=r5942.3f77591b pkgver=r6506.1be66c98
pkgrel=1 pkgrel=1
license=("MIT") license=("MIT")
pkgdesc="i3-compatible Wayland compositor" pkgdesc="Tiling Wayland compositor and replacement for the i3 window manager"
makedepends=("meson" "git" "scdoc" "wayland-protocols" "ninja") makedepends=(
"git"
"meson"
"ninja"
"scdoc"
"wayland-protocols"
)
depends=( depends=(
"json-c" "pcre" "wlroots-git" "cairo" "pango" "gdk-pixbuf2" "pam" "cairo"
"xorg-server-xwayland" "swaybg-git" "gdk-pixbuf2"
"json-c"
"pango"
"polkit"
"pcre"
"swaybg-git"
"ttf-font"
"wlroots-git"
"xorg-server-xwayland"
) )
optdepends=( optdepends=(
"alacritty: Default terminal emulator." "alacritty: Terminal emulator used by the default config"
"dmenu: Default for launching applications." "dmenu: Application launcher"
"i3status: To display system information with a bar." "grim: Screenshot utility"
"swayidle-git: Idle management daemon for Sway." "i3status: Status line"
"swaylock-git: Screen locker for Sway." "mako: Lightweight notification daemon"
"slurp: Select a region"
"swayidle: Idle management daemon"
"swaylock: Screen locker"
"wallutils: Timed wallpapers"
"waybar: Highly customizable bar"
) )
backup=(etc/sway/config)
arch=("i686" "x86_64") arch=("i686" "x86_64")
url="https://swaywm.org" url="https://swaywm.org"
source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git") source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git"
sha512sums=('SKIP') 50-systemd-user.conf)
sha512sums=("SKIP"
"57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e")
provides=("sway") provides=("sway")
conflicts=("sway") conflicts=("sway")
options=(debug !strip) options=(debug !strip)
@ -30,10 +53,6 @@ pkgver() {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
} }
prepare() {
cd "$_pkgname"
}
build() { build() {
cd "$_pkgname" cd "$_pkgname"
meson \ meson \
@ -44,6 +63,14 @@ build() {
} }
package() { package() {
install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/"
cd "$_pkgname" cd "$_pkgname"
DESTDIR="$pkgdir" ninja -C "$srcdir/build" install DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
for util in autoname-workspaces.py inactive-windows-transparency.py grimshot; do
install -Dm755 "contrib/$util" -t "$pkgdir/usr/share/$pkgname/scripts"
done
} }