diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | fix-xwayland-compile.patch | 28 |
3 files changed, 2 insertions, 35 deletions
@@ -1,5 +1,5 @@ pkgbase = xorg-server-git - pkgver = 1.20.0.r569.gb1ee4036b + pkgver = 1.20.0.r578.g49456e0a3 pkgrel = 1 url = https://gitlab.freedesktop.org/xorg/xserver.git arch = x86_64 @@ -37,11 +37,9 @@ pkgbase = xorg-server-git makedepends = meson makedepends = git source = git+https://gitlab.freedesktop.org/xorg/xserver.git - source = fix-xwayland-compile.patch source = xvfb-run source = xvfb-run.1 sha256sums = SKIP - sha256sums = a585e8c778ec2fd4f4f415051c6243e8e674f0cf038e8f2f440101bfde6f7d3b sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9 sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 @@ -13,7 +13,7 @@ pkgname=( 'xorg-server-common-git' 'xorg-server-devel-git') _pkgbase='xserver' -pkgver=1.20.0.r569.gb1ee4036b +pkgver=1.20.0.r578.g49456e0a3 pkgrel=1 arch=('x86_64') license=('custom') @@ -26,11 +26,9 @@ makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'xtrans' 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson' 'git') source=(git+https://gitlab.freedesktop.org/xorg/xserver.git - fix-xwayland-compile.patch xvfb-run xvfb-run.1) sha256sums=('SKIP' - 'a585e8c778ec2fd4f4f415051c6243e8e674f0cf038e8f2f440101bfde6f7d3b' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') @@ -42,7 +40,6 @@ pkgver() { prepare() { cd "${_pkgbase}" - patch -Np1 -i ../fix-xwayland-compile.patch cd .. # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf # With them, module fail to load with undefined symbol. diff --git a/fix-xwayland-compile.patch b/fix-xwayland-compile.patch deleted file mode 100644 index 2636b570543e..000000000000 --- a/fix-xwayland-compile.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bea53471f538d90eaaed5dcc7c9065d265d876ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com> -Date: Mon, 23 Dec 2019 09:26:17 +0100 -Subject: [PATCH 6/6] xwayland: Include xwayland-window.h from - xwayland-glamor-eglstream.c - -Fixes build failure. - -Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/954 -Fixes: 89e32d00f6e0 "xwayland: Move Xwayland windows to its own sources" ---- - hw/xwayland/xwayland-glamor-eglstream.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c -index 81947a6ba..aa5267a4d 100644 ---- a/hw/xwayland/xwayland-glamor-eglstream.c -+++ b/hw/xwayland/xwayland-glamor-eglstream.c -@@ -43,6 +43,7 @@ - #include "xwayland-glamor.h" - #include "xwayland-pixmap.h" - #include "xwayland-screen.h" -+#include "xwayland-window.h" - - #include "wayland-eglstream-client-protocol.h" - #include "wayland-eglstream-controller-client-protocol.h" --- -2.24.1 |