Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package darktable
[ Reason ]
This fixes a FTBFS.
[ Impact ]
A rebuild with DEB_BUILD_OPTIONS=parallel=1 will fail for the version
currently in testing. This is arguably RC.
[ Tests ]
I installed and ran the updated binary packgge in my development bullseye
system.
[ Risks ]
It's a leaf package. I added en extra dependency rule to the upstream
build system, so I guess given I'm not really a cmake expert that
could fail under some unforseen circumstances.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
A bullseye-ignore tag for the bug #986574 might also make sense (in
lieu of an unblock).
unblock darktable/3.4.1-2
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmBu+zIACgkQA0U5G1Wq
FSFMeBAAp3kAQnPjaDCqwqpKbSWUkLvLCqookAbq5+y0YF7fFPfoUCIqs7PfDF4h
DoQGkc43sYjQbHH5/LVwnL8wJqX7+960GsHk3IkGcFmsOFBfoeeSuVcZISsLzsbP
4L52nRWJ5Lvf2ncEIcZHuWYLZqXZSDInQWL5bejBOf/qtWteAJoBiNxQAxmSmzzZ
WTc088W6F0ovMlC9TYnMJxICpZyVzVs3HPPELRaqYKp1GYmqCiCZ56r1jOpApGap
gmXrG9j6wXloj5Iv1sJH7GrMcL5+tWd/OOCiX9h1oVxIVbMa27R98ssTBHNn3Sef
zPYPZT42ROXw7S6np7v+2y91U55nVbzvGo7wu8SoDePfErfDQyjx6Fn7zFq+LapG
F1jDpBTjbz3HPjnctmYzsGMhHZs2ciU4q+/Blj36OKjMzcedwmrYt72kCUVonSJq
QIGZIEFf3jCf1fUQg0a6VRNzTr1LqAP52mRXOsi6Jar9CjImipac12nYGo/eK5Sx
KqbMFAka1zC37zE3Vm/NrPDzoLZLaK9icpw3wNCSV7iFkw7fww0sKxdQgzvEW33k
B84BPDtPUQ7o3CPUAEi6dHdsnvE9N3o28946a5nXZAf+RO1FIaTMJlPMLb2lZP5N
+RThFF9RIEvJ7nufAO9vApiefkTw7DRoEjI0yuEn+NAHGLoob3Q=
=NrQ2
-----END PGP SIGNATURE-----
diff -Nru darktable-3.4.1/debian/changelog darktable-3.4.1/debian/changelog
--- darktable-3.4.1/debian/changelog 2021-02-06 12:42:43.000000000 -0400
+++ darktable-3.4.1/debian/changelog 2021-04-08 07:58:21.000000000 -0300
@@ -1,3 +1,11 @@
+darktable (3.4.1-2) unstable; urgency=medium
+
+ * Bug fix: "darktable FTBFS with DEB_BUILD_OPTIONS=parallel=1", thanks
+ to Helmut Grohne (Closes: #986574). As Helmut guessed, the fix is to
+ add a dependency to the CMake configuration.
+
+ -- David Bremner <brem...@debian.org> Thu, 08 Apr 2021 07:58:21 -0300
+
darktable (3.4.1-1) unstable; urgency=medium
* Update to new upstream version 3.4.1.
diff -Nru
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
---
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
1969-12-31 20:00:00.000000000 -0400
+++
darktable-3.4.1/debian/patches/0001-add-explicit-dependency-on-generate_conf.patch
2021-04-08 07:58:21.000000000 -0300
@@ -0,0 +1,22 @@
+From: David Bremner <da...@tethera.net>
+Date: Thu, 8 Apr 2021 07:54:49 -0300
+Subject: add explicit dependency on generate_conf
+
+Weirdly, this missing dependency seems to only show up when running
+"make -j1".
+---
+ src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f415ae8..5c40b17 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -863,6 +863,7 @@ add_library(lib_darktable SHARED
${DARKTABLE_BINDIR}/preferences_gen.h ${DARKTAB
+ # since this isn't the same directory we do have to manually set it
+ set_source_files_properties(${DARKTABLE_BINDIR}/version_gen.c PROPERTIES
GENERATED TRUE)
+
++add_dependencies(lib_darktable generate_conf)
+ add_dependencies(lib_darktable generate_version)
+ add_dependencies(lib_darktable generate_preferences)
+
diff -Nru darktable-3.4.1/debian/patches/series
darktable-3.4.1/debian/patches/series
--- darktable-3.4.1/debian/patches/series 1969-12-31 20:00:00.000000000
-0400
+++ darktable-3.4.1/debian/patches/series 2021-04-08 07:58:21.000000000
-0300
@@ -0,0 +1 @@
+0001-add-explicit-dependency-on-generate_conf.patch
