Merge branch 'sway-master' into hidpi-master

This commit is contained in:
Antonin Décimo 2020-10-24 02:37:09 +02:00
commit a9d8021aba
3 changed files with 4 additions and 9 deletions

View File

@ -1,7 +1,7 @@
pkgbase = sway-hidpi-git pkgbase = sway-hidpi-git
pkgdesc = Tiling Wayland compositor and replacement for the i3 window manager, with XWayland HiDPI pkgdesc = Tiling Wayland compositor and replacement for the i3 window manager, with XWayland HiDPI
pkgver = r6506.1be66c98 pkgver = r6506.1be66c98
pkgrel = 1 pkgrel = 2
url = https://swaywm.org url = https://swaywm.org
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@ -35,7 +35,6 @@ pkgbase = sway-hidpi-git
provides = sway provides = sway
conflicts = sway conflicts = sway
options = debug options = debug
options = !strip
backup = etc/sway/config backup = etc/sway/config
source = sway-hidpi::git+https://github.com/swaywm/sway.git source = sway-hidpi::git+https://github.com/swaywm/sway.git
source = 50-systemd-user.conf source = 50-systemd-user.conf

6
.gitignore vendored
View File

@ -1,5 +1 @@
*.tar.gz *
*.tar.xz
src/
pkg/
sway/

View File

@ -3,7 +3,7 @@
pkgname=sway-hidpi-git pkgname=sway-hidpi-git
_pkgname=sway-hidpi _pkgname=sway-hidpi
pkgver=r6506.1be66c98 pkgver=r6506.1be66c98
pkgrel=1 pkgrel=2
license=("MIT") license=("MIT")
pkgdesc="Tiling Wayland compositor and replacement for the i3 window manager, with XWayland HiDPI" pkgdesc="Tiling Wayland compositor and replacement for the i3 window manager, with XWayland HiDPI"
makedepends=( makedepends=(
@ -49,7 +49,7 @@ sha512sums=('SKIP'
'813863fe8d391761770eb264b1c0a2d9442efde3e79fae6b78386ed7c041906eef60bbf9d9bc7d118494de8aba2cd4c45a13dcd2ca09f3f1cd1157e74f122667') '813863fe8d391761770eb264b1c0a2d9442efde3e79fae6b78386ed7c041906eef60bbf9d9bc7d118494de8aba2cd4c45a13dcd2ca09f3f1cd1157e74f122667')
provides=("sway") provides=("sway")
conflicts=("sway") conflicts=("sway")
options=(debug !strip) options=(debug)
prepare() { prepare() {
cd "$_pkgname" cd "$_pkgname"