github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-17 07:11:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

depends: qt: update to 6.8.2

Browse Source
This commit is contained in:
tobtoht
2025-02-04 07:46:36 +01:00
parent 019d87c5a6
commit 7827b865b1
5 changed files with 17 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/depends/packages/native_qt.mk
+7 -7
View File
@@ -1,9 +1,9 @@
package=native_qt
$(package)_version=6.8.1
$(package)_version=6.8.2
$(package)_download_path=https://download.qt.io/official_releases/qt/6.8/$($(package)_version)/submodules
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf
$(package)_sha256_hash=012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05
$(package)_linux_dependencies=native_wayland
$(package)_qt_libs=corelib network widgets gui plugins testlib
$(package)_patches = dont_hardcode_pwd.patch
@@ -14,19 +14,19 @@ $(package)_patches += rcc_hardcode_timestamp.patch
$(package)_patches += root_CMakeLists.txt
$(package)_qttools_file_name=qttools-$($(package)_suffix)
$(package)_qttools_sha256_hash=9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d
$(package)_qttools_sha256_hash=326381b7d43f07913612f291abc298ae79bd95382e2233abce982cff2b53d2c0
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
$(package)_qtsvg_sha256_hash=3d0de73596e36b2daa7c48d77c4426bb091752856912fba720215f756c560dd0
$(package)_qtsvg_sha256_hash=aa2579f21ca66d19cbcf31d87e9067e07932635d36869c8239d4decd0a9dc1fa
$(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
$(package)_qtmultimedia_sha256_hash=75fa87134f9afab7f0a62c55a4744799ac79519560d19c8e1d4c32bdd173f953
$(package)_qtmultimedia_sha256_hash=34f561fdc07b158bcc4ad040b596fc6086c48908060e854b473b557e4feb1569
$(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
$(package)_qtshadertools_sha256_hash=55b70cd632473a8043c74ba89310f7ba9c5041d253bc60e7ae1fa789169c4846
$(package)_qtshadertools_sha256_hash=d1d5f90e8885fc70d63ac55a4ce4d9a2688562033a000bc4aff9320f5f551871
$(package)_qtwayland_file_name=qtwayland-$($(package)_suffix)
$(package)_qtwayland_sha256_hash=2226fbde4e2ddd12f8bf4b239c8f38fd706a54e789e63467dfddc77129eca203
$(package)_qtwayland_sha256_hash=5e46157908295f2bf924462d8c0855b0508ba338ced9e810891fefa295dc9647
$(package)_extra_sources += $($(package)_qttools_file_name)
$(package)_extra_sources += $($(package)_qtsvg_file_name)
contrib/depends/packages/qt.mk
+8 -10
View File
@@ -1,9 +1,9 @@
package=qt
$(package)_version=6.8.1
$(package)_version=6.8.2
$(package)_download_path=https://download.qt.io/official_releases/qt/6.8/$($(package)_version)/submodules
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=40b14562ef3bd779bc0e0418ea2ae08fa28235f8ea6e8c0cb3bce1d6ad58dcaf
$(package)_sha256_hash=012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05
$(package)_darwin_dependencies=openssl native_qt
$(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 wayland native_wayland
@@ -21,29 +21,28 @@ $(package)_patches += toolchain.cmake
$(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
$(package)_patches += no-resonance-audio.patch
$(package)_patches += fix_static_qt_darwin_camera_permissions.patch
$(package)_patches += revert-f67ee7c39.patch
$(package)_patches += macos-available-qtbase.patch
$(package)_patches += macos-available-qtmultimedia.patch
$(package)_patches += qtwayland-tabletevent-fix.patch
#$(package)_patches += fix-static-fontconfig-static-linking.patch
$(package)_qttools_file_name=qttools-$($(package)_suffix)
$(package)_qttools_sha256_hash=9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d
$(package)_qttools_sha256_hash=326381b7d43f07913612f291abc298ae79bd95382e2233abce982cff2b53d2c0
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
$(package)_qtsvg_sha256_hash=3d0de73596e36b2daa7c48d77c4426bb091752856912fba720215f756c560dd0
$(package)_qtsvg_sha256_hash=aa2579f21ca66d19cbcf31d87e9067e07932635d36869c8239d4decd0a9dc1fa
$(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix)
$(package)_qtwebsockets_sha256_hash=e4cfdae8760bedd1c2b00429a6c9bf88cc11c5018dcb46bde277fb1edf341e3f
$(package)_qtwebsockets_sha256_hash=919df562ba3446c8393992d112085ad2d96d23aaf802b1cd7a30bf3ba2fe8cbe
$(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
$(package)_qtmultimedia_sha256_hash=75fa87134f9afab7f0a62c55a4744799ac79519560d19c8e1d4c32bdd173f953
$(package)_qtmultimedia_sha256_hash=34f561fdc07b158bcc4ad040b596fc6086c48908060e854b473b557e4feb1569
$(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
$(package)_qtshadertools_sha256_hash=55b70cd632473a8043c74ba89310f7ba9c5041d253bc60e7ae1fa789169c4846
$(package)_qtshadertools_sha256_hash=d1d5f90e8885fc70d63ac55a4ce4d9a2688562033a000bc4aff9320f5f551871
$(package)_qtwayland_file_name=qtwayland-$($(package)_suffix)
$(package)_qtwayland_sha256_hash=2226fbde4e2ddd12f8bf4b239c8f38fd706a54e789e63467dfddc77129eca203
$(package)_qtwayland_sha256_hash=5e46157908295f2bf924462d8c0855b0508ba338ced9e810891fefa295dc9647
$(package)_extra_sources += $($(package)_qttools_file_name)
$(package)_extra_sources += $($(package)_qtsvg_file_name)
@@ -238,7 +237,6 @@ define $(package)_preprocess_cmds
cd ../qtmultimedia && \
patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
patch -p1 -i $($(package)_patch_dir)/revert-f67ee7c39.patch && \
patch -p1 -i $($(package)_patch_dir)/macos-available-qtmultimedia.patch && \
cd ../qtwayland && \
patch -p1 -i $($(package)_patch_dir)/qtwayland-tabletevent-fix.patch
contrib/depends/patches/qt/macos-available-qtbase.patch
-20
View File
@@ -1,23 +1,3 @@
diff --git a/src/gui/platform/darwin/qappleiconengine.mm b/src/gui/platform/darwin/qappleiconengine.mm
index d99da6da84..c6cd8ffe87 100644
--- a/src/gui/platform/darwin/qappleiconengine.mm
+++ b/src/gui/platform/darwin/qappleiconengine.mm
@@ -362,15 +362,6 @@ auto *configuredImage(const NSImage *image, const QColor &color)
auto *config = [NSImageSymbolConfiguration configurationWithPointSize:48
weight:NSFontWeightRegular
scale:NSImageSymbolScaleLarge];
- if (@available(macOS 12, *)) {
- auto *primaryColor = [NSColor colorWithSRGBRed:color.redF()
- green:color.greenF()
- blue:color.blueF()
- alpha:color.alphaF()];
-
- auto *colorConfig = [NSImageSymbolConfiguration configurationWithHierarchicalColor:primaryColor];
- config = [config configurationByApplyingConfiguration:colorConfig];
- }
return [image imageWithSymbolConfiguration:config];
}
diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
index 3046b76427..8c1e7fd13f 100644
--- a/src/gui/rhi/qrhimetal.mm
contrib/depends/patches/qt/revert-f67ee7c39.patch
-55
View File
@@ -1,55 +0,0 @@
diff --git a/src/multimedia/darwin/qdarwinmediadevices.mm b/src/multimedia/darwin/qdarwinmediadevices.mm
index b0a108935..3ab7e6c05 100644
--- a/src/multimedia/darwin/qdarwinmediadevices.mm
+++ b/src/multimedia/darwin/qdarwinmediadevices.mm
@@ -39,11 +39,8 @@ static AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode)
{
const AudioObjectPropertySelector selector = (mode == QAudioDevice::Output) ? kAudioHardwarePropertyDefaultOutputDevice
: kAudioHardwarePropertyDefaultInputDevice;
- const AudioObjectPropertyAddress propertyAddress = {
- selector,
- kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMain,
- };
+ const AudioObjectPropertyAddress propertyAddress = { selector, kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMaster };
if (auto audioDevice = getAudioObject<AudioDeviceID>(kAudioObjectSystemObject, propertyAddress,
"Default Device")) {
@@ -77,7 +74,7 @@ static QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode)
const AudioObjectPropertyAddress audioDevicesPropertyAddress = {
kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMain
+ kAudioObjectPropertyElementMaster
};
if (auto audioDevices = getAudioData<AudioDeviceID>(
@@ -130,11 +127,11 @@ static OSStatus audioDeviceChangeListener(AudioObjectID id, UInt32,
static constexpr AudioObjectPropertyAddress listenerAddresses[] = {
{ kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMain },
+ kAudioObjectPropertyElementMaster },
{ kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMain },
+ kAudioObjectPropertyElementMaster },
{ kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMain }
+ kAudioObjectPropertyElementMaster }
};
static void setAudioListeners(QDarwinMediaDevices &instance)
diff --git a/src/multimedia/darwin/qmacosaudiodatautils_p.h b/src/multimedia/darwin/qmacosaudiodatautils_p.h
index 8cc2f8440..5cd6fced2 100644
--- a/src/multimedia/darwin/qmacosaudiodatautils_p.h
+++ b/src/multimedia/darwin/qmacosaudiodatautils_p.h
@@ -44,7 +44,7 @@ void printUnableToReadWarning(const char *logName, AudioObjectID objectID, const
inline static AudioObjectPropertyAddress
makePropertyAddress(AudioObjectPropertySelector selector, QAudioDevice::Mode mode,
- AudioObjectPropertyElement element = kAudioObjectPropertyElementMain)
+ AudioObjectPropertyElement element = kAudioObjectPropertyElementMaster)
{
return { selector,
mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput
contrib/depends/patches/qt/v4l2.patch
+2 -2
View File
@@ -1941,7 +1941,7 @@ index 000000000..44abde914
+ doCheckCameras();
+}
+
+QList<QCameraDevice> QV4L2CameraDevices::videoDevices() const
+QList<QCameraDevice> QV4L2CameraDevices::videoInputs() const
+{
+ return m_cameras;
+}
@@ -2104,7 +2104,7 @@ index 000000000..ce424d3b6
+public:
+ QV4L2CameraDevices(QPlatformMediaIntegration *integration);
+
+ QList<QCameraDevice> videoDevices() const override;
+ QList<QCameraDevice> videoInputs() const override;
+
+public Q_SLOTS:
+ void checkCameras();