From fa1a8d58026af8fe668f23fd5776ad82bc8675c6 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 29 Dec 2023 22:12:12 +0300 Subject: [PATCH] qt5-base-5.15.12 --- desktop/toolkit/qt5/qt5-3d/pspec.xml | 25 +++++++++++------ desktop/toolkit/qt5/qt5-canvas3d/pspec.xml | 15 +++++++--- desktop/toolkit/qt5/qt5-charts/pspec.xml | 19 +++++++++---- .../toolkit/qt5/qt5-connectivity/pspec.xml | 23 +++++++++------ desktop/toolkit/qt5/qt5-datavis3d/pspec.xml | 21 +++++++++----- desktop/toolkit/qt5/qt5-gamepad/pspec.xml | 19 +++++++++---- desktop/toolkit/qt5/qt5-scxml/pspec.xml | 21 +++++++++----- .../toolkit/qt5/qt5-tools/files/qt_kde.patch | 24 ++++++++++++++++ desktop/toolkit/qt5/qt5-tools/pspec.xml | 23 +++++++++------ .../qt5/qt5-wayland/files/qt_kde.patch | 28 +++++++++---------- desktop/toolkit/qt5/qt5-wayland/pspec.xml | 21 +++++++++----- 11 files changed, 163 insertions(+), 76 deletions(-) diff --git a/desktop/toolkit/qt5/qt5-3d/pspec.xml b/desktop/toolkit/qt5/qt5-3d/pspec.xml index 53aa3c7411..4dc92e38bf 100755 --- a/desktop/toolkit/qt5/qt5-3d/pspec.xml +++ b/desktop/toolkit/qt5/qt5-3d/pspec.xml @@ -15,24 +15,24 @@ desktop C++ and QML APIs for easy inclusion of 3D graphics C++ and QML APIs for easy inclusion of 3D graphics - https://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qt3d-everywhere-opensource-src-5.15.11.tar.xz + https://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qt3d-everywhere-opensource-src-5.15.12.tar.xz - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel assimp-devel vulkan-headers zlib-devel - - + + qt5-3d C++ and QML APIs for easy inclusion of 3D graphics - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc assimp @@ -48,8 +48,8 @@ qt5-3d-devel Development files for qt5-3d - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-3d @@ -60,6 +60,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-07 5.15.11 diff --git a/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml b/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml index 14a9f42d37..ce222e1d9f 100755 --- a/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml +++ b/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml @@ -17,16 +17,16 @@ A JavaScript 3D rendering API for Qt Quick https://github.com/qt/qtcanvas3d/archive/refs/tags/v5.12.12.tar.gz - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-canvas3d A JavaScript 3D rendering API for Qt Quick - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc @@ -35,6 +35,13 @@ + + 2023-12-29 + 5.12.12 + Rebuild qt-5.15.12. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-07 5.12.12 diff --git a/desktop/toolkit/qt5/qt5-charts/pspec.xml b/desktop/toolkit/qt5/qt5-charts/pspec.xml index 5ba58a9b73..56f72c20eb 100755 --- a/desktop/toolkit/qt5/qt5-charts/pspec.xml +++ b/desktop/toolkit/qt5/qt5-charts/pspec.xml @@ -11,18 +11,18 @@ GPL3 Provides a set of easy to use chart components Provides a set of easy to use chart components - http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtcharts-everywhere-opensource-src-5.15.11.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtcharts-everywhere-opensource-src-5.15.12.tar.xz - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-charts Provides a set of easy to use chart components - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc @@ -36,7 +36,7 @@ qt5-charts-devel Development files for qt5-charts - qt5-base-devel + qt5-base-devel qt5-charts @@ -47,6 +47,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-07 5.15.11 diff --git a/desktop/toolkit/qt5/qt5-connectivity/pspec.xml b/desktop/toolkit/qt5/qt5-connectivity/pspec.xml index f70da53ebb..ed82332a16 100755 --- a/desktop/toolkit/qt5/qt5-connectivity/pspec.xml +++ b/desktop/toolkit/qt5/qt5-connectivity/pspec.xml @@ -11,21 +11,21 @@ Provides access to Bluetooth hardware Provides access to Bluetooth hardware LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtconnectivity-everywhere-opensource-src-5.15.11.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtconnectivity-everywhere-opensource-src-5.15.12.tar.xz bluez-libs-devel - qt5-sql-sqlite - qt5-base-devel - qt5-assistant-devel - qt5-declarative-devel + qt5-sql-sqlite + qt5-base-devel + qt5-assistant-devel + qt5-declarative-devel qt5-connectivity - qt5-base - qt5-declarative + qt5-base + qt5-declarative bluez-libs libgcc @@ -46,7 +46,7 @@ qt5-connectivity - qt5-base-devel + qt5-base-devel @@ -61,6 +61,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-07 5.15.11 diff --git a/desktop/toolkit/qt5/qt5-datavis3d/pspec.xml b/desktop/toolkit/qt5/qt5-datavis3d/pspec.xml index 98ddc86ed8..0f259372a7 100755 --- a/desktop/toolkit/qt5/qt5-datavis3d/pspec.xml +++ b/desktop/toolkit/qt5/qt5-datavis3d/pspec.xml @@ -12,18 +12,18 @@ desktop Provides a set of easy to use chart components Qt Data Visualization module - http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtdatavis3d-everywhere-opensource-src-5.15.11.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtdatavis3d-everywhere-opensource-src-5.15.12.tar.xz - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-datavis3d Qt Data Visualization module - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc @@ -37,8 +37,8 @@ qt5-datavis3d-devel Development files for qt5-datavis3d - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-datavis3d @@ -49,6 +49,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-07 5.15.11 diff --git a/desktop/toolkit/qt5/qt5-gamepad/pspec.xml b/desktop/toolkit/qt5/qt5-gamepad/pspec.xml index 97d86294e6..a2fbd3fa77 100755 --- a/desktop/toolkit/qt5/qt5-gamepad/pspec.xml +++ b/desktop/toolkit/qt5/qt5-gamepad/pspec.xml @@ -15,12 +15,12 @@ desktop A JavaScript 3D rendering API for Qt Quick Adds support for getting events from gamepad devices - http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtgamepad-everywhere-opensource-src-5.15.11.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtgamepad-everywhere-opensource-src-5.15.12.tar.xz eudev-devel libsdl2-devel - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel @@ -30,8 +30,8 @@ eudev libgcc libsdl2 - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -45,7 +45,7 @@ qt5-gamepad-devel Development files for qt5-gamepad - qt5-base-devel + qt5-base-devel qt5-gamepad @@ -56,6 +56,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-07 5.15.11 diff --git a/desktop/toolkit/qt5/qt5-scxml/pspec.xml b/desktop/toolkit/qt5/qt5-scxml/pspec.xml index b41dfa34b6..81d3ce5875 100755 --- a/desktop/toolkit/qt5/qt5-scxml/pspec.xml +++ b/desktop/toolkit/qt5/qt5-scxml/pspec.xml @@ -14,18 +14,18 @@ LGPL3 Provides a set of easy to use chart components Provides a set of easy to use chart components - http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtscxml-everywhere-opensource-src-5.15.11.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtscxml-everywhere-opensource-src-5.15.12.tar.xz - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-scxml Provides a set of easy to use chart components - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc @@ -41,8 +41,8 @@ Development files for qt5-scxml qt5-scxml - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel /usr/include/qt5 @@ -52,6 +52,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-07 5.15.11 diff --git a/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch index 31075ea483..4d19d3dcca 100644 --- a/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch +++ b/desktop/toolkit/qt5/qt5-tools/files/qt_kde.patch @@ -104,3 +104,27 @@ index 6a45e57be..0ccf59f3c 100644 set(qm_dep "${ts_stamp_file}") else() set(qm_dep "${_abs_FILE}") +diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp +index 539a603da..a41b99cec 100644 +--- a/src/qdoc/clangcodeparser.cpp ++++ b/src/qdoc/clangcodeparser.cpp +@@ -1395,8 +1395,7 @@ void ClangCodeParser::buildPCH() + args_.push_back("-xc++"); + CXTranslationUnit tu; + QString tmpHeader = pchFileDir_->path() + "/" + module; +- QFile tmpHeaderFile(tmpHeader); +- if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) { ++ { QFile tmpHeaderFile(tmpHeader); if (tmpHeaderFile.open(QIODevice::Text | QIODevice::WriteOnly)) { + QTextStream out(&tmpHeaderFile); + if (header.isEmpty()) { + for (auto it = allHeaders_.constKeyValueBegin(); +@@ -1421,8 +1420,7 @@ void ClangCodeParser::buildPCH() + out << line << "\n"; + } + } +- tmpHeaderFile.close(); +- } ++ } } + if (printParsingErrors_ == 0) + qCWarning(lcQdoc) << "clang not printing errors; include paths were guessed"; + CXErrorCode err = diff --git a/desktop/toolkit/qt5/qt5-tools/pspec.xml b/desktop/toolkit/qt5/qt5-tools/pspec.xml index a614f2abcf..6c34d68b1f 100755 --- a/desktop/toolkit/qt5/qt5-tools/pspec.xml +++ b/desktop/toolkit/qt5/qt5-tools/pspec.xml @@ -11,15 +11,15 @@ A cross-platform application and UI framework (Development Tools, QtHelp) A cross-platform application and UI framework (Development Tools, QtHelp) LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qttools-everywhere-opensource-src-5.15.11.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qttools-everywhere-opensource-src-5.15.12.tar.xz llvm mesa-devel llvm-clang-devel lld-devel - qt5-base-devel + qt5-base-devel icon-theme-hicolor - qt5-declarative-devel + qt5-declarative-devel qt_kde.patch @@ -32,8 +32,8 @@ libgcc llvm-libs llvm-clang - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/bin/qdistancefieldgenerator @@ -70,7 +70,7 @@ qt5-assistant-devel - qt5-base-devel + qt5-base-devel qt5-assistant llvm-clang-devel @@ -86,8 +86,8 @@ qt5-designer libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/bin/designer @@ -188,6 +188,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-10-17 5.15.11 diff --git a/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch index 43b81feeae..e61b776b28 100644 --- a/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch +++ b/desktop/toolkit/qt5/qt5-wayland/files/qt_kde.patch @@ -567,10 +567,10 @@ index 9cf1483c..6f667398 100644 diff --git a/src/client/qwaylanddatasource.cpp b/src/client/qwaylanddatasource.cpp -index 9b17cdfa..1a6b9835 100644 +index c2bc9dc4..321170a6 100644 --- a/src/client/qwaylanddatasource.cpp +++ b/src/client/qwaylanddatasource.cpp -@@ -71,11 +71,6 @@ QWaylandDataSource::~QWaylandDataSource() +@@ -72,11 +72,6 @@ QWaylandDataSource::~QWaylandDataSource() destroy(); } @@ -582,7 +582,7 @@ index 9b17cdfa..1a6b9835 100644 void QWaylandDataSource::data_source_cancelled() { Q_EMIT cancelled(); -@@ -101,7 +96,32 @@ void QWaylandDataSource::data_source_send(const QString &mime_type, int32_t fd) +@@ -110,7 +105,32 @@ void QWaylandDataSource::data_source_send(const QString &mime_type, int32_t fd) void QWaylandDataSource::data_source_target(const QString &mime_type) { @@ -1388,7 +1388,7 @@ index 47696a6a..9435e961 100644 reset(); diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp -index 08e8adb8..34c185a3 100644 +index b0e9692b..ab978d3f 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -310,8 +310,7 @@ void QWaylandInputDevice::Pointer::updateCursor() @@ -1512,7 +1512,7 @@ index bf54a1a0..9763c312 100644 return nullptr; diff --git a/src/client/qwaylandprimaryselectionv1.cpp b/src/client/qwaylandprimaryselectionv1.cpp -index 78b1de13..cf3b4b22 100644 +index 7805dd73..dac532b2 100644 --- a/src/client/qwaylandprimaryselectionv1.cpp +++ b/src/client/qwaylandprimaryselectionv1.cpp @@ -54,11 +54,6 @@ QWaylandPrimarySelectionDeviceManagerV1::QWaylandPrimarySelectionDeviceManagerV1 @@ -1735,7 +1735,7 @@ index e01632da..f3fae438 100644 QSize size() const override { return mImage.size(); } int scale() const override { return int(mImage.devicePixelRatio()); } diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index 5a390434..d3958d46 100644 +index d57094a7..7a9bccc1 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -76,7 +76,6 @@ QWaylandWindow *QWaylandWindow::mMouseGrab = nullptr; @@ -2052,7 +2052,7 @@ index 5a390434..d3958d46 100644 int scale = newScreen->isPlaceholder() ? 1 : static_cast(newScreen)->scale(); if (scale != mScale) { -@@ -1084,14 +1111,14 @@ bool QWaylandWindow::isActive() const +@@ -1087,14 +1114,14 @@ bool QWaylandWindow::isActive() const return mDisplay->isWindowActivated(this); } @@ -2070,7 +2070,7 @@ index 5a390434..d3958d46 100644 } bool QWaylandWindow::setMouseGrabEnabled(bool grab) -@@ -1105,10 +1132,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab) +@@ -1108,10 +1135,18 @@ bool QWaylandWindow::setMouseGrabEnabled(bool grab) return true; } @@ -2090,7 +2090,7 @@ index 5a390434..d3958d46 100644 mLastReportedWindowStates = states; } -@@ -1150,19 +1185,24 @@ void QWaylandWindow::timerEvent(QTimerEvent *event) +@@ -1153,19 +1188,24 @@ void QWaylandWindow::timerEvent(QTimerEvent *event) if (event->timerId() != mFrameCallbackCheckIntervalTimerId) return; @@ -2126,7 +2126,7 @@ index 5a390434..d3958d46 100644 } void QWaylandWindow::requestUpdate() -@@ -1171,8 +1211,11 @@ void QWaylandWindow::requestUpdate() +@@ -1174,8 +1214,11 @@ void QWaylandWindow::requestUpdate() Q_ASSERT(hasPendingUpdateRequest()); // should be set by QPA // If we have a frame callback all is good and will be taken care of there @@ -2140,7 +2140,7 @@ index 5a390434..d3958d46 100644 // If we've already called deliverUpdateRequest(), but haven't seen any attach+commit/swap yet // This is a somewhat redundant behavior and might indicate a bug in the calling code, so log -@@ -1185,7 +1228,12 @@ void QWaylandWindow::requestUpdate() +@@ -1188,7 +1231,12 @@ void QWaylandWindow::requestUpdate() // so use invokeMethod to delay the delivery a bit. QMetaObject::invokeMethod(this, [this] { // Things might have changed in the meantime @@ -2154,7 +2154,7 @@ index 5a390434..d3958d46 100644 deliverUpdateRequest(); }, Qt::QueuedConnection); } -@@ -1196,19 +1244,18 @@ void QWaylandWindow::requestUpdate() +@@ -1199,19 +1247,18 @@ void QWaylandWindow::requestUpdate() void QWaylandWindow::handleUpdate() { qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread(); @@ -2179,7 +2179,7 @@ index 5a390434..d3958d46 100644 mFrameCallback = wl_surface_frame(wrappedSurface); wl_proxy_wrapper_destroy(wrappedSurface); wl_callback_add_listener(mFrameCallback, &QWaylandWindow::callbackListener, this); -@@ -1218,6 +1265,8 @@ void QWaylandWindow::handleUpdate() +@@ -1221,6 +1268,8 @@ void QWaylandWindow::handleUpdate() // Start a timer for handling the case when the compositor stops sending frame callbacks. if (mFrameCallbackTimeout > 0) { QMetaObject::invokeMethod(this, [this] { @@ -2188,7 +2188,7 @@ index 5a390434..d3958d46 100644 if (mWaitingForFrameCallback) { if (mFrameCallbackCheckIntervalTimerId < 0) mFrameCallbackCheckIntervalTimerId = startTimer(mFrameCallbackTimeout); -@@ -1278,6 +1327,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea) +@@ -1281,6 +1330,20 @@ void QWaylandWindow::setOpaqueArea(const QRegion &opaqueArea) wl_region_destroy(region); } diff --git a/desktop/toolkit/qt5/qt5-wayland/pspec.xml b/desktop/toolkit/qt5/qt5-wayland/pspec.xml index ff36fe8508..1b26703705 100755 --- a/desktop/toolkit/qt5/qt5-wayland/pspec.xml +++ b/desktop/toolkit/qt5/qt5-wayland/pspec.xml @@ -11,7 +11,7 @@ Provides APIs for Wayland Provides APIs for Wayland LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.11/submodules/qtwayland-everywhere-opensource-src-5.15.11.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.12/submodules/qtwayland-everywhere-opensource-src-5.15.12.tar.xz libgcc libX11-devel @@ -28,8 +28,8 @@ mesa-devel glib2-devel freetype-devel - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt_kde.patch @@ -51,8 +51,8 @@ mesa glib2 freetype - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -66,7 +66,7 @@ qt5-wayland-devel qt5-wayland - qt5-base-devel + qt5-base-devel /usr/lib/pkgconfig @@ -77,7 +77,7 @@ qt5-wayland-docs - qt5-base + qt5-base /usr/share/doc @@ -85,6 +85,13 @@ + + 2023-12-29 + 5.15.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-11-11 5.15.11