mirror of
https://github.com/feather-wallet/feather.git
synced 2024-11-17 01:37:53 +00:00
depends: qt: update to 6.6.1
This commit is contained in:
tobtoht
parent
b75ec4381a
commit
b73a6eaed7
5 changed files with 14 additions and 110 deletions
|
|
@ -1,9 +1,9 @@
|
|||
package=native_qt
|
||||
$(package)_version=6.6.0
|
||||
$(package)_version=6.6.1
|
||||
$(package)_download_path=https://download.qt.io/official_releases/qt/6.6/$($(package)_version)/submodules
|
||||
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
|
||||
$(package)_file_name=qtbase-$($(package)_suffix)
|
||||
$(package)_sha256_hash=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e
|
||||
$(package)_sha256_hash=450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7
|
||||
$(package)_qt_libs=corelib network widgets gui plugins testlib
|
||||
$(package)_patches = dont_hardcode_pwd.patch
|
||||
$(package)_patches += fast_fixed_dtoa_no_optimize.patch
|
||||
|
|
@ -13,16 +13,16 @@ $(package)_patches += rcc_hardcode_timestamp.patch
|
|||
$(package)_patches += root_CMakeLists.txt
|
||||
|
||||
$(package)_qttools_file_name=qttools-$($(package)_suffix)
|
||||
$(package)_qttools_sha256_hash=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99
|
||||
$(package)_qttools_sha256_hash=4939105a7345ab4e19e7caee8654a836e65bd41910359623e0f233f3aff0914a
|
||||
|
||||
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
|
||||
$(package)_qtsvg_sha256_hash=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de
|
||||
$(package)_qtsvg_sha256_hash=248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228
|
||||
|
||||
$(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
|
||||
$(package)_qtmultimedia_sha256_hash=ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782
|
||||
$(package)_qtmultimedia_sha256_hash=7ee4e2296f5714961692f6ded568d3e3fde3687cee48e9d717194b5d1360db4a
|
||||
|
||||
$(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
|
||||
$(package)_qtshadertools_sha256_hash=3690327dc550144b8102be2bb7f6dc995ccbe3584041094ad021a83737ef9875
|
||||
$(package)_qtshadertools_sha256_hash=08338fe4f54954928e41a8a5450627e61bca115039706c28161bf967785e73bb
|
||||
|
||||
$(package)_extra_sources += $($(package)_qttools_file_name)
|
||||
$(package)_extra_sources += $($(package)_qtsvg_file_name)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
package=qt
|
||||
$(package)_version=6.6.0
|
||||
$(package)_version=6.6.1
|
||||
$(package)_download_path=https://download.qt.io/official_releases/qt/6.6/$($(package)_version)/submodules
|
||||
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
|
||||
$(package)_file_name=qtbase-$($(package)_suffix)
|
||||
$(package)_sha256_hash=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e
|
||||
$(package)_sha256_hash=450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7
|
||||
$(package)_darwin_dependencies=native_cctools native_qt openssl
|
||||
$(package)_mingw32_dependencies=openssl native_qt
|
||||
$(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor dbus
|
||||
|
|
@ -19,25 +19,22 @@ $(package)_patches += revert_f99ee441.patch
|
|||
$(package)_patches += xcb-util-image-fix.patch
|
||||
$(package)_patches += libxau-fix.patch
|
||||
$(package)_patches += toolchain.cmake
|
||||
$(package)_patches += xkb-1.6.0.patch
|
||||
$(package)_patches += CVE-2023-45872-qtsvg-6.6.0.diff
|
||||
$(package)_patches += fix_alternating_row_icons_windows.patch
|
||||
#$(package)_patches += fix-static-fontconfig-static-linking.patch
|
||||
|
||||
$(package)_qttools_file_name=qttools-$($(package)_suffix)
|
||||
$(package)_qttools_sha256_hash=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99
|
||||
$(package)_qttools_sha256_hash=4939105a7345ab4e19e7caee8654a836e65bd41910359623e0f233f3aff0914a
|
||||
|
||||
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
|
||||
$(package)_qtsvg_sha256_hash=33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de
|
||||
$(package)_qtsvg_sha256_hash=248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228
|
||||
|
||||
$(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix)
|
||||
$(package)_qtwebsockets_sha256_hash=2e05b15c0c6e82c484cf3a4a39a3e3e484a6c8f72bc31ee5cf615d52d07df30e
|
||||
$(package)_qtwebsockets_sha256_hash=787514349876d87e046504e5f64886d886bd2993a53fa795598ea07ecc7b0643
|
||||
|
||||
$(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
|
||||
$(package)_qtmultimedia_sha256_hash=ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782
|
||||
$(package)_qtmultimedia_sha256_hash=7ee4e2296f5714961692f6ded568d3e3fde3687cee48e9d717194b5d1360db4a
|
||||
|
||||
$(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
|
||||
$(package)_qtshadertools_sha256_hash=3690327dc550144b8102be2bb7f6dc995ccbe3584041094ad021a83737ef9875
|
||||
$(package)_qtshadertools_sha256_hash=08338fe4f54954928e41a8a5450627e61bca115039706c28161bf967785e73bb
|
||||
|
||||
$(package)_extra_sources += $($(package)_qttools_file_name)
|
||||
$(package)_extra_sources += $($(package)_qtsvg_file_name)
|
||||
|
|
@ -191,13 +188,9 @@ define $(package)_preprocess_cmds
|
|||
patch -p1 -i $($(package)_patch_dir)/revert_f99ee441.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/xcb-util-image-fix.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/xkb-1.6.0.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/fix_alternating_row_icons_windows.patch && \
|
||||
cd ../qtmultimedia && \
|
||||
patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
|
||||
cd ../qtsvg && \
|
||||
patch -p1 -i $($(package)_patch_dir)/CVE-2023-45872-qtsvg-6.6.0.diff
|
||||
patch -p1 -i $($(package)_patch_dir)/v4l2.patch
|
||||
endef
|
||||
|
||||
define $(package)_config_cmds
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
|
||||
index 2649422..335500a 100644
|
||||
--- a/src/svg/qsvghandler.cpp
|
||||
+++ b/src/svg/qsvghandler.cpp
|
||||
@@ -3606,6 +3606,8 @@ void QSvgHandler::init()
|
||||
|
||||
static bool detectCycles(const QSvgNode *node, QList<const QSvgUse *> active = {})
|
||||
{
|
||||
+ if (Q_UNLIKELY(!node))
|
||||
+ return false;
|
||||
switch (node->type()) {
|
||||
case QSvgNode::DOC:
|
||||
case QSvgNode::G:
|
||||
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 8cf8182967af4c7d69deb9b583eb19aaa1b9f9b0 Mon Sep 17 00:00:00 2001
|
||||
From: tobtoht <tob@featherwallet.org>
|
||||
Date: Sun, 22 Oct 2023 19:03:27 +0200
|
||||
Subject: [PATCH] Revert "Don't double draw ItemViewItems' icons in
|
||||
QStyleSheetStyle::drawControl"
|
||||
|
||||
This reverts commit e2e0c07455e5e6c8f65dc76a86a63b93dadb7600.
|
||||
---
|
||||
src/widgets/styles/qstylesheetstyle.cpp | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
|
||||
index e9443ac9c8..e81381681d 100644
|
||||
--- a/src/widgets/styles/qstylesheetstyle.cpp
|
||||
+++ b/src/widgets/styles/qstylesheetstyle.cpp
|
||||
@@ -4374,11 +4374,6 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
|
||||
optIndicator.backgroundBrush = Qt::NoBrush; // no background
|
||||
optIndicator.text.clear();
|
||||
QWindowsStyle::drawControl(ce, &optIndicator, p, w);
|
||||
-
|
||||
- // If the indicator has an icon, it has been drawn now.
|
||||
- // => don't draw it again.
|
||||
- optCopy.icon = QIcon();
|
||||
-
|
||||
// Now draw text, background, and highlight, but not the indicator with the
|
||||
// base style. Since we can't turn off HasCheckIndicator to prevent the base
|
||||
// style from drawing the check indicator again (it would change how the item
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
From f3fbd07f7a180b58db8025c5165e42b7ea3390c2 Mon Sep 17 00:00:00 2001
|
||||
From: Liang Qi <liang.qi@qt.io>
|
||||
Date: Tue, 10 Oct 2023 14:08:48 +0200
|
||||
Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
|
||||
https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
|
||||
https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
|
||||
|
||||
Pick-to: 6.5 6.2 5.15
|
||||
Fixes: QTBUG-117950
|
||||
Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
|
||||
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
||||
(cherry picked from commit 8af35d27e8f02bbb99aef4ac495ed406e50e3cca)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
---
|
||||
src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
|
||||
index 2fa2ae8911..394407e403 100644
|
||||
--- a/src/gui/platform/unix/qxkbcommon.cpp
|
||||
+++ b/src/gui/platform/unix/qxkbcommon.cpp
|
||||
@@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMakeArray(
|
||||
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
|
||||
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
|
||||
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
|
||||
+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
|
||||
+ The define check is kind of version check here. */
|
||||
+#ifdef XKB_KEY_dead_lowline
|
||||
Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
|
||||
Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
|
||||
Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
|
||||
Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
|
||||
+#endif
|
||||
|
||||
// Special keys from X.org - This include multimedia keys,
|
||||
// wireless/bluetooth/uwb keys, special launcher keys, etc.
|
||||
--
|
||||
2.42.0
|
||||
|
||||
Loading…
Reference in a new issue