Accepting request 1233456 from KDE:Qt6
- Add patch to avoid CVE-2024-40896 (boo#1234820) * 0001-Build-system-remove-libxml2-compilation-test.patch OBS-URL: https://build.opensuse.org/request/show/1233456 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-webengine?expand=0&rev=38
This commit is contained in:
50
0001-Build-system-remove-libxml2-compilation-test.patch
Normal file
50
0001-Build-system-remove-libxml2-compilation-test.patch
Normal 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
|
||||||
|
|
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 26 12:14:18 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add patch to avoid CVE-2024-40896 (boo#1234820)
|
||||||
|
* 0001-Build-system-remove-libxml2-compilation-test.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 2 13:02:17 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
Mon Dec 2 13:02:17 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
@@ -52,6 +52,7 @@ URL: https://www.qt.io
|
|||||||
Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
|
Source0: 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 #
|
||||||
|
Patch0: 0001-Build-system-remove-libxml2-compilation-test.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
|
||||||
Patch101: QtWebEngine_6.8_skip_xnnpack.patch
|
Patch101: QtWebEngine_6.8_skip_xnnpack.patch
|
||||||
|
Reference in New Issue
Block a user