Optionally use custom rebase of xwayland_hidpi after upstream XWayland split.

Users just have to toggle the use of the upstream PR and use my branch
instead. It’s a custom branch, so I made it optional.
I’ve also bumped the version number. Not bumping it for the previous
commit may have caused problems to some users for a short amount of
time.
This commit is contained in:
Antonin Décimo 2020-05-25 16:38:26 +02:00
parent 79a7844cdd
commit f164297eba
2 changed files with 11 additions and 8 deletions

View File

@ -1,6 +1,6 @@
pkgbase = wlroots-hidpi-git pkgbase = wlroots-hidpi-git
pkgdesc = Modular Wayland compositor library, with XWayland HiDPI pkgdesc = Modular Wayland compositor library, with XWayland HiDPI
pkgver = 0.10.0.r107.g61d6408f pkgver = 0.10.0.r147.g0758a4fc
pkgrel = 1 pkgrel = 1
url = https://github.com/swaywm/wlroots url = https://github.com/swaywm/wlroots
arch = x86_64 arch = x86_64
@ -24,9 +24,9 @@ pkgbase = wlroots-hidpi-git
conflicts = wlroots conflicts = wlroots
options = debug options = debug
source = wlroots-hidpi-git::git+https://github.com/swaywm/wlroots source = wlroots-hidpi-git::git+https://github.com/swaywm/wlroots
source = https://github.com/swaywm/wlroots/pull/2064.diff source = xwayland_hidpi.diff::https://github.com/swaywm/wlroots/pull/2064.diff
sha512sums = SKIP
sha512sums = SKIP sha512sums = SKIP
sha512sums = c8f316ebffaf6ad0991afc0091c0a1dec69c29ec7a2e8c5c5cf260d9919e11b1040da9006028aac5e1883fb788927c4bccef05629bf3db2b3c2374e33c6482f2
pkgname = wlroots-hidpi-git pkgname = wlroots-hidpi-git

View File

@ -1,7 +1,7 @@
# Maintainer: Adrian Perez de Castro <aperez@igalia.com> # Maintainer: Adrian Perez de Castro <aperez@igalia.com>
# Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com> # Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com>
pkgname=wlroots-hidpi-git pkgname=wlroots-hidpi-git
pkgver=0.10.0.r107.g61d6408f pkgver=0.10.0.r147.g0758a4fc
pkgrel=1 pkgrel=1
license=(custom:MIT) license=(custom:MIT)
pkgdesc='Modular Wayland compositor library, with XWayland HiDPI' pkgdesc='Modular Wayland compositor library, with XWayland HiDPI'
@ -14,10 +14,13 @@ depends=(libcap systemd wayland opengl-driver libxcb xcb-util-errors
xcb-util-wm pixman libinput libxkbcommon) xcb-util-wm pixman libinput libxkbcommon)
makedepends=(meson ninja git wayland-protocols xorgproto) makedepends=(meson ninja git wayland-protocols xorgproto)
source=("${pkgname}::git+${url}" source=("${pkgname}::git+${url}"
"https://github.com/swaywm/wlroots/pull/2064.diff") "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/pull/2064.diff"
# "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/compare/master...MisterDA:xwayland_hidpi.diff"
)
sha512sums=('SKIP' sha512sums=('SKIP'
'SKIP') 'c8f316ebffaf6ad0991afc0091c0a1dec69c29ec7a2e8c5c5cf260d9919e11b1040da9006028aac5e1883fb788927c4bccef05629bf3db2b3c2374e33c6482f2'
# 'febd12baefd79a3563fd66931e4f79f3f80b1261b396fffd07b84cc527ff036346eb7ccf73b0e1aed5d3ea51ca39c8420af82966d75cce02367654324b52e050'
)
pkgver () { pkgver () {
cd "${pkgname}" cd "${pkgname}"
@ -31,7 +34,7 @@ pkgver () {
build () { build () {
cd "${pkgname}" cd "${pkgname}"
patch -Np1 -i ../2064.diff patch -Np1 -i ../xwayland_hidpi.diff
rm -rf build rm -rf build
meson build \ meson build \