From 732dfdd0af2de05041e0009c135380f88e538d02 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 9 Sep 2020 19:21:33 +0300 Subject: [PATCH] qt5-5.15.1 --- desktop/toolkit/qt5/qt5-3d/pspec.xml | 24 ++++++++++---- .../toolkit/qt5/qt5-accountsservice/pspec.xml | 17 +++++++--- desktop/toolkit/qt5/qt5-canvas3d/pspec.xml | 17 +++++++--- desktop/toolkit/qt5/qt5-charts/pspec.xml | 19 +++++++---- .../toolkit/qt5/qt5-configuration/pspec.xml | 17 +++++++--- desktop/toolkit/qt5/qt5-datavis3d/pspec.xml | 21 ++++++++---- desktop/toolkit/qt5/qt5-gamepad/pspec.xml | 19 +++++++---- desktop/toolkit/qt5/qt5-scxml/pspec.xml | 21 ++++++++---- .../qt5-tools/files/qt5-tools-qtwebkit.patch | 32 +++++++++++++++++++ desktop/toolkit/qt5/qt5-tools/pspec.xml | 26 ++++++++++----- desktop/toolkit/qt5/qt5-wayland/pspec.xml | 21 ++++++++---- 11 files changed, 171 insertions(+), 63 deletions(-) create mode 100644 desktop/toolkit/qt5/qt5-tools/files/qt5-tools-qtwebkit.patch diff --git a/desktop/toolkit/qt5/qt5-3d/pspec.xml b/desktop/toolkit/qt5/qt5-3d/pspec.xml index c8b55b5fd6..aef2409b2e 100755 --- a/desktop/toolkit/qt5/qt5-3d/pspec.xml +++ b/desktop/toolkit/qt5/qt5-3d/pspec.xml @@ -15,20 +15,23 @@ desktop C++ and QML APIs for easy inclusion of 3D graphics C++ and QML APIs for easy inclusion of 3D graphics - http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qt3d-everywhere-src-5.15.1.tar.xz - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel assimp-devel zlib-devel + + + qt5-3d C++ and QML APIs for easy inclusion of 3D graphics - qt5-base - qt5-declarative + qt5-base + qt5-declarative libgcc assimp @@ -44,8 +47,8 @@ qt5-3d-devel Development files for qt5-3d - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel qt5-3d @@ -56,6 +59,13 @@ + + 2020-09-09 + 5.15.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.14.2 diff --git a/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml b/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml index c717623c5e..d4789e22ee 100755 --- a/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml +++ b/desktop/toolkit/qt5/qt5-accountsservice/pspec.xml @@ -15,8 +15,8 @@ liri-cmake-shared extra-cmake-modules - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel @@ -24,8 +24,8 @@ qt5-accountsservice libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -45,12 +45,19 @@ /usr/lib/pkgconfig - qt5-base-devel + qt5-base-devel qt5-accountsservice + + 2020-09-09 + 1.3.0 + Rebuild qt5-5.15.1 + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 1.3.0 diff --git a/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml b/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml index a36cd6a3a9..825b8fa570 100755 --- a/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml +++ b/desktop/toolkit/qt5/qt5-canvas3d/pspec.xml @@ -15,18 +15,18 @@ desktop A JavaScript 3D rendering API for Qt Quick A JavaScript 3D rendering API for Qt Quick - http://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz + http://download.qt.io/official_releases/qt/5.12/5.12.9/submodules/qtcanvas3d-everywhere-src-5.12.9.tar.xz - 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 @@ + + 2020-09-09 + 5.12.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.12.7 diff --git a/desktop/toolkit/qt5/qt5-charts/pspec.xml b/desktop/toolkit/qt5/qt5-charts/pspec.xml index d1161a635d..2002a2d8cc 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.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtcharts-everywhere-src-5.15.1.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 @@ + + 2020-09-09 + 5.15.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.14.2 diff --git a/desktop/toolkit/qt5/qt5-configuration/pspec.xml b/desktop/toolkit/qt5/qt5-configuration/pspec.xml index ac48276330..e0d32e9378 100755 --- a/desktop/toolkit/qt5/qt5-configuration/pspec.xml +++ b/desktop/toolkit/qt5/qt5-configuration/pspec.xml @@ -16,8 +16,8 @@ cmake dconf-devel glib2-devel - qt5-declarative-devel - qt5-base-devel + qt5-declarative-devel + qt5-base-devel @@ -27,8 +27,8 @@ dconf libgcc glib2 - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -48,11 +48,18 @@ qt5-configuration - qt5-base-devel + qt5-base-devel + + 2020-09-09 + 0.3.1 + Rebuild qt5-5.15.1 + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 0.3.1 diff --git a/desktop/toolkit/qt5/qt5-datavis3d/pspec.xml b/desktop/toolkit/qt5/qt5-datavis3d/pspec.xml index 6b0c72a54b..5fc9e75e1f 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.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtdatavis3d-everywhere-src-5.15.1.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 @@ + + 2020-09-09 + 5.15.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.14.2 diff --git a/desktop/toolkit/qt5/qt5-gamepad/pspec.xml b/desktop/toolkit/qt5/qt5-gamepad/pspec.xml index f64bca1e91..554da8fca4 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.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtgamepad-everywhere-src-5.15.1.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 @@ + + 2020-09-09 + 5.15.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.14.2 diff --git a/desktop/toolkit/qt5/qt5-scxml/pspec.xml b/desktop/toolkit/qt5/qt5-scxml/pspec.xml index 82c65ed7ce..52cd737fcd 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.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscxml-everywhere-src-5.15.1.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 @@ + + 2020-09-09 + 5.15.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.14.2 diff --git a/desktop/toolkit/qt5/qt5-tools/files/qt5-tools-qtwebkit.patch b/desktop/toolkit/qt5/qt5-tools/files/qt5-tools-qtwebkit.patch new file mode 100644 index 0000000000..18c1180f58 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-tools/files/qt5-tools-qtwebkit.patch @@ -0,0 +1,32 @@ +From 3c30956e65a98706d283d44e07fd481a1849f74e Mon Sep 17 00:00:00 2001 +From: Alexander Volkov +Date: Tue, 26 May 2020 22:20:31 +0300 +Subject: Assistant: Fix build with qtwebkit + +Amend b3cdd63d4bdaea09222fb93ffcd5104a2dc0bf2e. +Don't declare HelpViewer::resizeEvent() when HelpViewer +is inherited from QWebView to avoid linker error. + +Change-Id: Ib4ca6823cf17c238eb08ecc531870d66db202269 +Reviewed-by: Eirik Aavitsland +--- + src/assistant/assistant/helpviewer.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h +index fa954cc9f..acd38c66e 100644 +--- a/src/assistant/assistant/helpviewer.h ++++ b/src/assistant/assistant/helpviewer.h +@@ -130,7 +130,9 @@ protected: + void wheelEvent(QWheelEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; ++#if defined(BROWSER_QTEXTBROWSER) + void resizeEvent(QResizeEvent *e) override; ++#endif + + private slots: + void actionChanged(); +-- +cgit v1.2.1 + diff --git a/desktop/toolkit/qt5/qt5-tools/pspec.xml b/desktop/toolkit/qt5/qt5-tools/pspec.xml index 33f238f273..2d2cb5030c 100755 --- a/desktop/toolkit/qt5/qt5-tools/pspec.xml +++ b/desktop/toolkit/qt5/qt5-tools/pspec.xml @@ -11,15 +11,18 @@ 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.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz llvm mesa-devel llvm-clang-devel - qt5-base-devel + qt5-base-devel icon-theme-hicolor - qt5-declarative-devel + qt5-declarative-devel + + + @@ -28,8 +31,8 @@ libgcc llvm-libs llvm-clang - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/bin/qdistancefieldgenerator @@ -66,7 +69,7 @@ qt5-assistant-devel - qt5-base-devel + qt5-base-devel qt5-assistant llvm-clang-devel @@ -82,8 +85,8 @@ qt5-designer libgcc - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/bin/designer @@ -182,6 +185,13 @@ + + 2020-09-09 + 5.15.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.14.2 diff --git a/desktop/toolkit/qt5/qt5-wayland/pspec.xml b/desktop/toolkit/qt5/qt5-wayland/pspec.xml index 617a83b052..5c03b92045 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.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz + http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwayland-everywhere-src-5.15.1.tar.xz libgcc libX11-devel @@ -27,8 +27,8 @@ mesa-devel glib2-devel freetype-devel - qt5-base-devel - qt5-declarative-devel + qt5-base-devel + qt5-declarative-devel @@ -55,8 +55,8 @@ mesa glib2 freetype - qt5-base - qt5-declarative + qt5-base + qt5-declarative /usr/lib @@ -70,7 +70,7 @@ qt5-wayland-devel qt5-wayland - qt5-base-devel + qt5-base-devel /usr/lib/pkgconfig @@ -81,7 +81,7 @@ qt5-wayland-docs - qt5-base + qt5-base /usr/share/doc @@ -89,6 +89,13 @@ + + 2020-09-09 + 5.15.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-04 5.14.2