From 078b3c5c44679ed4c3dfee2e85408b1a92f293b8 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Sun, 24 Dec 2017 10:11:38 +0000 Subject: [PATCH 1/5] added initial pkgbuild for sway-wlroots --- dist/archlinux/PKGBUILD | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 dist/archlinux/PKGBUILD diff --git a/dist/archlinux/PKGBUILD b/dist/archlinux/PKGBUILD new file mode 100644 index 000000000..5c8ba46a7 --- /dev/null +++ b/dist/archlinux/PKGBUILD @@ -0,0 +1,66 @@ +# Maintainer: Drew DeVault +# Contributor: chrisaw + +pkgname=sway +pkgver=git +pkgrel=1 +license=('MIT') +pkgdesc='i3 compatible window manager for Wayland' +makedepends=( + "meson" + "git" + "asciidoc" +) +depends=( + "wlroots" + "wayland" + "xorg-server-xwayland" + "libinput" + "libcap" + "pcre" + "json-c" + "pango" + "cairo" + "gdk-pixbuf2" + "pam" + "dbus" +) +optdepends=( + "rxvt-unicode: Default terminal emulator." + "dmenu: Default for launching applications." + "imagemagick: For taking screenshots." + "ffmpeg: For recording screencasts." + "i3status: To display system information with a bar." +) +arch=("i686" "x86_64") +url='http://swaywm.org' +source=("${pkgname%-*}::git+https://github.com/SirCmpwn/sway.git#wlroots") +sha1sums=('SKIP') +provides=('sway') +conflicts=('sway-git') +install=sway.install + +pkgver() { + cd "${srcdir}/${pkgname}" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + cd "${srcdir}/${pkgname}" + + meson build \ + --prefix=/usr \ + -Dbuildtype=debugoptimized \ + -Db_lto=True \ + -Denable-systemd=True \ + -Denable-elogind=False \ + -Denable-libcap=True + + ninja -C build +} + +package() { + cd "${srcdir}/${pkgname}" + + DESTDIR="${pkgdir}" ninja -C build install +} \ No newline at end of file From 32a109d7568776d4d8a56cd5b5366eb1626fd7a2 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Sun, 24 Dec 2017 10:21:24 +0000 Subject: [PATCH 2/5] removed wlc-git from .build.yml --- .build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.build.yml b/.build.yml index a2f855e94..8f1b1ce90 100644 --- a/.build.yml +++ b/.build.yml @@ -2,7 +2,6 @@ image: archlinux packages: - meson - - wlc-git - xorg-server-xwayland - xcb-util-image - json-c From d095a9bf3ec3229fb95093ca6a0427a68b7e28b2 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Sun, 24 Dec 2017 10:24:43 +0000 Subject: [PATCH 3/5] added sway.install to set pcap permissions on arch --- dist/archlinux/sway.install | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dist/archlinux/sway.install diff --git a/dist/archlinux/sway.install b/dist/archlinux/sway.install new file mode 100644 index 000000000..3c3706a50 --- /dev/null +++ b/dist/archlinux/sway.install @@ -0,0 +1,3 @@ +post_install() { + setcap "cap_sys_ptrace,cap_sys_tty_config=eip" /usr/bin/sway +} \ No newline at end of file From 452c8ff463115c61d3dbbe76f904ade4ac4c26cd Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Sun, 24 Dec 2017 10:30:28 +0000 Subject: [PATCH 4/5] removed unused meson build options --- dist/archlinux/PKGBUILD | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dist/archlinux/PKGBUILD b/dist/archlinux/PKGBUILD index 5c8ba46a7..0944edf61 100644 --- a/dist/archlinux/PKGBUILD +++ b/dist/archlinux/PKGBUILD @@ -51,10 +51,7 @@ build() { meson build \ --prefix=/usr \ -Dbuildtype=debugoptimized \ - -Db_lto=True \ - -Denable-systemd=True \ - -Denable-elogind=False \ - -Denable-libcap=True + -Db_lto=True ninja -C build } From 79e68e7b87e07144f13e4270f3cee891cca01270 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Sun, 24 Dec 2017 10:32:49 +0000 Subject: [PATCH 5/5] fixed branch syntax for arch package --- dist/archlinux/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/archlinux/PKGBUILD b/dist/archlinux/PKGBUILD index 0944edf61..d0130eefb 100644 --- a/dist/archlinux/PKGBUILD +++ b/dist/archlinux/PKGBUILD @@ -34,7 +34,7 @@ optdepends=( ) arch=("i686" "x86_64") url='http://swaywm.org' -source=("${pkgname%-*}::git+https://github.com/SirCmpwn/sway.git#wlroots") +source=("${pkgname%-*}::git+https://github.com/SirCmpwn/sway.git#branch=wlroots") sha1sums=('SKIP') provides=('sway') conflicts=('sway-git')