Date: Thursday, September 26, 2019 @ 10:18:02 Author: arodseth Revision: 511820
upgpkg: sway 1:1.2-3 Added: sway/trunk/10-systemd.conf Modified: sway/trunk/PKGBUILD -----------------+ 10-systemd.conf | 10 ++++++++++ PKGBUILD | 18 +++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) Added: 10-systemd.conf =================================================================== --- 10-systemd.conf (rev 0) +++ 10-systemd.conf 2019-09-26 10:18:02 UTC (rev 511820) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# FS#63021 +# + +systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XCURSOR_SIZE + +if command -v dbus-update-activation-environment >/dev/null 2>&1; then + dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XCURSOR_SIZE +fi Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-26 10:12:06 UTC (rev 511819) +++ PKGBUILD 2019-09-26 10:18:02 UTC (rev 511820) @@ -3,14 +3,13 @@ pkgname=sway pkgver=1.2 -_hash='be138dab4419d3e76a7742428d9ec85bce06116b' epoch=1 -pkgrel=2 +pkgrel=3 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 swaybg ttf-font 'wlroots>=0.6') +depends=(cairo gdk-pixbuf2 json-c pango pcre swaybg ttf-font wlroots) makedepends=(git meson ninja scdoc setconf wayland-protocols) backup=(etc/sway/config) optdepends=( @@ -26,18 +25,14 @@ 'waybar: Highly customizable bar' 'xorg-server-xwayland: X11 support' ) -source=("git+https://github.com/swaywm/sway#tag=$pkgver";) -md5sums=('SKIP') +source=('git+https://github.com/swaywm/sway#commit=be138dab4419d3e76a7742428d9ec85bce06116b' + 10-systemd.conf) +md5sums=('SKIP' + 'e614ac10c21d57da6b3af25653589a9e') prepare() { cd $pkgname - # check if the git hash matches - if [[ "$(git rev-parse HEAD)" != "$_hash" ]]; then - echo "error: $(git rev-parse HEAD) != $_hash" - exit 1 - fi - # Set the version information to 'Arch Linux' instead of 'makepkg' sed -i "s/branch \\\'@1@\\\'/Arch Linux/g" meson.build } @@ -51,6 +46,7 @@ package() { DESTDIR="$pkgdir" ninja -C build install install -Dm644 $pkgname/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm755 10-systemd.conf "$pkgdir/etc/sway/conf.d/10-systemd.conf" } # vim: ts=2 sw=2 et
