summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
authorPavel Vinogradov2019-02-26 21:47:14 -0500
committerPavel Vinogradov2019-02-26 21:52:05 -0500
commitd070adcb5a72d114c71f0835bdf20119462eac94 (patch)
treea4695d69602de79be9c418cb71e51deb6959fb22 /xorg
parentf49baac4efb48c4c7463eb441b1d0b50026da476 (diff)
xorg/xserver: version 1.20.4
Diffstat (limited to 'xorg')
-rwxr-xr-xxorg/xserver/DETAILS2
-rw-r--r--xorg/xserver/HISTORY4
-rw-r--r--xorg/xserver/patches/xwayland-config.patch14
3 files changed, 5 insertions, 15 deletions
diff --git a/xorg/xserver/DETAILS b/xorg/xserver/DETAILS
index 8e29c1c5af..1f030d57a8 100755
--- a/xorg/xserver/DETAILS
+++ b/xorg/xserver/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=xserver
SPELLX=xorg-server
- VERSION=1.20.3
+ VERSION=1.20.4
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index f2489ec479..c9d6e698c4 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,7 @@
+2019-02-26 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.20.4
+ * patches/xwayland-config.patch: removed, fixed in upstream
+
2018-12-19 Pavel Vinogradov <public@sourcemage.org>
* *SUB_DEPENDS: added XWAYLAND subdependency
diff --git a/xorg/xserver/patches/xwayland-config.patch b/xorg/xserver/patches/xwayland-config.patch
deleted file mode 100644
index 82c2082941..0000000000
--- a/xorg/xserver/patches/xwayland-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- /dev/null 2018-08-08 08:41:18.087999984 +0200
-+++ a/include/xwayland-config.h.meson.in 2018-04-27 13:18:04.000000000 +0200
-@@ -0,0 +1,11 @@
-+/* xwayland-config.h.meson.in: not at all generated */
-+
-+#pragma once
-+
-+#include <dix-config.h>
-+
-+/* Build glamor support for Xwayland */
-+#mesondefine XWL_HAS_GLAMOR
-+
-+/* Build eglstream support for Xwayland */
-+#mesondefine XWL_HAS_EGLSTREAM