This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 122cbba4d70680f315452726675edcfa3e5892e0 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jan 20 14:03:56 2020 +0100 patches.xorg/1.18.4: refresh against Ubuntu 16.04/xenial version. --- debian/changelog | 1 + patches.xorg/1.18.4/xorg-server-configure-ac.patch | 16 ++++++++-------- .../1.18.4/xorg-server-hw-kdrive-Makefile-am.patch | 6 ++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51468f9..5f057da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - patches.xorg/: add skeleton for 1.20.3 - needed for OpenSuSE Leap 15.1. - patches.xorg/1.20.3: add actual (rebased) patches and potentially missing files. + - patches.xorg/1.18.4: refresh against Ubuntu 16.04/xenial version. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.xorg/1.18.4/xorg-server-configure-ac.patch b/patches.xorg/1.18.4/xorg-server-configure-ac.patch index 0cae34d..460a19e 100644 --- a/patches.xorg/1.18.4/xorg-server-configure-ac.patch +++ b/patches.xorg/1.18.4/xorg-server-configure-ac.patch @@ -1,6 +1,6 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -31,7 +31,7 @@ +--- a/configure.ac 2016-07-19 19:27:07.000000000 +0200 ++++ b/configure.ac 2020-01-20 12:22:34.621224151 +0100 +@@ -31,7 +31,7 @@ RELEASE_DATE="2016-07-19" RELEASE_NAME="Skordalia" 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 -@@ -651,6 +651,7 @@ +@@ -644,6 +644,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,7 @@ 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 -@@ -2356,9 +2357,15 @@ +@@ -2332,9 +2333,15 @@ dnl kdrive DDX XEPHYR_LIBS= XEPHYR_INCS= @@ -33,7 +33,7 @@ AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx]) -@@ -2469,6 +2476,43 @@ +@@ -2445,6 +2452,43 @@ if test "$KDRIVE" = yes; then AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_INCS]) @@ -77,7 +77,7 @@ fi AC_SUBST([KDRIVE_INCS]) AC_SUBST([KDRIVE_PURE_INCS]) -@@ -2484,6 +2528,7 @@ +@@ -2460,6 +2504,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 +85,7 @@ AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes]) AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes]) -@@ -2680,6 +2725,8 @@ +@@ -2635,6 +2680,8 @@ hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/ephyr/man/Makefile diff --git a/patches.xorg/1.18.4/xorg-server-hw-kdrive-Makefile-am.patch b/patches.xorg/1.18.4/xorg-server-hw-kdrive-Makefile-am.patch index 2128d6e..6b680bf 100644 --- a/patches.xorg/1.18.4/xorg-server-hw-kdrive-Makefile-am.patch +++ b/patches.xorg/1.18.4/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 2020-01-20 12:22:40.859250080 +0100 ++++ b/hw/kdrive/Makefile.am 2020-01-20 12:22:47.528277800 +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