This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from a14f2a1 x2gokdrive.spec: backport escaping layer change from debian/rules. new cdec360 patches.legacy/README.legacy-patches.md: whitespace-only fix. new 69d2f6a patches.legacy/README.legacy-patches.md: fix markdown syntax. new eb50333 {./,patches.xorg/{common,1.18.4,1.19.{2,6},1.20.{1,4,5}}/}quilt.env: add new quilt environment helper mechanism. new 2c3bf46 x2gokdrive.spec: fix %autosetup usage - only use it when supported. new a62532a x2gokdrive.spec: %autosetup (or %setup) create a top-level BUILD directory into which the source tarball is extracted - but we also need a BUILD sub-directory. new d9f15fe x2gokdrive.spec: use pushd instead of cd. new 071c8b4 x2gokdrive.spec: build-depend upon libgcrypt-devel for "older" distros that don't define a libgcrypt pkgconfig() virtual provide. new f2f436b x2gokdrive.spec: untangle libjpeg-turbo-devel build-dependency. The 8 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 | 26 ++++++++++++++++++++++++++ patches.legacy/README.legacy-patches.md | 2 +- patches.xorg/1.18.4/quilt.env | 1 + patches.xorg/1.19.2/quilt.env | 1 + patches.xorg/1.19.6/quilt.env | 1 + patches.xorg/1.20.1/quilt.env | 1 + patches.xorg/1.20.4/quilt.env | 1 + patches.xorg/1.20.5/quilt.env | 1 + patches.xorg/common/quilt.env | 22 ++++++++++++++++++++++ quilt.env | 9 +++++++++ x2gokdrive.spec | 31 ++++++++++++++++++++++++++++--- 11 files changed, 92 insertions(+), 4 deletions(-) create mode 120000 patches.xorg/1.18.4/quilt.env create mode 120000 patches.xorg/1.19.2/quilt.env create mode 120000 patches.xorg/1.19.6/quilt.env create mode 120000 patches.xorg/1.20.1/quilt.env create mode 120000 patches.xorg/1.20.4/quilt.env create mode 120000 patches.xorg/1.20.5/quilt.env create mode 100644 patches.xorg/common/quilt.env create mode 100644 quilt.env -- 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 eb50333f9a702e68b2b929aaec21f7d1d6c05957 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 04:53:09 2019 +0100 {./,patches.xorg/{common,1.18.4,1.19.{2,6},1.20.{1,4,5}}/}quilt.env: add new quilt environment helper mechanism. Should make using quilt a lot 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. --- debian/changelog | 5 +++++ patches.xorg/1.18.4/quilt.env | 1 + patches.xorg/1.19.2/quilt.env | 1 + patches.xorg/1.19.6/quilt.env | 1 + patches.xorg/1.20.1/quilt.env | 1 + patches.xorg/1.20.4/quilt.env | 1 + patches.xorg/1.20.5/quilt.env | 1 + patches.xorg/common/quilt.env | 22 ++++++++++++++++++++++ quilt.env | 9 +++++++++ 9 files changed, 42 insertions(+) diff --git a/debian/changelog b/debian/changelog index b0c146c..12668a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,11 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium * Initial release: - patches.legacy/README.legacy-patches.md: whitespace-only fix. - patches.legacy/README.legacy-patches.md: fix markdown syntax. + - {./,patches.xorg/{common,1.18.4,1.19.{2,6},1.20.{1,4,5}}/}quilt.env: add + new quilt environment helper mechanism. Should make using quilt a lot + 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. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.xorg/1.18.4/quilt.env b/patches.xorg/1.18.4/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.18.4/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/1.19.2/quilt.env b/patches.xorg/1.19.2/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.19.2/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/1.19.6/quilt.env b/patches.xorg/1.19.6/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.19.6/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/1.20.1/quilt.env b/patches.xorg/1.20.1/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.20.1/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/1.20.4/quilt.env b/patches.xorg/1.20.4/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.20.4/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/1.20.5/quilt.env b/patches.xorg/1.20.5/quilt.env new file mode 120000 index 0000000..543e930 --- /dev/null +++ b/patches.xorg/1.20.5/quilt.env @@ -0,0 +1 @@ +../common/quilt.env \ No newline at end of file diff --git a/patches.xorg/common/quilt.env b/patches.xorg/common/quilt.env new file mode 100644 index 0000000..949568a --- /dev/null +++ b/patches.xorg/common/quilt.env @@ -0,0 +1,22 @@ +typeset this_fake='' +typeset -i cont='1' +if [[ -n "${ZSH_VERSION}" ]]; then + this_fake="${(%):-%x}" +elif [[ -n "${BASH_VERSION}" ]]; then + this_fake="${BASH_SOURCE[0]}" +else + printf 'Sorry, unsupported shell.\nThis helper will not work for you.\n' >&2 + cont='0' +fi + +if [[ '0' -ne "${cont}" ]]; then + typeset this_real="$(readlink -ne "${this_fake}")" + typeset this_dir="$(dirname "${this_fake}")" + typeset this_version="$(basename "${this_dir}")" + typeset this_patchesdir="$(basename "$(dirname "${this_dir}")")" + this_dir="${this_patchesdir}/${this_version}" + typeset top="$(dirname "$(dirname "$(dirname "${this_real}")")")" + + export QUILT_PATCHES="${top}/${this_dir}" + . "${top}/quilt.env" +fi diff --git a/quilt.env b/quilt.env new file mode 100644 index 0000000..8bfef15 --- /dev/null +++ b/quilt.env @@ -0,0 +1,9 @@ +# Maintainer helper for working with quilt. +# If needed, adjust to your needs. +# This file will not export QUILT_PATCHES directly. +# If you use this, do it manually. +# Alternatively, SOURCE(!) the quilt.env files within the versioned +# sub-directories and everything should be set up automagically. +export QUILT_DIFF_ARGS='--no-index -pab --color=auto' +export QUILT_DIFF_OPTS='-p' +export QUILT_REFRESH_ARGS='-p ab --no-index' -- 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 2c3bf4651d104b42be552d4b5f44fb251ac59235 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 05:13:46 2019 +0100 x2gokdrive.spec: fix %autosetup usage - only use it when supported. RPM 4.11.x+. --- debian/changelog | 1 + x2gokdrive.spec | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 12668a5..705bebd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium modified version of the binary package description. + Fix typo pkgconfig(Xau) => pkgconfig(xau). + Backport escaping layer change from debian/rules. + + Fix %autosetup usage - only use it when supported. RPM 4.11.x+. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 85f5130..3c2b5e0 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -186,7 +186,11 @@ More information about X2Go can be found at: %prep # %%autosetup creates BUILD subdir +%if 0%{?fedora} >= 19 || 0%{?suse_version} >= 1310 || 0%{?sle_version} >= 120400 || 0%{?rhel} >= 7 %autosetup +%else +%setup +%endif # prepare xorg-server build tree cp -r '/usr/share/xorg-x11-server-source/'* 'BUILD/' -- 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 071c8b4e3e8aab7bdfdeb6a5d261ee1e40b60439 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 06:41:19 2019 +0100 x2gokdrive.spec: build-depend upon libgcrypt-devel for "older" distros that don't define a libgcrypt pkgconfig() virtual provide. That means: Fedora < 29, EPEL < 8 and any *SuSE version that is not Tumbleweed. The most surprising part is probably *SuSE. --- debian/changelog | 4 ++++ x2gokdrive.spec | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index cfcddcb..12b3aca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,10 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium source tarball is extracted - but we also need a BUILD sub-directory. Create it. + Use pushd instead of cd. Minor change. + + Build-depend upon libgcrypt-devel for "older" distros that don't define + a libgcrypt pkgconfig() virtual provide. That means: Fedora < 29, EPEL < + 8 and any *SuSE version that is not Tumbleweed. The most surprising part + is probably *SuSE. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 5c0d9ee..963b448 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -93,7 +93,13 @@ BuildRequires: pkgconfig(xfont) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(pciaccess) +%if 0%{?fedora} > 28 || 0%{?rhel} > 7 || 0%{?suse_version} > 1500 BuildRequires: pkgconfig(libgcrypt) +%else +# Older libgcrypt-devel packages do not have a pkgconfig(libgcrypt) provides +# line. +BuildRequires: libgcrypt-devel +%endif BuildRequires: pkgconfig(nettle) # We probably won't need some libudev-devel equivalent because we disable that # feature anyway. -- 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 a62532aad3c8bf6999a645386b5a3e7179698734 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 05:16:48 2019 +0100 x2gokdrive.spec: %autosetup (or %setup) create a top-level BUILD directory into which the source tarball is extracted - but we also need a BUILD sub-directory. Create it. --- debian/changelog | 3 +++ x2gokdrive.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 705bebd..29f5a6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,9 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Fix typo pkgconfig(Xau) => pkgconfig(xau). + Backport escaping layer change from debian/rules. + Fix %autosetup usage - only use it when supported. RPM 4.11.x+. + + %autosetup (or %setup) create a top-level BUILD directory into which the + source tarball is extracted - but we also need a BUILD sub-directory. + Create it. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 3c2b5e0..1ed9666 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -185,7 +185,6 @@ More information about X2Go can be found at: %prep -# %%autosetup creates BUILD subdir %if 0%{?fedora} >= 19 || 0%{?suse_version} >= 1310 || 0%{?sle_version} >= 120400 || 0%{?rhel} >= 7 %autosetup %else @@ -193,6 +192,7 @@ More information about X2Go can be found at: %endif # prepare xorg-server build tree +mkdir -p 'BUILD' cp -r '/usr/share/xorg-x11-server-source/'* 'BUILD/' # Precaution from: # https://src.fedoraproject.org/rpms/tigervnc/blob/master/f/tigervnc.spec -- 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 f2f436bc416f518af940548173b24decc7042c47 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 06:46:02 2019 +0100 x2gokdrive.spec: untangle libjpeg-turbo-devel build-dependency. Recent *SuSE versions define a pkgconfig(libturbojpeg) virtual provide, which is unheard of in RHEL land. Older *SuSE versions sadly don't have any virtual provide for this, and, worse, don't even have libjpeg-turbo-devel packages, so we'll need to build-depend upon libjpeg62-devel instead and hope that this is actually the turbo variant. RHEL-land (including Fedora) is more forgiving and always ships the turbo variant, but sets the virtual provide to pkgconfig(libjpeg) (yes, for all versions down to RHEL 6, albit via the updates repository!) and do not mention "turbo" in there. --- debian/changelog | 9 +++++++++ x2gokdrive.spec | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12b3aca..8e7688e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,15 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium a libgcrypt pkgconfig() virtual provide. That means: Fedora < 29, EPEL < 8 and any *SuSE version that is not Tumbleweed. The most surprising part is probably *SuSE. + + Untangle libjpeg-turbo-devel build-dependency. Recent *SuSE versions + define a pkgconfig(libturbojpeg) virtual provide, which is unheard of in + RHEL land. Older *SuSE versions sadly don't have any virtual provide for + this, and, worse, don't even have libjpeg-turbo-devel packages, so we'll + need to build-depend upon libjpeg62-devel instead and hope that this is + actually the turbo variant. RHEL-land (including Fedora) is more + forgiving and always ships the turbo variant, but sets the virtual + provide to pkgconfig(libjpeg) (yes, for all versions down to RHEL 6, + albit via the updates repository!) and do not mention "turbo" in there. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 963b448..e19f28d 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -24,7 +24,22 @@ Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version} # Required specifically for x2gokdrive BuildRequires: xorg-x11-server-source -BuildRequires: libjpeg-turbo-devel +# Selecting libjpeg-turbo is quite difficult. +%if 0%{?suse_version} +%if 0%{?sle_version} >= 120200 +# Recent *SuSE versions call this "libturbojpeg". +BuildRequireS: pkgconfig(libturbojpeg) +%else +# Older ones have either libjpeg8-devel or libjpeg62-devel and don't define +# any pkgconfig() virtual provide. Pick libjpeg62-devel since that's most +# likely the turbo variant. +BuildRequires: libjpeg62-devel +%endif +%else +# RHEL/CentOS 6+ and all supported Fedora versions ship libjpeg-turbo, but call +# it libjpeg. +BuildRequires: pkgconfig(libjpeg) +%endif BuildRequires: libpng-devel BuildRequires: quilt %if 0%{?suse_version} -- 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 69d2f6ae07cd98ed627ab25a76602a66696bd421 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 04:48:58 2019 +0100 patches.legacy/README.legacy-patches.md: fix markdown syntax. --- debian/changelog | 1 + patches.legacy/README.legacy-patches.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 349191f..b0c146c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * Initial release: - patches.legacy/README.legacy-patches.md: whitespace-only fix. + - patches.legacy/README.legacy-patches.md: fix markdown syntax. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.legacy/README.legacy-patches.md b/patches.legacy/README.legacy-patches.md index ca55a56..9bbf2fc 100644 --- a/patches.legacy/README.legacy-patches.md +++ b/patches.legacy/README.legacy-patches.md @@ -12,7 +12,7 @@ patches apply to what Git revision of x2gokdrive upstream code. ## openSUSE 42.3 -Patch file: osuse_42.3.patch +Patch file: osuse\_42.3.patch Git commit hash: 5f025a7de290ff03eef74d8c1b81a88b54b6342d X.org version: <FIXME:UNKNOWN> -- 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 cdec36041b64455731fa6aaf2b84a7995b477921 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 04:48:34 2019 +0100 patches.legacy/README.legacy-patches.md: whitespace-only fix. --- debian/changelog | 2 ++ patches.legacy/README.legacy-patches.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d38f5d4..349191f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium * Calculate screen dimensions (in mm) according to dpi value. Default DPI (Xorg) is 75. User can set DPI using -dpi command line option. [ Mihai Moldovan ] + * Initial release: + - patches.legacy/README.legacy-patches.md: whitespace-only fix. * debian/control: + Grammar fix. + Remove dependencies that refer to disabled features. diff --git a/patches.legacy/README.legacy-patches.md b/patches.legacy/README.legacy-patches.md index bacf118..ca55a56 100644 --- a/patches.legacy/README.legacy-patches.md +++ b/patches.legacy/README.legacy-patches.md @@ -12,7 +12,7 @@ patches apply to what Git revision of x2gokdrive upstream code. ## openSUSE 42.3 -Patch file: osuse_42.3.patch +Patch file: osuse_42.3.patch Git commit hash: 5f025a7de290ff03eef74d8c1b81a88b54b6342d X.org version: <FIXME:UNKNOWN> -- 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 d9f15fe6d8fc985449ef3c5757f672a1897cb9dc Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 05:17:53 2019 +0100 x2gokdrive.spec: use pushd instead of cd. Minor change. --- debian/changelog | 1 + x2gokdrive.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 29f5a6e..cfcddcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + %autosetup (or %setup) create a top-level BUILD directory into which the source tarball is extracted - but we also need a BUILD sub-directory. Create it. + + Use pushd instead of cd. Minor change. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 1ed9666..5c0d9ee 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -208,7 +208,7 @@ cp -r 'man/' 'BUILD/hw/kdrive/x2gokdrive/' # patch xorg-server build tree, so that it will build x2gokdrive set -x export XORG_UPSTREAM_VERSION="$(grep 'AC_INIT' 'BUILD/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\1/')" -cd 'BUILD' +pushd 'BUILD' if [ -d "../patches.xorg/${XORG_UPSTREAM_VERSION}" ]; then QUILT_PATCHES="../patches.xorg/${XORG_UPSTREAM_VERSION}/" quilt push -a else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org