user [email protected] usertag 1039623 -timestamps usertag 1039623 -timezone retitle 1039623 shotcut: reproducible-builds: build paths trigger differences thanks
On 2023-06-27, Vagrant Cascadian wrote: > From 887be1759bf532e8008f213a6c7b61e81fee6c2a Mon Sep 17 00:00:00 2001 > From: Vagrant Cascadian <[email protected]> > Date: Tue, 27 Jun 2023 15:27:59 -0700 > Subject: [PATCH 1/2] CmakeLists.txt: Use UTC for timestamp for reproducible > builds. > > Otherwise, the timestamp will be timezone dependent. > > https://tests.reproducible-builds.org/debian/issues/unstable/timestamps_in_cmake_issue.html > --- > CMakeLists.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 254020b..b1f3d72 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -5,7 +5,7 @@ if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20") > endif() > > if(NOT DEFINED SHOTCUT_VERSION) > - string(TIMESTAMP SHOTCUT_VERSION "%y.%m.%d") > + string(TIMESTAMP SHOTCUT_VERSION "%y.%m.%d" UTC) > endif() > > project(shotcut The UTC issue was fixed in by applying an essentially identical patch: shotcut (25.10.31+ds-2) unstable; urgency=medium * Change upstream TIMESTAMP to UTC to fix FTBR. -- Alex Myczko <[email protected]> Fri, 14 Nov 2025 09:17:49 +0100 > From a17d43a3fc983995544156adebb5fea8d3467fd2 Mon Sep 17 00:00:00 2001 > From: Vagrant Cascadian <[email protected]> > Date: Tue, 27 Jun 2023 16:01:27 -0700 > Subject: [PATCH 2/2] debian/rules: Pass -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON via > dh_auto_configure override. > > This avoids embedding the full path in RPATH, which triggers BuildId > differences. > > https://tests.reproducible-builds.org/debian/issues/unstable/cmake_rpath_contains_build_path_issue.html > --- > debian/rules | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/debian/rules b/debian/rules > index 510b5de..a709184 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -18,6 +18,9 @@ export QT_SELECT=qt5 > %: > dh $@ > > +override_dh_auto_configure: > + dh_auto_configure -- -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON > + > override_dh_shlibdeps: > dh_shlibdeps -l/usr/lib/shotcut $(DEBARCH) This patch is still needed (with a trivial rebase), although low priority as build paths are no longer tested as part of tests.reproducible-builds.org, reproduce.debian.net, salsa-ci, etc... Alternately, updating to debhelper-compat 14 would fix this, as it passes -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON by default. live well, vagrant
signature.asc
Description: PGP signature
