Accepting request 1147242 from KDE:Qt6
Qt 6.6.2 (finally) (forwarded request 1146775 from krop) OBS-URL: https://build.opensuse.org/request/show/1147242 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-webengine?expand=0&rev=28
This commit is contained in:
commit
d9eaeb45d3
@ -1,34 +0,0 @@
|
||||
From 48c84bd037128d6788ee74786ac5f4aca9727ae9 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Larrosa <alarrosa@suse.com>
|
||||
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 <bwiedemann@suse.com> 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
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 14 16:53:38 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 6.6.2
|
||||
* https://www.qt.io/blog/qt-6.6.2-released
|
||||
- Drop patch, issue fixed upstream:
|
||||
* 0001-Fix-race-condition-generating-docs.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 22 09:57:26 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define real_version 6.6.1
|
||||
%define real_version 6.6.2
|
||||
%define short_version 6.6
|
||||
%define tar_name qtwebengine-everywhere-src
|
||||
%define tar_suffix %{nil}
|
||||
@ -37,7 +37,7 @@
|
||||
%bcond_without system_tiff
|
||||
%endif
|
||||
Name: qt6-webengine%{?pkg_suffix}
|
||||
Version: 6.6.1
|
||||
Version: 6.6.2
|
||||
Release: 0
|
||||
Summary: Web browser engine for Qt applications
|
||||
License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only
|
||||
@ -45,8 +45,6 @@ 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
|
||||
#
|
||||
|
BIN
qtwebengine-everywhere-src-6.6.1.tar.xz
(Stored with Git LFS)
BIN
qtwebengine-everywhere-src-6.6.1.tar.xz
(Stored with Git LFS)
Binary file not shown.
3
qtwebengine-everywhere-src-6.6.2.tar.xz
Normal file
3
qtwebengine-everywhere-src-6.6.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d61d87b2d2ccf8487e248bd8777d208ba3acd65bd60d6bb7d87dbaafa3850396
|
||||
size 421147952
|
Loading…
Reference in New Issue
Block a user