Sync from SUSE:ALP:Source:Standard:1.0 qt6-webengine revision 18d84f30dc4757a89f6519bc8148169e

This commit is contained in:
Adrian Schröter 2025-01-23 15:41:51 +01:00
parent 3e7b868d2e
commit 8d01c46842
3 changed files with 58 additions and 1 deletions

View File

@ -0,0 +1,50 @@
From c549088f6ff350b76eeefebfe7730555ee75e4a8 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe@krop.fr>
Date: Thu, 26 Dec 2024 13:11:51 +0100
Subject: [PATCH] Build system: remove libxml2 compilation test
Chromium doesn't need LIBXML_ICU_ENABLED to be defined to build.
Change-Id: I5788bfca058a7b65f1b2e80e9ad740b04b3dc7c6
---
configure.cmake | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/configure.cmake b/configure.cmake
index c4acca20c..404895c84 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -170,21 +170,6 @@ int main() {
}"
)
-qt_config_compile_test(libxml2
- LABEL "compatible libxml2 and libxslt"
- LIBRARIES
- PkgConfig::LIBXML2
- CODE
-"
-#include \"libxml/xmlversion.h\"
-#if !defined(LIBXML_ICU_ENABLED)
-#error libxml icu not enabled
-#endif
-int main() {
- return 0;
-}"
-)
-
qt_config_compile_test(jpeg
LABEL "compatible libjpeg"
LIBRARIES
@@ -645,7 +630,7 @@ qt_feature("webengine-system-libevent" PRIVATE
)
qt_feature("webengine-system-libxml" PRIVATE
LABEL "libxml2 and libxslt"
- CONDITION UNIX AND TEST_libxml2
+ CONDITION UNIX AND LIBXML2_FOUND
)
qt_feature("webengine-system-lcms2" PRIVATE
LABEL "lcms2"
--
2.47.1

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 8 11:14:23 UTC 2025 - pgajdos@suse.com
- Add patch to avoid CVE-2024-40896 (boo#1234820)
* 0001-Build-system-remove-libxml2-compilation-test.patch
-------------------------------------------------------------------
Tue Mar 26 14:27:18 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -44,6 +44,7 @@ License: GPL-2.0-only OR LGPL-3.0-only OR GPL-3.0-only
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
Patch0: 0001-Build-system-remove-libxml2-compilation-test.patch
# Patches 0-100 are upstream patches #
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
Patch100: rtc-dont-use-h264.patch
@ -220,7 +221,7 @@ Requires: qt6-pdf-private-devel = %{version}
Requires: cmake(Qt6Gui) = %{real_version}
Requires: cmake(Qt6Qml) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
%requires_eq qt6-quick-private-devel
#%%requires_eq qt6-quick-private-devel
%description -n qt6-pdfquick-devel
Development files for the Qt 6 PdfQuick library.