From dd71bb4bd6f939cd0a8fd23403e6a0c83e2264b7 Mon Sep 17 00:00:00 2001 From: Patrick Franz Date: Sun, 27 Mar 2022 16:04:03 +0200 Subject: [PATCH] Add patch to prevent embedding the build path. --- debian/changelog | 4 +++ ...embedded_qtbuildinternalsextra_cmake.patch | 30 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 35 insertions(+) create mode 100644 debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch diff --git a/debian/changelog b/debian/changelog index 09be0cf..0dc9124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ qt6-base (6.2.4+dfsg-1) UNRELEASED; urgency=medium * Update lintian-overrides. * Specifies parameters to pass to the platform plugin. + [ Patrick Franz ] + * Add patch to prevent embedding the build path, thx to Vagrant + Cascadian (Closes: #1006407). + -- Debian Qt/KDE Maintainers Sun, 20 Mar 2022 10:13:27 +0000 qt6-base (6.2.2+dfsg-6) unstable; urgency=medium diff --git a/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch b/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch new file mode 100644 index 0000000..2ab0f5e --- /dev/null +++ b/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch @@ -0,0 +1,30 @@ +From 7264836612592c0e8fe084cee053f2fc68ecb035 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian +Date: Fri, 25 Feb 2022 03:00:05 +0000 +Subject: [PATCH] cmake/QtBuildInternalsExtra.cmake.in: Patch out embedded + build path. + +The original build path should not be needed in the shipped package, +and causes reproducibility issues when built in different paths. + +https://reproducible-builds.org/docs/build-path/ +--- + cmake/QtBuildInternalsExtra.cmake.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in +index cbd70b1..23b2391 100644 +--- a/cmake/QtBuildInternalsExtra.cmake.in ++++ b/cmake/QtBuildInternalsExtra.cmake.in +@@ -53,9 +53,6 @@ endif() + set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL + "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) + +-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH +-"A path to the source tree of the previously configured QtBase project." FORCE) +- + # Propagate decision of building tests and examples to other repositories. + set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.") + set(QT_BUILD_EXAMPLES @QT_BUILD_EXAMPLES@ CACHE BOOL "Build Qt examples") +-- +2.35.1 diff --git a/debian/patches/series b/debian/patches/series index ed9db75..347b333 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ upstream_QFileSystemEngine-canonicalName-Unix-clean-up-contro.patch # Debian specific remove_privacy_breaches.diff +build_path_embedded_qtbuildinternalsextra_cmake.patch