[arch-commits] Commit in xorg-server/trunk (2 files)

[Laurent Carlier]

    Date: Thursday, April 12, 2018 @ 05:34:32
  Author: lcarlier
Revision: 321611

upgpkg: xorg-server 1.19.6+13+gd0d1a694f-2

fix FS#58187

Added:
  xorg-server/trunk/xext-shm-downgrade-from-error-to-debug.patch
Modified:
  xorg-server/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |    6 ++++-
 xext-shm-downgrade-from-error-to-debug.patch |   27 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-11 22:58:31 UTC (rev 321610)
+++ PKGBUILD	2018-04-12 05:34:32 UTC (rev 321611)
@@ -5,7 +5,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=1
+pkgrel=2
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -22,6 +22,7 @@
 source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit"
         nvidia-add-modulepath-support.patch
         xserver-autobind-hotplug.patch
+	xext-shm-downgrade-from-error-to-debug.patch
         xvfb-run
         xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
@@ -31,6 +32,7 @@
 sha256sums=('SKIP'
             '914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8'
             'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
+            'ecfd6f72bd6e9494f64d48ab4abb8c68d07ce102c90b07006b21d60f63c1cdc8'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
 
@@ -47,6 +49,8 @@
   patch -Np1 -i ../nvidia-add-modulepath-support.patch
   # 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
 }

Added: xext-shm-downgrade-from-error-to-debug.patch
===================================================================
--- xext-shm-downgrade-from-error-to-debug.patch	                        (rev 0)
+++ xext-shm-downgrade-from-error-to-debug.patch	2018-04-12 05:34:32 UTC (rev 321611)
@@ -0,0 +1,27 @@
+From d36128a72acac4d54813c52c93efefad2dc9af41 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov <a.volkov at 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 at rusbitech.ru>
+Reviewed-by: Adam Jackson <ajax at 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
+