[X2Go-Commits] [x2gokdrive] 04/05: x2gokdrive.spec: add hack installing missing files into the xorg-server source tree.

[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 157ba733b522bb48e7978e0789aef20f84d506a8
Author: Mihai Moldovan <ionic at 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