From 01320854183ba1bb7158f5eec41da76523ddaacc Mon Sep 17 00:00:00 2001 From: Brett Cornwall Date: Tue, 15 Oct 2019 03:35:43 +0000 Subject: [PATCH] Re-introduce GPG key, use release tarballs --- PKGBUILD | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index d276b2b..c106a71 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=sway pkgver=1.2 epoch=1 -pkgrel=4 +pkgrel=5 pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager' arch=(x86_64) url='https://swaywm.org/' @@ -25,13 +25,16 @@ optdepends=( 'waybar: Highly customizable bar' 'xorg-server-xwayland: X11 support' ) -source=('git+https://github.com/swaywm/sway#commit=be138dab4419d3e76a7742428d9ec85bce06116b' - 10-systemd.conf) -md5sums=('SKIP' - 'e614ac10c21d57da6b3af25653589a9e') +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" + "10-systemd.conf") +sha512sums=('e3842e0da58a1678289aa24fc84f6841deeea6e9ffe04407525e5b9d62ed177d890133ff07412317c811f5b07a2e5073d14ff59a30e62111f51fc65af0dddb19' + 'SKIP' + '122b97f7adb6444c442368c5bbbd3401bcd8420f522fcd6521def5a09cd2989f5f6f555a5a7762e922eaa307077eb26db6508242ee1b835ca73ad65acaeef95b') +validpgpkeys=('9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A') # Drew DeVault prepare() { - cd $pkgname + cd "$pkgname-$pkgver" # Set the version information to 'Arch Linux' instead of 'makepkg' sed -i "s/branch \\\'@1@\\\'/Arch Linux/g" meson.build @@ -39,13 +42,13 @@ prepare() { build() { mkdir -p build - arch-meson build $pkgname -D werror=false -D b_ndebug=true + arch-meson build "$pkgname-$pkgver" -D werror=false -D b_ndebug=true ninja -C build } package() { DESTDIR="$pkgdir" ninja -C build install - install -Dm644 $pkgname/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm755 10-systemd.conf "$pkgdir/etc/sway/conf.d/10-systemd.conf" }