This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit 5b1d0e193933ede9292aa364d6b06b7da641a71a
Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
Date: Sat Jan 6 20:56:07 2024 +0000
{patches.xorg/,debian/rules,x2gokdrive.spec}: Add semi-auto-detection of
latest available patchset and fallback to that if we don't have a patchset for
an exact xorg-server version.
---
debian/rules | 16 +++++++++++-----
patches.xorg/latest-available | 1 +
x2gokdrive.spec | 27 ++++++++++++++++-----------
3 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/debian/rules b/debian/rules
index 5dd4903..0dbd016 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,11 +33,17 @@ override_dh_auto_configure:
rm .pc -Rfv; \
QUILT_PATCHES="../../patches.xorg/$${XORG_UPSTREAM_VERSION}/" quilt push -a; \
else \
- ( \
- set +x; \
- printf
'\n##################################################\nERROR: This X2Go KDrive
version does not support\nbuilding against X.Org version
%s.\n##################################################\n'
"$${XORG_UPSTREAM_VERSION}"; \
- exit '1'; \
- ); \
+ QUILT_PATCHES='../../patches.xorg/latest-available/'
quilt pop -a; \
+ rm -Rfv '.pc'; \
+ QUILT_PATCHES='../../patches.xorg/latest-available/'
quilt push -a; \
+ QUILT_EXITCODE="$${?}"; \
+ if [ '0' != "$${QUILT_EXITCODE}" ]; then \
+ ( \
+ set +x; \
+ printf
'\n##################################################\nERROR: This X2Go KDrive
version does not support\nbuilding against X.Org version
%s.\n##################################################\n'
"$${XORG_UPSTREAM_VERSION}"; \
+ exit '1'; \
+ ); \
+ fi; \
fi
# run autoreconf
diff --git a/patches.xorg/latest-available b/patches.xorg/latest-available
new file mode 120000
index 0000000..3f47ea1
--- /dev/null
+++ b/patches.xorg/latest-available
@@ -0,0 +1 @@
+21.1.8
\ No newline at end of file
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index 71d14e9..e0af9d8 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -274,18 +274,23 @@ 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
- printf '\n##################################################\nERROR: This
X2Go KDrive version does not support\nbuilding against X.Org version
%s.\n##################################################\n'
"${XORG_UPSTREAM_VERSION}"
- exit '1'
- )
+ QUILT_PATCHES='../patches.xorg/latest-available/' quilt push -a
+ QUILT_EXITCODE="${?}"
+ if [ '0' != "${QUILT_EXITCODE}" ]; then
+ (
+ set +x
+ printf '\n##################################################\nERROR:
This X2Go KDrive version does not support\nbuilding against X.Org version
%s.\n##################################################\n'
"${XORG_UPSTREAM_VERSION}"
+ exit '1'
+ )
+ fi
+ XORG_UPSTREAM_VERSION='latest-available'
+fi
+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
%build
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2gokdrive.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
