From 57b60d048a10c58757eb7494face03f056221a03 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Thu, 19 Apr 2018 18:42:28 +1100
Subject: [PATCH] upgrel : 1.19.6+13+gd0d1a694f-3
---
PKGBUILD | 14 +++++++----
xext-shm-downgrade-from-error-to-debug.patch | 26 ++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 xext-shm-downgrade-from-error-to-debug.patch
diff --git a/PKGBUILD b/PKGBUILD
index 667d334..18ff958 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb'
'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
pkgver=1.19.6+13+gd0d1a694f
-pkgrel=2
+pkgrel=3
arch=('x86_64')
license=('custom')
groups=('xorg')
@@ -25,13 +25,15 @@ source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commi
xvfb-run
xvfb-run.1
nvidia-add-modulepath-support.patch
- xserver-autobind-hotplug.patch)
+ xserver-autobind-hotplug.patch
+ xext-shm-downgrade-from-error-to-debug.patch)
sha256sums=('SKIP'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'23f2fd69a53ef70c267becf7d2a9e7e07b739f8ec5bec10adb219bc6465099c7'
- '67aaf8668c5fb3c94b2569df28e64bfa1dc97ce429cbbc067c309113caff6369')
+ '67aaf8668c5fb3c94b2569df28e64bfa1dc97ce429cbbc067c309113caff6369'
+ 'b894948e9eba733ae586d59b647a8b40551875dddeea91610546930fdda22063')
validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal
pkgver() {
@@ -47,7 +49,9 @@ prepare() {
# patch from Fedora, not yet merged
patch -Np1 -i ../xserver-autobind-hotplug.patch
-
+ # merged upstream in trunk (FS#58187)
+ patch -Np1 -i ../xext-shm-downgrade-from-error-to-debug.patch
+
autoreconf -vfi
}
@@ -172,7 +176,7 @@ package_xorg-server-xephyr() {
package_xorg-server-xvfb() {
pkgdesc="Virtual framebuffer X server"
- depends=('libxfont2' 'libunwind' 'pixman' 'xorg-server-common' 'xorg-xauth' 'libgl')
+ depends=('libxfont2' 'libunwind' 'pixman' 'xorg-server-common' 'xorg-xauth' 'libgl' 'which')
cd xserver/hw/vfb
#cd "${pkgbase}-${pkgver}/hw/vfb"
diff --git a/xext-shm-downgrade-from-error-to-debug.patch b/xext-shm-downgrade-from-error-to-debug.patch
new file mode 100644
index 0000000..a689c8a
--- /dev/null
+++ b/xext-shm-downgrade-from-error-to-debug.patch
@@ -0,0 +1,26 @@
+From d36128a72acac4d54813c52c93efefad2dc9af41 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov <a.volkov@rusbitech.ru>
+Date: Mon, 12 Mar 2018 15:12:10 +0300
+Subject: Xext/shm: Downgrade from error to debug log output about success
+
+Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ Xext/shm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Xext/shm.c b/Xext/shm.c
+index 15e1b67..fc8441c 100644
+--- a/Xext/shm.c
++++ b/Xext/shm.c
+@@ -1199,7 +1199,7 @@ shm_tmpfile(void)
+ #ifdef O_TMPFILE
+ fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+ if (fd >= 0) {
+- ErrorF ("Using O_TMPFILE\n");
++ DebugF ("Using O_TMPFILE\n");
+ return fd;
+ }
+ ErrorF ("Not using O_TMPFILE\n");
+--
+cgit v1.1
--
GitLab