[X2Go-Commits] [x2gokdrive] 02/02: patches.xorg/1.19.6: refresh patch set for Ubuntu 18.04/bionic, including backporting of the XORG_VERSION_CURRENT change.

Mon Jan 20 17:53:29 CET 2020

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 84516c2d38bdd5184519cfe74e6ad4db6259c5fb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jan 20 17:53:03 2020 +0100

    patches.xorg/1.19.6: refresh patch set for Ubuntu 18.04/bionic, including backporting of the XORG_VERSION_CURRENT change.
---
 debian/changelog                                   |  2 ++
 patches.xorg/1.19.6/xorg-server-configure-ac.patch | 33 ++++++++++++++++------
 .../1.19.6/xorg-server-hw-kdrive-Makefile-am.patch |  6 ++--
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1a8050..8e12552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       clientReadNotify ().
     - patches.xorg/1.18.4/xorg-server-configure-ac.patch: add -lpthread to
       X2GOKDRIVE_LIBS.
+    - patches.xorg/1.19.6: refresh patch set for Ubuntu 18.04/bionic,
+      including backporting of the XORG_VERSION_CURRENT change.
   * debian/control:
     + Grammar fix.
     + Remove dependencies that refer to disabled features.
diff --git a/patches.xorg/1.19.6/xorg-server-configure-ac.patch b/patches.xorg/1.19.6/xorg-server-configure-ac.patch
index fa5cd79..b730807 100644
--- a/patches.xorg/1.19.6/xorg-server-configure-ac.patch
+++ b/patches.xorg/1.19.6/xorg-server-configure-ac.patch
@@ -1,6 +1,6 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,7 @@
+--- a/configure.ac	2017-12-20 21:32:33.000000000 +0100
++++ b/configure.ac	2020-01-20 17:51:18.248317548 +0100
+@@ -31,7 +31,7 @@ RELEASE_DATE="2017-12-20"
  RELEASE_NAME="Lousiana Gumbo"
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_MACRO_DIR([m4])
@@ -9,7 +9,7 @@
  AC_USE_SYSTEM_EXTENSIONS
  
  # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
-@@ -659,6 +659,7 @@
+@@ -659,6 +659,7 @@ AC_ARG_ENABLE(glamor,         AS_HELP_ST
  dnl kdrive and its subsystems
  AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
  AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
@@ -17,7 +17,24 @@
  AC_ARG_ENABLE(xfake,          AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
  AC_ARG_ENABLE(xfbdev,         AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])
  dnl kdrive options
-@@ -2370,9 +2371,15 @@
+@@ -1868,6 +1869,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
++
+ if test "x$XORG" = xyes; then
+ 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+ 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+@@ -2086,7 +2089,6 @@ if test "x$XORG" = xyes; then
+ 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+ 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+ 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2370,9 +2372,15 @@ dnl kdrive DDX
  XEPHYR_LIBS=
  XEPHYR_INCS=
  
@@ -33,7 +50,7 @@
      AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
      AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
  
-@@ -2483,6 +2490,43 @@
+@@ -2483,6 +2491,43 @@ if test "$KDRIVE" = yes; then
  
      AC_SUBST([XEPHYR_LIBS])
      AC_SUBST([XEPHYR_INCS])
@@ -77,7 +94,7 @@
  fi
  AC_SUBST([KDRIVE_INCS])
  AC_SUBST([KDRIVE_PURE_INCS])
-@@ -2498,6 +2542,7 @@
+@@ -2498,6 +2543,7 @@ AM_CONDITIONAL(KDRIVE_MOUSE, [test "x$KD
  AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
  AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
  AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
@@ -85,7 +102,7 @@
  AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
  AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
  
-@@ -2681,6 +2726,8 @@
+@@ -2681,6 +2727,8 @@ hw/xquartz/xpr/Makefile
  hw/kdrive/Makefile
  hw/kdrive/ephyr/Makefile
  hw/kdrive/ephyr/man/Makefile
diff --git a/patches.xorg/1.19.6/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/1.19.6/xorg-server-hw-kdrive-Makefile-am.patch
index 2128d6e..44cbf0e 100644
--- a/patches.xorg/1.19.6/xorg-server-hw-kdrive-Makefile-am.patch
+++ b/patches.xorg/1.19.6/xorg-server-hw-kdrive-Makefile-am.patch
@@ -1,7 +1,5 @@
-Index: xorg-server/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server.orig/hw/kdrive/Makefile.am
-+++ xorg-server/hw/kdrive/Makefile.am
+--- a/hw/kdrive/Makefile.am	2017-12-20 21:32:33.000000000 +0100
++++ b/hw/kdrive/Makefile.am	2020-01-20 17:51:45.597430805 +0100
 @@ -6,6 +6,10 @@ if XFAKESERVER
  XFAKE_SUBDIRS = fake
  endif

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
