Merge branch 'master' into issue1417

This commit is contained in:
Drew DeVault 2017-12-12 11:09:31 -05:00 committed by GitHub
commit 460c2eecf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 145 additions and 68 deletions

View file

@ -61,11 +61,12 @@ Install dependencies:
* libcap
* asciidoc
* pcre
* json-c
* json-c <= 0.12.1
* pango
* cairo
* gdk-pixbuf2 *
* pam **
* dbus >= 1.10 ***
* imagemagick (required for image capture with swaygrab)
* ffmpeg (required for video capture with swaygrab)
@ -73,6 +74,8 @@ _\*Only required for swaybar, swaybg, and swaylock_
_\*\*Only required for swaylock_
_\*\*\*Only required for tray support_
Run these commands:
mkdir build
@ -83,7 +86,7 @@ Run these commands:
On systems with logind, you need to set a few caps on the binary:
sudo setcap "cap_sys_ptrace,cap_sys_tty_config=eip" /usr/bin/sway
sudo setcap "cap_sys_ptrace,cap_sys_tty_config=eip" /usr/local/bin/sway
On systems without logind, you need to suid the sway binary: