Merge branch 'sway-master' into hidpi-master
This commit is contained in:
Antonin Décimo
commit
6c74001bca
39
.SRCINFO
39
.SRCINFO
|
|
@ -1,38 +1,47 @@
|
|||
pkgbase = sway-hidpi-git
|
||||
pkgdesc = i3-compatible Wayland compositor, with XWayland HiDPI
|
||||
pkgver = r6341.ae3ec745
|
||||
pkgdesc = Tiling Wayland compositor and replacement for the i3 window manager, with XWayland HiDPI
|
||||
pkgver = r6506.1be66c98
|
||||
pkgrel = 1
|
||||
url = https://swaywm.org
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
license = MIT
|
||||
makedepends = meson
|
||||
makedepends = git
|
||||
makedepends = meson
|
||||
makedepends = ninja
|
||||
makedepends = scdoc
|
||||
makedepends = wayland-protocols
|
||||
makedepends = ninja
|
||||
depends = json-c
|
||||
depends = pcre
|
||||
depends = wlroots-hidpi-git
|
||||
depends = cairo
|
||||
depends = pango
|
||||
depends = gdk-pixbuf2
|
||||
depends = pam
|
||||
depends = xorg-server-xwayland-hidpi-git
|
||||
depends = json-c
|
||||
depends = pango
|
||||
depends = polkit
|
||||
depends = pcre
|
||||
depends = swaybg-git
|
||||
depends = ttf-font
|
||||
depends = wlroots-hidpi-git
|
||||
depends = xorg-server-xwayland-hidpi-git
|
||||
depends = xsettingsd
|
||||
optdepends = alacritty: Default terminal emulator.
|
||||
optdepends = dmenu: Default for launching applications.
|
||||
optdepends = i3status: To display system information with a bar.
|
||||
optdepends = swayidle-git: Idle management daemon for Sway.
|
||||
optdepends = swaylock-git: Screen locker for Sway.
|
||||
optdepends = alacritty: Terminal emulator used by the default config
|
||||
optdepends = dmenu: Application launcher
|
||||
optdepends = grim: Screenshot utility
|
||||
optdepends = i3status: Status line
|
||||
optdepends = mako: Lightweight notification daemon
|
||||
optdepends = slurp: Select a region
|
||||
optdepends = swayidle: Idle management daemon
|
||||
optdepends = swaylock: Screen locker
|
||||
optdepends = wallutils: Timed wallpapers
|
||||
optdepends = waybar: Highly customizable bar
|
||||
provides = sway
|
||||
conflicts = sway
|
||||
options = debug
|
||||
options = !strip
|
||||
backup = etc/sway/config
|
||||
source = sway-hidpi::git+https://github.com/swaywm/sway.git
|
||||
source = 50-systemd-user.conf
|
||||
source = xwayland_hidpi.diff::https://github.com/swaywm/sway/pull/5090.diff
|
||||
sha512sums = SKIP
|
||||
sha512sums = 57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e
|
||||
sha512sums = 813863fe8d391761770eb264b1c0a2d9442efde3e79fae6b78386ed7c041906eef60bbf9d9bc7d118494de8aba2cd4c45a13dcd2ca09f3f1cd1157e74f122667
|
||||
|
||||
pkgname = sway-hidpi-git
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
# sway does not set DISPLAY/WAYLAND_DISPLAY in the systemd user environment
|
||||
# See FS#63021
|
||||
# Adapted from xorg's 50-systemd-user.sh, which achieves a similar goal.
|
||||
|
||||
exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
|
||||
exec hash dbus-update-activation-environment 2>/dev/null && \
|
||||
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
|
||||
61
PKGBUILD
61
PKGBUILD
|
|
@ -2,42 +2,65 @@
|
|||
# Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com>
|
||||
pkgname=sway-hidpi-git
|
||||
_pkgname=sway-hidpi
|
||||
pkgver=r6437.ea3ba203
|
||||
pkgver=r6506.1be66c98
|
||||
pkgrel=1
|
||||
license=("MIT")
|
||||
pkgdesc="i3-compatible Wayland compositor, with XWayland HiDPI"
|
||||
makedepends=("meson" "git" "scdoc" "wayland-protocols" "ninja")
|
||||
pkgdesc="Tiling Wayland compositor and replacement for the i3 window manager, with XWayland HiDPI"
|
||||
makedepends=(
|
||||
"git"
|
||||
"meson"
|
||||
"ninja"
|
||||
"scdoc"
|
||||
"wayland-protocols"
|
||||
)
|
||||
depends=(
|
||||
"json-c" "pcre" "wlroots-hidpi-git" "cairo" "pango" "gdk-pixbuf2" "pam"
|
||||
"xorg-server-xwayland-hidpi-git" "swaybg-git" "xsettingsd"
|
||||
"cairo"
|
||||
"gdk-pixbuf2"
|
||||
"json-c"
|
||||
"pango"
|
||||
"polkit"
|
||||
"pcre"
|
||||
"swaybg-git"
|
||||
"ttf-font"
|
||||
"wlroots-hidpi-git"
|
||||
"xorg-server-xwayland-hidpi-git"
|
||||
"xsettingsd"
|
||||
)
|
||||
optdepends=(
|
||||
"alacritty: Default terminal emulator."
|
||||
"dmenu: Default for launching applications."
|
||||
"i3status: To display system information with a bar."
|
||||
"swayidle-git: Idle management daemon for Sway."
|
||||
"swaylock-git: Screen locker for Sway."
|
||||
"alacritty: Terminal emulator used by the default config"
|
||||
"dmenu: Application launcher"
|
||||
"grim: Screenshot utility"
|
||||
"i3status: Status line"
|
||||
"mako: Lightweight notification daemon"
|
||||
"slurp: Select a region"
|
||||
"swayidle: Idle management daemon"
|
||||
"swaylock: Screen locker"
|
||||
"wallutils: Timed wallpapers"
|
||||
"waybar: Highly customizable bar"
|
||||
)
|
||||
backup=(etc/sway/config)
|
||||
arch=("i686" "x86_64")
|
||||
url="https://swaywm.org"
|
||||
source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git"
|
||||
"50-systemd-user.conf"
|
||||
"xwayland_hidpi.diff::https://github.com/swaywm/sway/pull/5090.diff")
|
||||
sha512sums=('SKIP'
|
||||
'57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e'
|
||||
'813863fe8d391761770eb264b1c0a2d9442efde3e79fae6b78386ed7c041906eef60bbf9d9bc7d118494de8aba2cd4c45a13dcd2ca09f3f1cd1157e74f122667')
|
||||
provides=("sway")
|
||||
conflicts=("sway")
|
||||
options=(debug !strip)
|
||||
|
||||
pkgver() {
|
||||
cd "$_pkgname"
|
||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "$_pkgname"
|
||||
patch -Np1 -i ../xwayland_hidpi.diff
|
||||
}
|
||||
|
||||
pkgver() {
|
||||
cd "$_pkgname"
|
||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$_pkgname"
|
||||
meson \
|
||||
|
|
@ -48,6 +71,14 @@ build() {
|
|||
}
|
||||
|
||||
package() {
|
||||
install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/"
|
||||
|
||||
cd "$_pkgname"
|
||||
DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
|
||||
|
||||
install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
|
||||
for util in autoname-workspaces.py inactive-windows-transparency.py grimshot; do
|
||||
install -Dm755 "contrib/$util" -t "$pkgdir/usr/share/$pkgname/scripts"
|
||||
done
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue