diff --git a/0001-Fix-race-condition-generating-docs.patch b/0001-Fix-race-condition-generating-docs.patch new file mode 100644 index 0000000..09a02ea --- /dev/null +++ b/0001-Fix-race-condition-generating-docs.patch @@ -0,0 +1,34 @@ +From 48c84bd037128d6788ee74786ac5f4aca9727ae9 Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Wed, 20 Dec 2023 13:48:14 +0100 +Subject: [PATCH] Fix race condition generating docs + +When doing a parallel build, there's a race condition +that sometimes builds qtpdf before pdf_attributions is +generated resulting in an incomplete qtpdf.index file. +Adding this dependency solves this. + +Issue found by Bernhard Wiedemann while +testing build reproducibility of packages in openSUSE and +reported originally at https://bugzilla.opensuse.org/show_bug.cgi?id=1217774 + +Change-Id: Ia7c0c4c685eeed56e9318871467dc2be6626cc47 +--- + src/pdf/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt +index a50120d3e..c40476f89 100644 +--- a/src/pdf/CMakeLists.txt ++++ b/src/pdf/CMakeLists.txt +@@ -66,6 +66,7 @@ add_code_attributions_target( + ) + add_dependencies(generate_pdf_attributions run_pdf_GnDone) + add_dependencies(docs generate_pdf_attributions) ++add_dependencies(prepare_docs_Pdf generate_pdf_attributions) + + ## + # TOOLCHAIN SETUP +-- +2.42.0 + diff --git a/qt6-webengine.changes b/qt6-webengine.changes index 4a65c81..9f9e972 100644 --- a/qt6-webengine.changes +++ b/qt6-webengine.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 20 12:16:07 UTC 2023 - Antonio Larrosa + +- Add patch to force pdf_attributions.qdoc to be generated before + qtpdf, fixing a race condition that made the docs subpackage + build not reproducible (boo#1217774): + * 0001-Fix-race-condition-generating-docs.patch + ------------------------------------------------------------------- Mon Nov 27 14:00:22 UTC 2023 - Christophe Marin diff --git a/qt6-webengine.spec b/qt6-webengine.spec index 0bbf88d..f2b5f7d 100644 --- a/qt6-webengine.spec +++ b/qt6-webengine.spec @@ -45,6 +45,8 @@ URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-webengine-rpmlintrc # Patches 0-100 are upstream patches # +# PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/qt/qtwebengine/+/526880 +Patch0: 0001-Fix-race-condition-generating-docs.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: rtc-dont-use-h264.patch # @@ -129,6 +131,7 @@ BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(nss) >= 3.26 BuildRequires: pkgconfig(opus) >= 1.3.1 BuildRequires: pkgconfig(poppler-cpp) @@ -149,7 +152,6 @@ BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) -BuildRequires: pkgconfig(minizip) # Picked from chromium.spec BuildRequires: (python3 >= 3.7 or python3-dataclasses) %if "%{qt6_flavor}" == "docs"