Switch from 0.15 branch to master

This commit is contained in:
Drew DeVault 2018-10-02 07:25:51 -04:00
parent f136f4aac1
commit 6cea596d80
3 changed files with 32 additions and 41 deletions

View File

@ -1,31 +1,34 @@
pkgbase = sway-git pkgbase = sway-git
pkgdesc = i3 compatible window manager for Wayland pkgdesc = i3-compatible Wayland compositor
pkgver = r2587.22db6013 pkgver = r4818.183a4b0d
pkgrel = 1 pkgrel = 1
url = http://swaywm.org url = https://swaywm.org
install = sway-git.install
arch = i686 arch = i686
arch = x86_64 arch = x86_64
license = MIT license = MIT
makedepends = cmake makedepends = meson
makedepends = git makedepends = git
makedepends = asciidoc makedepends = scdoc
depends = wlc-git makedepends = wayland-protocols
depends = xorg-server-xwayland
depends = xcb-util-image
depends = json-c depends = json-c
depends = pango depends = pcre
depends = cairo depends = wlroots-git
depends = wayland depends = wayland
depends = libxkbcommon
depends = cairo
depends = pango
depends = gdk-pixbuf2 depends = gdk-pixbuf2
depends = pixman
depends = libcap
depends = libinput
depends = pam
depends = xorg-server-xwayland
optdepends = rxvt-unicode: Default terminal emulator. optdepends = rxvt-unicode: Default terminal emulator.
optdepends = dmenu: Default for launching applications. optdepends = dmenu: Default for launching applications.
optdepends = imagemagick: For taking screenshots.
optdepends = ffmpeg: For recording screencasts.
optdepends = i3status: To display system information with a bar. optdepends = i3status: To display system information with a bar.
provides = sway provides = sway
conflicts = sway conflicts = sway
source = sway::git+https://github.com/SirCmpwn/sway.git#branch=0.15 source = sway::git+https://github.com/swaywm/sway.git
sha1sums = SKIP sha1sums = SKIP
pkgname = sway-git pkgname = sway-git

View File

@ -1,31 +1,26 @@
# Maintainer: Drew DeVault <sir@cmpwn.com> # Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=sway-git pkgname=sway-git
_pkgname=sway _pkgname=sway
pkgver=r2587.22db6013 pkgver=r4818.183a4b0d
pkgrel=1 pkgrel=1
license=('MIT') license=("MIT")
pkgdesc='i3 compatible window manager for Wayland' pkgdesc="i3-compatible Wayland compositor"
makedepends=("cmake" "git" "asciidoc") makedepends=("meson" "git" "scdoc" "wayland-protocols")
depends=( depends=(
"wlc-git" "xorg-server-xwayland" "json-c" "pcre" "wlroots-git" "wayland" "libxkbcommon" "cairo" "pango"
"xcb-util-image" "json-c" "gdk-pixbuf2" "pixman" "libcap" "libinput" "pam" "xorg-server-xwayland"
"pango" "cairo"
"wayland" "gdk-pixbuf2"
) )
optdepends=( optdepends=(
"rxvt-unicode: Default terminal emulator." "rxvt-unicode: Default terminal emulator."
"dmenu: Default for launching applications." "dmenu: Default for launching applications."
"imagemagick: For taking screenshots."
"ffmpeg: For recording screencasts."
"i3status: To display system information with a bar." "i3status: To display system information with a bar."
) )
arch=("i686" "x86_64") arch=("i686" "x86_64")
url='http://swaywm.org' url="https://swaywm.org"
source=("${pkgname%-*}::git+https://github.com/SirCmpwn/sway.git#branch=0.15") source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git")
sha1sums=('SKIP') sha1sums=("SKIP")
provides=('sway') provides=("sway")
conflicts=('sway') conflicts=("sway")
install=sway-git.install
pkgver() { pkgver() {
cd "${srcdir}/${_pkgname}" cd "${srcdir}/${_pkgname}"
@ -34,16 +29,12 @@ pkgver() {
build() { build() {
cd "${srcdir}/${_pkgname}" cd "${srcdir}/${_pkgname}"
rm -rf "$srcdir/build"
cmake . \ meson -Dwerror=false --prefix /usr "$srcdir/build"
-DCMAKE_BUILD_TYPE=Upstream \ ninja -C "$srcdir/build"
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_PREFIX=/usr
make
} }
package() { package() {
cd "${srcdir}/${_pkgname}" cd "${srcdir}/${_pkgname}"
DESTDIR="$pkgdir/" ninja -C "$srcdir/build" install
DESTDIR="$pkgdir/" make install
} }

View File

@ -1,3 +0,0 @@
post_install() {
setcap cap_sys_ptrace=eip /usr/bin/sway
}