[X2Go-Commits] [x2gokdrive] 02/05: patches.xorg/1.20.4/xorg-server-configure-ac.patch: backport XORG_VERSION_CURRENT change from e0dbca73f11e9aa7a066e748e6d08ba256be69cf / 1.20.5.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gokdrive.

commit bdf60bda02fed9f0fa22720ca50bf29d96d1a6d2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 23:45:44 2019 +0100

    patches.xorg/1.20.4/xorg-server-configure-ac.patch: backport XORG_VERSION_CURRENT change from e0dbca73f11e9aa7a066e748e6d08ba256be69cf / 1.20.5.
---
 debian/changelog                                   |  3 ++
 patches.xorg/1.20.4/xorg-server-configure-ac.patch | 33 ++++++++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ba215cd..52a9b82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       top-level quilt.env file and exporting QUILT_PATCHES manually.
     - patches.xorg/common/quilt.env: add trailing slash to QUILT_PATCHES
       variable.
+    - patches.xorg/1.20.4/xorg-server-configure-ac.patch: backport
+      XORG_VERSION_CURRENT change from
+      e0dbca73f11e9aa7a066e748e6d08ba256be69cf / 1.20.5.
   * debian/control:
     + Grammar fix.
     + Remove dependencies that refer to disabled features.
diff --git a/patches.xorg/1.20.4/xorg-server-configure-ac.patch b/patches.xorg/1.20.4/xorg-server-configure-ac.patch
index 9c396cf..9d09187 100644
--- a/patches.xorg/1.20.4/xorg-server-configure-ac.patch
+++ b/patches.xorg/1.20.4/xorg-server-configure-ac.patch
@@ -1,7 +1,5 @@
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -31,7 +31,7 @@ RELEASE_DATE="2019-02-25"
  RELEASE_NAME="Chestnut Tortelloni"
  AC_CONFIG_SRCDIR([Makefile.am])
@@ -11,7 +9,7 @@ Index: xorg-server/configure.ac
  AC_USE_SYSTEM_EXTENSIONS
  
  # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
-@@ -597,6 +597,7 @@ AC_ARG_ENABLE(glamor,         AS_HELP_ST
+@@ -599,6 +599,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])
@@ -19,7 +17,24 @@ Index: xorg-server/configure.ac
  dnl kdrive options
  AC_ARG_ENABLE(libunwind,      AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"])
  AC_ARG_ENABLE(xshmfence,      AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [XSHMFENCE="$enableval"], [XSHMFENCE="auto"])
-@@ -2306,9 +2307,15 @@ dnl kdrive DDX
+@@ -1814,6 +1815,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'
+@@ -2028,7 +2031,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])
+@@ -2308,9 +2310,15 @@ dnl kdrive DDX
  XEPHYR_LIBS=
  XEPHYR_INCS=
  
@@ -35,7 +50,7 @@ Index: xorg-server/configure.ac
      XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb"
      if test "x$XV" = xyes; then
          XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
-@@ -2348,6 +2355,43 @@ if test "$KDRIVE" = yes; then
+@@ -2350,6 +2358,43 @@ if test "$KDRIVE" = yes; then
  
      AC_SUBST([XEPHYR_LIBS])
      AC_SUBST([XEPHYR_INCS])
@@ -79,7 +94,7 @@ Index: xorg-server/configure.ac
  fi
  AC_SUBST([KDRIVE_INCS])
  AC_SUBST([KDRIVE_PURE_INCS])
-@@ -2357,6 +2401,7 @@ AC_SUBST([KDRIVE_MAIN_LIB])
+@@ -2359,6 +2404,7 @@ AC_SUBST([KDRIVE_MAIN_LIB])
  AC_SUBST([KDRIVE_LOCAL_LIBS])
  AC_SUBST([KDRIVE_LIBS])
  AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
@@ -87,7 +102,7 @@ Index: xorg-server/configure.ac
  
  dnl Xwayland DDX
  
-@@ -2578,6 +2623,8 @@ hw/xquartz/xpr/Makefile
+@@ -2580,6 +2626,8 @@ hw/xquartz/xpr/Makefile
  hw/kdrive/Makefile
  hw/kdrive/ephyr/Makefile
  hw/kdrive/ephyr/man/Makefile

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