This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from eb8ba97 x2gokdrive.spec: *SuSE puts the xorg-server source code into /usr/src/xserver. new 32ff76f patches.xorg/common/quilt.env: add trailing slash to QUILT_PATCHES variable. new bdf60bd patches.xorg/1.20.4/xorg-server-configure-ac.patch: backport XORG_VERSION_CURRENT change from e0dbca73f11e9aa7a066e748e6d08ba256be69cf / 1.20.5. new 18221a3 x2gokdrive.spec: change /usr/share/xserver to /usr/src/xserver. new 157ba73 x2gokdrive.spec: add hack installing missing files into the xorg-server source tree. new b4c697a patches.xorg/1.20.4: add missing/hw/xfree86/common/modeline2c.awk file, working around a bug in CentOS 7 and Fedora 30 (possibly others as well). The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 +++ .../missing/hw/xfree86/common/modeline2c.awk | 93 ++++++++++++++++++++++ patches.xorg/1.20.4/xorg-server-configure-ac.patch | 33 +++++--- patches.xorg/common/quilt.env | 2 +- x2gokdrive.spec | 8 +- 5 files changed, 135 insertions(+), 11 deletions(-) create mode 100644 patches.xorg/1.20.4/missing/hw/xfree86/common/modeline2c.awk -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 32ff76f43efddae69e65b41d4720cb11db048834 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 23:37:31 2019 +0100 patches.xorg/common/quilt.env: add trailing slash to QUILT_PATCHES variable. --- debian/changelog | 2 ++ patches.xorg/common/quilt.env | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d172142..ba215cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium easier on the developer's machine. Requires SOURCING(!) the quilt.env file within a specific versioned sub-directory OR SOURCING(!) the top-level quilt.env file and exporting QUILT_PATCHES manually. + - patches.xorg/common/quilt.env: add trailing slash to QUILT_PATCHES + variable. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.xorg/common/quilt.env b/patches.xorg/common/quilt.env index 949568a..b6b5010 100644 --- a/patches.xorg/common/quilt.env +++ b/patches.xorg/common/quilt.env @@ -17,6 +17,6 @@ if [[ '0' -ne "${cont}" ]]; then this_dir="${this_patchesdir}/${this_version}" typeset top="$(dirname "$(dirname "$(dirname "${this_real}")")")" - export QUILT_PATCHES="${top}/${this_dir}" + export QUILT_PATCHES="${top}/${this_dir}/" . "${top}/quilt.env" fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 18221a3e089dae6ded4391b8b6057e09100473e7 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 30 05:39:11 2019 +0100 x2gokdrive.spec: change /usr/share/xserver to /usr/src/xserver. For real this time. --- debian/changelog | 1 + x2gokdrive.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 52a9b82..cca4210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Use archive mode when copying xorg-server source. We probably want to keep stuff like timestamps to not break the Makefile dependencies. + *SuSE puts the xorg-server source code into /usr/src/xserver. + + Change /usr/share/xserver to /usr/src/xserver. For real this time. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index e2edd97..4609431 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -225,7 +225,7 @@ More information about X2Go can be found at: # prepare xorg-server build tree mkdir -p 'BUILD' %if 0%{?suse_version} -cp -av '/usr/share/xserver/'* 'BUILD/' +cp -av '/usr/src/xserver/'* 'BUILD/' %else cp -av '/usr/share/xorg-x11-server-source/'* 'BUILD/' %endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit b4c697aef452611c36a7ab20d0ab2e1b66ac5796 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 30 05:49:39 2019 +0100 patches.xorg/1.20.4: add missing/hw/xfree86/common/modeline2c.awk file, working around a bug in CentOS 7 and Fedora 30 (possibly others as well). --- debian/changelog | 3 + .../missing/hw/xfree86/common/modeline2c.awk | 93 ++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0d64367..c6a720f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - patches.xorg/1.20.4/xorg-server-configure-ac.patch: backport XORG_VERSION_CURRENT change from e0dbca73f11e9aa7a066e748e6d08ba256be69cf / 1.20.5. + - patches.xorg/1.20.4: add missing/hw/xfree86/common/modeline2c.awk file, + working around a bug in CentOS 7 and Fedora 30 (possibly others as + well). * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.xorg/1.20.4/missing/hw/xfree86/common/modeline2c.awk b/patches.xorg/1.20.4/missing/hw/xfree86/common/modeline2c.awk new file mode 100644 index 0000000..3c9f602 --- /dev/null +++ b/patches.xorg/1.20.4/missing/hw/xfree86/common/modeline2c.awk @@ -0,0 +1,93 @@ +#!/usr/bin/awk -f +# +# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. +# All rights reserved. +# +# Based on Perl script by Dirk Hohndel. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# Usage: modeline2c.awk < modefile > xf86DefModeSet.c +# + +BEGIN { + flagsdict[""] = "0" + + flagsdict["+hsync +vsync"] = "V_PHSYNC | V_PVSYNC" + flagsdict["+hsync -vsync"] = "V_PHSYNC | V_NVSYNC" + flagsdict["-hsync +vsync"] = "V_NHSYNC | V_PVSYNC" + flagsdict["-hsync -vsync"] = "V_NHSYNC | V_NVSYNC" + flagsdict["+hsync +vsync interlace"] = "V_PHSYNC | V_PVSYNC | V_INTERLACE" + flagsdict["+hsync -vsync interlace"] = "V_PHSYNC | V_NVSYNC | V_INTERLACE" + flagsdict["-hsync +vsync interlace"] = "V_NHSYNC | V_PVSYNC | V_INTERLACE" + flagsdict["-hsync -vsync interlace"] = "V_NHSYNC | V_NVSYNC | V_INTERLACE" + + print "/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at" + print " * modeline2c.awk */" + print "" + print "/*" + print " * Author: Joerg Sonnenberger <joerg@NetBSD.org>" + print " * Based on Perl script from Dirk Hohndel <hohndel@XFree86.Org>" + print " */" + print "" + print "#ifdef HAVE_XORG_CONFIG_H" + print "#include <xorg-config.h>" + print "#endif" + print "" + print "#include \"xf86.h\"" + print "#include \"xf86Config.h\"" + print "#include \"xf86Priv.h\"" + print "#include \"xf86_OSlib.h\"" + print "" + print "#include \"globals.h\"" + print "" + print "#define MODEPREFIX NULL, NULL, NULL, MODE_OK, M_T_DEFAULT" + print "#define MODESUFFIX 0,0, 0,0,0,0,0,0,0, 0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0" + print "" + print "const DisplayModeRec xf86DefaultModes [] = {" + + modeline = "\t{MODEPREFIX,%d, %d,%d,%d,%d,0, %d,%d,%d,%d,0, %s, MODESUFFIX},\n" + modeline_data = "^[a-zA-Z]+[ \t]+[^ \t]+[ \t0-9.]+" +} + +/^[mM][oO][dD][eE][lL][iI][nN][eE]/ { + flags = $0 + gsub(modeline_data, "", flags) + flags = tolower(flags) + printf(modeline, $3 * 1000, $4, $5, $6, $7, + $8, $9, $10, $11, flagsdict[flags]) + # Half-width double scanned modes + printf(modeline, $3 * 500, $4/2, $5/2, $6/2, $7/2, + $8/2, $9/2, $10/2, $11/2, flagsdict[flags] " | V_DBLSCAN") +} + +/^#/ { + print "/*" substr($0, 2) " */" +} + +END { + print "};" + printf "const int xf86NumDefaultModes = ARRAY_SIZE(xf86DefaultModes);" +} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 157ba733b522bb48e7978e0789aef20f84d506a8 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 30 05:42:58 2019 +0100 x2gokdrive.spec: add hack installing missing files into the xorg-server source tree. --- debian/changelog | 1 + x2gokdrive.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index cca4210..0d64367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium keep stuff like timestamps to not break the Makefile dependencies. + *SuSE puts the xorg-server source code into /usr/src/xserver. + Change /usr/share/xserver to /usr/src/xserver. For real this time. + + Add hack installing missing files into the xorg-server source tree. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 4609431..42fc321 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -246,6 +246,12 @@ export XORG_UPSTREAM_VERSION="$(grep 'AC_INIT' 'BUILD/configure.ac' | sed -r 's/ pushd 'BUILD' if [ -d "../patches.xorg/${XORG_UPSTREAM_VERSION}" ]; then QUILT_PATCHES="../patches.xorg/${XORG_UPSTREAM_VERSION}/" quilt push -a + if [ -d "../patches.xorg/${XORG_UPSTREAM_VERSION}/missing" ]; then + # Hack used to install missing files. + # This is actually working around problems in the upstream + # xorg-server-source packages, which will have to be reported upstream. + cp -av "../patches.xorg/${XORG_UPSTREAM_VERSION}/missing/"* 'BUILD/' + fi else ( set +x -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org