[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1006407: marked as done (qt6-base: reproducible-builds: Build path embedded QtBuildInternalsExtra.cmake)

Your message dated Sun, 27 Mar 2022 14:48:46 +0000
with message-id <E1nYUCE-0008qz-RM@fasolo.debian.org>
and subject line Bug#1006407: fixed in qt6-base 6.2.4+dfsg-1
has caused the Debian Bug report #1006407,
regarding qt6-base: reproducible-builds: Build path embedded QtBuildInternalsExtra.cmake
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1006407: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006407
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: qt6-base
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: buildpath
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The path of the build environment is embedded in the
QtBuildInternalsExtra.cmake file shipped in the package:

  https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/qt6-base.html

  /usr/lib/x86_64-linux-gnu/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake

  set(QT_SOURCE_TREE·"/build/1st/qt6-base-6.2.2+dfsg"·CACHE·PATH
  vs.
  set(QT_SOURCE_TREE·"/build/2/qt6-base-6.2.2+dfsg/2nd"·CACHE·PATH

The attached patch fixes this by removing the code that embeds the build
path.

It does build successfully with the patch applied, though I have not
otherwise tested the package.  Another option might be to exclude this
file from the package.

For either approach, someone familiar with qt6-base would need to test
and confirm if either of these methods are ok!


With this patch applied, qt6-base should build reproducibly on
tests.reproducible-builds.org!


Thanks for maintaining qt6-base!


live well,
  vagrant

From 7264836612592c0e8fe084cee053f2fc68ecb035 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
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

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: qt6-base
Source-Version: 6.2.4+dfsg-1
Done: Patrick Franz <deltaone@debian.org>

We believe that the bug you reported is fixed in the latest version of
qt6-base, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1006407@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Patrick Franz <deltaone@debian.org> (supplier of updated qt6-base package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 27 Mar 2022 16:35:23 +0200
Source: qt6-base
Architecture: source
Version: 6.2.4+dfsg-1
Distribution: experimental
Urgency: medium
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Changed-By: Patrick Franz <deltaone@debian.org>
Closes: 1006407 1006954
Changes:
 qt6-base (6.2.4+dfsg-1) experimental; urgency=medium
 .
   [ Lu YaNing ]
   * New upstream release (6.2.4).
   * Update ABI to 6.2.4.
   * Update installed files.
   * Update symbols.
   * Update d/copyright.
   * 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).
   * Do not hardcode the libssl version as a dependency for
     libqt6network6, thx to Dan Bungert (Closes: #1006954).
Checksums-Sha1:
 a76aa8542d01e0eef5e6a3e105e843502886d5a9 4801 qt6-base_6.2.4+dfsg-1.dsc
 1ddd96af1b759cc6e326329755ea603ecf3e5e19 44635656 qt6-base_6.2.4+dfsg.orig.tar.xz
 028f82b9875d65aa0ccd853238b96ada43855310 171852 qt6-base_6.2.4+dfsg-1.debian.tar.xz
 71431252efb689fbdb891c6535c3731376dedbe0 8760 qt6-base_6.2.4+dfsg-1_source.buildinfo
Checksums-Sha256:
 ea7c7c1695c8c5013c370efa1f6be14c49be96acc660d49acce8bd2f17ba2d02 4801 qt6-base_6.2.4+dfsg-1.dsc
 ec09f20c104446cf8757f210822ac1a8570ee38447d0947fe75edeb6f8d144bd 44635656 qt6-base_6.2.4+dfsg.orig.tar.xz
 b0bff63a35aa732e48325b7ac6ea40aeaa7588d29dcbd5e254cff91450831f06 171852 qt6-base_6.2.4+dfsg-1.debian.tar.xz
 41f0082a276a0eba0347119afb13963eda4b017ebfd33917d4ce40a459b2f887 8760 qt6-base_6.2.4+dfsg-1_source.buildinfo
Files:
 b5f8732dd7402135c6db3430e63acbe0 4801 libs optional qt6-base_6.2.4+dfsg-1.dsc
 d2d26701e1ead3d3ffeb477c3a0fdb2e 44635656 libs optional qt6-base_6.2.4+dfsg.orig.tar.xz
 d8dcbf3c9f8eacce9fd406809bfd0945 171852 libs optional qt6-base_6.2.4+dfsg-1.debian.tar.xz
 913e16e76da715446bbe0629a2ffee4f 8760 libs optional qt6-base_6.2.4+dfsg-1_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEYodBXDR68cxZHu3Knp96YDB3/lYFAmJAdmEACgkQnp96YDB3
/ladUA/+JyQLZqCn1CTnBnSGl7IKIrA40ZBmfv0GmckpD6x6rtmraDYmc9qMVgw9
mmxw14J/XTkm1/LWup08nZDwp3ZV4PqIXMMUFvkyIJydgeqqG19rrOP2Zm7lesK6
7OfgiamKWvG6YLZIMNrn+6t54uZnel9mNVpaxWHNoVb8xFX8P6jieqkeeUZpedIC
Dyl7tEUk3W8p1653p2Gp/eenOCweyJ0Kps6g4QMeYP7zEy7i2WwJAa/GGZ8VRnFQ
X1vWFu40w4Ud7D2LAphDtBFlbi2Otas3YF2j2wOgXWTURTMaNOhLgvgbjwrc3lDc
FUG6ioPWZ7Ta4k9haGc1lhgIzeCs3VcHAT+Y6LRUCcntUI4nNJE9aeT/oaSaNutQ
HDjc49kKC1xiEt1CmOhLXyfnK46pHmL7Z7JVW596Nopbl01WiKVUwIfsJM+pAEc0
GHG79IKnsJ0i6gzoO4KhEzX5briCW5dzurIC9g5bGEMvjlMqOoZz0LpKFFxTefSn
SHas3+li5tqdtJyorb/vL3yn98zp+3TLuLhmaax8llNNznzSaQFQSoQwi5u4SvsW
G2lAKSHpWb3ae8NL6vRHdIl8E7+K2x5NiPQmRnzmFSMVnyrNQoYTnvkLDBCWWEul
CpAJXEa4980sBniMIaATz1RW7JDKf5W3Gy1i017jflSaoMWpd4w=
=2NnI
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: