Sync from SUSE:ALP:Source:Standard:1.0 qt6-webengine revision 1293597bee65e7d90e2a08084b4d30b1
This commit is contained in:
parent
e25c1782fb
commit
3e7b868d2e
@ -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,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 26 14:27:18 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Update to 6.6.3:
|
||||||
|
* https://www.qt.io/blog/qt-6.6.3-released
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
||||||
|
|
||||||
|
- On Leap build with re2-10 even when re2-11 is available (bsc#1217257).
|
||||||
|
re2-11 pulls in system abseil which is incompatible with bundled abseil
|
||||||
|
causing build failure.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 20 12:16:07 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
|
Wed Dec 20 12:16:07 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package qt6-webengine
|
# spec file
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2023 SUSE LLC
|
||||||
#
|
#
|
||||||
@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define real_version 6.6.1
|
%define real_version 6.6.3
|
||||||
%define short_version 6.6
|
%define short_version 6.6
|
||||||
%define tar_name qtwebengine-everywhere-src
|
%define tar_name qtwebengine-everywhere-src
|
||||||
%define tar_suffix %{nil}
|
%define tar_suffix %{nil}
|
||||||
@ -37,7 +37,7 @@
|
|||||||
%bcond_without system_tiff
|
%bcond_without system_tiff
|
||||||
%endif
|
%endif
|
||||||
Name: qt6-webengine%{?pkg_suffix}
|
Name: qt6-webengine%{?pkg_suffix}
|
||||||
Version: 6.6.1
|
Version: 6.6.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Web browser engine for Qt applications
|
Summary: Web browser engine for Qt applications
|
||||||
License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only
|
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
|
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
|
Source99: qt6-webengine-rpmlintrc
|
||||||
# Patches 0-100 are upstream patches #
|
# 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 #
|
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
|
||||||
Patch100: rtc-dont-use-h264.patch
|
Patch100: rtc-dont-use-h264.patch
|
||||||
#
|
#
|
||||||
@ -135,7 +133,11 @@ BuildRequires: pkgconfig(minizip)
|
|||||||
BuildRequires: pkgconfig(nss) >= 3.26
|
BuildRequires: pkgconfig(nss) >= 3.26
|
||||||
BuildRequires: pkgconfig(opus) >= 1.3.1
|
BuildRequires: pkgconfig(opus) >= 1.3.1
|
||||||
BuildRequires: pkgconfig(poppler-cpp)
|
BuildRequires: pkgconfig(poppler-cpp)
|
||||||
|
%if 0%{?suse_version} <= 1500
|
||||||
|
BuildRequires: pkgconfig(re2) < 11
|
||||||
|
%else
|
||||||
BuildRequires: pkgconfig(re2)
|
BuildRequires: pkgconfig(re2)
|
||||||
|
%endif
|
||||||
BuildRequires: pkgconfig(vpx) >= 1.10.0
|
BuildRequires: pkgconfig(vpx) >= 1.10.0
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
BuildRequires: pkgconfig(xcomposite)
|
BuildRequires: pkgconfig(xcomposite)
|
||||||
|
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.
BIN
qtwebengine-everywhere-src-6.6.3.tar.xz
(Stored with Git LFS)
Normal file
BIN
qtwebengine-everywhere-src-6.6.3.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user