[X2Go-Commits] [x2gokdrive] 01/02: patches.xorg/1.20.5/: Define XORG_VERSION_CURRENT

[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 e0dbca73f11e9aa7a066e748e6d08ba256be69cf
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Sep 28 12:16:33 2019 -0400

    patches.xorg/1.20.5/: Define XORG_VERSION_CURRENT
    
    all the time.
    
    So that we do not need to rely on the xorg ddx being built to build this ddx.
    
    This should be done for the other patchsets as well, after testing that
    they enable the debian builds to not build the xorg ddx.
---
 patches.xorg/1.20.5/xorg-server-configure-ac.patch | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/patches.xorg/1.20.5/xorg-server-configure-ac.patch b/patches.xorg/1.20.5/xorg-server-configure-ac.patch
index b1e93ce..1d57d9e 100644
--- a/patches.xorg/1.20.5/xorg-server-configure-ac.patch
+++ b/patches.xorg/1.20.5/xorg-server-configure-ac.patch
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index af16b0a..9fe3c91 100644
+index af16b0a..e4c71a7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -31,7 +31,7 @@ RELEASE_DATE="2019-05-30"
@@ -19,7 +19,24 @@ index af16b0a..9fe3c91 100644
  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
+@@ -1812,6 +1813,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'
+@@ -2026,7 +2029,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])
+@@ -2306,9 +2308,15 @@ dnl kdrive DDX
  XEPHYR_LIBS=
  XEPHYR_INCS=
  
@@ -35,7 +52,7 @@ index af16b0a..9fe3c91 100644
      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
+@@ -2348,6 +2356,43 @@ if test "$KDRIVE" = yes; then
  
      AC_SUBST([XEPHYR_LIBS])
      AC_SUBST([XEPHYR_INCS])
@@ -79,7 +96,7 @@ index af16b0a..9fe3c91 100644
  fi
  AC_SUBST([KDRIVE_INCS])
  AC_SUBST([KDRIVE_PURE_INCS])
-@@ -2357,6 +2401,7 @@ AC_SUBST([KDRIVE_MAIN_LIB])
+@@ -2357,6 +2402,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 +104,7 @@ index af16b0a..9fe3c91 100644
  
  dnl Xwayland DDX
  
-@@ -2578,6 +2623,8 @@ hw/xquartz/xpr/Makefile
+@@ -2578,6 +2624,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