Revert "Use custom rebase of xwayland_hidpi after upstream XWaylaynd split."

This reverts commit 0a5f66f7c0.
This commit is contained in:
Antonin Décimo 2020-05-25 16:48:55 +02:00
parent 0a5f66f7c0
commit 79a7844cdd
2 changed files with 5 additions and 6 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.r146.g5c942bd5 pkgver = 0.10.0.r107.g61d6408f
pkgrel = 1 pkgrel = 1
url = https://github.com/swaywm/wlroots url = https://github.com/swaywm/wlroots
arch = x86_64 arch = x86_64
@ -24,7 +24,7 @@ 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 = xwayland_hidpi.diff::https://github.com/swaywm/wlroots/compare/master...MisterDA:xwayland_hidpi.diff source = https://github.com/swaywm/wlroots/pull/2064.diff
sha512sums = SKIP sha512sums = SKIP
sha512sums = SKIP sha512sums = SKIP

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.r146.g5c942bd5 pkgver=0.10.0.r107.g61d6408f
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,8 +14,7 @@ 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}"
# "xwayland_hidpi.diff::https://github.com/swaywm/wlroots/pull/2064.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') 'SKIP')
@ -32,7 +31,7 @@ pkgver () {
build () { build () {
cd "${pkgname}" cd "${pkgname}"
patch -Np1 -i ../xwayland_hidpi.diff patch -Np1 -i ../2064.diff
rm -rf build rm -rf build
meson build \ meson build \