From 69906e0d132cfbd732343d0f60f6de868404b9d3 Mon Sep 17 00:00:00 2001 From: "Liszt.Kao" Date: Mon, 11 Jan 2021 15:24:04 +0800 Subject: [PATCH] [RSB4680]Change QT version to 5.11.3. --- package/qt5/qt5.mk | 10 +- package/qt5/qt53d/qt53d.hash | 11 +- package/qt5/qt53d/qt53d.mk | 2 +- package/qt5/qt5base/qt5base.hash | 11 +- package/qt5/qt5base/qt5base.mk | 2 +- package/qt5/qt5canvas3d/qt5canvas3d.hash | 11 +- package/qt5/qt5canvas3d/qt5canvas3d.mk | 2 +- package/qt5/qt5charts/qt5charts.hash | 7 +- package/qt5/qt5charts/qt5charts.mk | 2 +- .../qt5/qt5connectivity/qt5connectivity.hash | 11 +- .../qt5/qt5connectivity/qt5connectivity.mk | 2 +- .../qt5/qt5declarative/qt5declarative.hash | 11 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5enginio/qt5enginio.hash | 4 +- package/qt5/qt5enginio/qt5enginio.mk | 2 +- .../qt5graphicaleffects.hash | 11 +- .../qt5graphicaleffects.mk | 2 +- .../qt5/qt5imageformats/qt5imageformats.hash | 11 +- .../qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5location/qt5location.hash | 11 +- package/qt5/qt5location/qt5location.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 11 +- package/qt5/qt5multimedia/qt5multimedia.mk | 14 +- .../qt5quickcontrols/qt5quickcontrols.hash | 11 +- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- .../qt5quickcontrols2/qt5quickcontrols2.hash | 11 +- .../qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- package/qt5/qt5script/qt5script.hash | 11 +- package/qt5/qt5script/qt5script.mk | 2 +- package/qt5/qt5scxml/qt5scxml.hash | 7 +- package/qt5/qt5scxml/qt5scxml.mk | 2 +- package/qt5/qt5sensors/qt5sensors.hash | 11 +- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialbus/qt5serialbus.hash | 11 +- package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- package/qt5/qt5serialport/qt5serialport.hash | 11 +- package/qt5/qt5serialport/qt5serialport.mk | 2 +- package/qt5/qt5svg/qt5svg.hash | 11 +- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5tools/qt5tools.hash | 11 +- package/qt5/qt5tools/qt5tools.mk | 2 +- .../qt5virtualkeyboard.hash | 7 +- .../qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- ...-minimize-fullscreen-in-xdg_shell_v6.patch | 148 ------------------ ...qt_wayland_src_client_qwaylandscreen.patch | 16 -- ...Clear-current-surface-before-destroy.patch | 35 ----- package/qt5/qt5wayland/qt5wayland.hash | 11 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- package/qt5/qt5webchannel/qt5webchannel.hash | 11 +- package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- package/qt5/qt5webengine/qt5webengine.hash | 11 +- package/qt5/qt5webengine/qt5webengine.mk | 2 +- .../qt5webkit-examples.hash | 8 +- .../qt5webkit-examples/qt5webkit-examples.mk | 2 +- package/qt5/qt5webkit/qt5webkit.hash | 8 +- package/qt5/qt5webkit/qt5webkit.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 11 +- package/qt5/qt5websockets/qt5websockets.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.hash | 11 +- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 11 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- package/rockchip/Config.in | 4 +- 72 files changed, 231 insertions(+), 346 deletions(-) delete mode 100644 package/qt5/qt5wayland/0001-Handle-maximize-minimize-fullscreen-in-xdg_shell_v6.patch delete mode 100644 package/qt5/qt5wayland/0002_qt_wayland_src_client_qwaylandscreen.patch delete mode 100644 package/qt5/qt5wayland/0003-qwaylandwindow-Clear-current-surface-before-destroy.patch diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 3c03c100..4ffe4574 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,14 +5,16 @@ ################################################################################ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5_VERSION_MAJOR = 5.9 -QT5_VERSION = $(QT5_VERSION_MAJOR).4 +#QT5_VERSION_MAJOR = 5.9 +#QT5_VERSION = $(QT5_VERSION_MAJOR).4 +QT5_VERSION_MAJOR = 5.11 +QT5_VERSION = $(QT5_VERSION_MAJOR).3 else QT5_VERSION_MAJOR = 5.6 QT5_VERSION = $(QT5_VERSION_MAJOR).3 endif -QT5_SITE = https://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules - +#QT5_SITE = https://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SITE = http://download.qt.io/new_archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk)) define QT5_LA_PRL_FILES_FIXUP diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 9d629eb5..474d128e 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qt3d-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 ad18b1c98a100025a96d600008c9478f646432c9e8cf11fb9a405c55f1970550 qt3d-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qt3d-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 ad18b1c98a100025a96d600008c9478f646432c9e8cf11fb9a405c55f1970550 qt3d-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz.sha256 +sha256 04a55c21f365d897ec75042ee83f9ad59a847992c6f55fae0763ad2701d99eab qt3d-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index fcb743db..e80c7366 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -6,7 +6,7 @@ QT53D_VERSION = $(QT5_VERSION) QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-opensource-src-$(QT53D_VERSION).tar.xz +QT53D_SOURCE = qt3d-everywhere-src-$(QT53D_VERSION).tar.xz QT53D_DEPENDENCIES = qt5base qt5declarative QT53D_INSTALL_STAGING = YES diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index a72d8cd4..3ef2c14e 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 69e6bde3ab00673a77e1506173551fec7d0cd899fcbf9b1260517db1b61004cf qtbase-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtbase-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 69e6bde3ab00673a77e1506173551fec7d0cd899fcbf9b1260517db1b61004cf qtbase-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz.sha256 +sha256 c6bf887732b83ce072eb72eddb7497bedcdf9ca794e7ed91261a93f063623e1c qtbase-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 26bec042..8616d8d7 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -6,7 +6,7 @@ QT5BASE_VERSION = $(QT5_VERSION) QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz +QT5BASE_SOURCE = qtbase-everywhere-src-$(QT5BASE_VERSION).tar.xz QT5BASE_DEPENDENCIES = host-pkgconf zlib QT5BASE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 68d1691d..a532a357 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcanvas3d-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 ef358503e2f243c2e162c3fef2181707ff3485376198d8e4fcc6d979e6ebed29 qtcanvas3d-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcanvas3d-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 ef358503e2f243c2e162c3fef2181707ff3485376198d8e4fcc6d979e6ebed29 qtcanvas3d-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz.sha256 +sha256 d5a004848588c1c53ea7ed9d36bb5bfe3a813ffc45290066d2f6cfcace072138 qtcanvas3d-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk index 97b0ec49..10520277 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.mk +++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk @@ -6,7 +6,7 @@ QT5CANVAS3D_VERSION = $(QT5_VERSION) QT5CANVAS3D_SITE = $(QT5_SITE) -QT5CANVAS3D_SOURCE = qtcanvas3d-opensource-src-$(QT5CANVAS3D_VERSION).tar.xz +QT5CANVAS3D_SOURCE = qtcanvas3d-everywhere-src-$(QT5CANVAS3D_VERSION).tar.xz QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative QT5CANVAS3D_INSTALL_STAGING = YES diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index a0c2d0d7..7cccdcbf 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcharts-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 75f72983fde6720a093d5f065d33f47e77a4bd2188ae9d41ebb9a4fcc459d3e7 qtcharts-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtcharts-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 75f72983fde6720a093d5f065d33f47e77a4bd2188ae9d41ebb9a4fcc459d3e7 qtcharts-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz.sha256 +sha256 4798f3ebc4d937d1c190db7ff718ad5affa907caa56b5557e593f6b5a60d95dc qtcharts-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 17fdd967..f8345685 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -6,7 +6,7 @@ QT5CHARTS_VERSION = $(QT5_VERSION) QT5CHARTS_SITE = $(QT5_SITE) -QT5CHARTS_SOURCE = qtcharts-opensource-src-$(QT5CHARTS_VERSION).tar.xz +QT5CHARTS_SOURCE = qtcharts-everywhere-src-$(QT5CHARTS_VERSION).tar.xz QT5CHARTS_DEPENDENCIES = qt5base QT5CHARTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 21d0ded4..f49ad21f 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtconnectivity-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 dba750363bf55648a08bc44372f423d31f405f6deac5393f0b76376a3e9e0c8b qtconnectivity-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtconnectivity-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 dba750363bf55648a08bc44372f423d31f405f6deac5393f0b76376a3e9e0c8b qtconnectivity-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz.sha256 +sha256 148cfcbceb3d0a70059f4d92fa069baf56babb627b16a4203b318ca6f0d0b32a qtconnectivity-everywhere-src-5.11.3.tar.xz diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 4369a411..857dbe3d 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -6,7 +6,7 @@ QT5CONNECTIVITY_VERSION = $(QT5_VERSION) QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION).tar.xz +QT5CONNECTIVITY_SOURCE = qtconnectivity-everywhere-src-$(QT5CONNECTIVITY_VERSION).tar.xz QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 308a4f0f..f3cb71fd 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdeclarative-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 dc638a3b207dd2c6607a21415f6dd8d760568535dfe4b485fdb4576c98832d65 qtdeclarative-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtdeclarative-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 dc638a3b207dd2c6607a21415f6dd8d760568535dfe4b485fdb4576c98832d65 qtdeclarative-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz.sha256 +sha256 8e263621d706f1c4def5d71212a6ae37b0d3c378da89d9e3e5fc0b5557721ae6 qtdeclarative-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index de8b0483..1b689195 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -6,7 +6,7 @@ QT5DECLARATIVE_VERSION = $(QT5_VERSION) QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).tar.xz +QT5DECLARATIVE_SOURCE = qtdeclarative-everywhere-src-$(QT5DECLARATIVE_VERSION).tar.xz QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash index 424c4776..23552747 100644 --- a/package/qt5/qt5enginio/qt5enginio.hash +++ b/package/qt5/qt5enginio/qt5enginio.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtenginio-opensource-src-1.6.3.tar.xz.mirrorlist -sha256 d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912 qtenginio-opensource-src-1.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtenginio-everywhere-src-1.6.3.tar.xz.mirrorlist +sha256 d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912 qtenginio-everywhere-src-1.6.3.tar.xz # Hashes for license files: sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk index 603b2a51..9587384d 100644 --- a/package/qt5/qt5enginio/qt5enginio.mk +++ b/package/qt5/qt5enginio/qt5enginio.mk @@ -8,7 +8,7 @@ # see https://bugreports.qt.io/browse/QTBUG-50111 QT5ENGINIO_VERSION = 1.6.3 QT5ENGINIO_SITE = $(QT5_SITE) -QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz +QT5ENGINIO_SOURCE = qtenginio-everywhere-src-$(QT5ENGINIO_VERSION).tar.xz QT5ENGINIO_DEPENDENCIES = openssl qt5base QT5ENGINIO_INSTALL_STAGING = YES diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 9a1bbdac..89e90b97 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtgraphicaleffects-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 97f75327d7d20ec02e920f1c86ee2bc4063396833d93215e509e95c58e24b8ef qtgraphicaleffects-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtgraphicaleffects-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 97f75327d7d20ec02e920f1c86ee2bc4063396833d93215e509e95c58e24b8ef qtgraphicaleffects-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz.sha256 +sha256 14d86983fcdd119daefad235ffee7d8ca691e6074ef360cb6347b8aae66f57e2 qtgraphicaleffects-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index 2f6380f7..8ec646f5 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -6,7 +6,7 @@ QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-everywhere-src-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 37d0519e..43f251af 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtimageformats-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 69e17081a8649b7db138073942d07d2e99f78f4b954ccd6aab3a406e92dbddd9 qtimageformats-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtimageformats-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 69e17081a8649b7db138073942d07d2e99f78f4b954ccd6aab3a406e92dbddd9 qtimageformats-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz.sha256 +sha256 04b261bc3d7a277fbe9ac8619ecd037d7089b356eaee41b2d41d7a2ff58b087f qtimageformats-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index f70f131d..fb0f9184 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -6,7 +6,7 @@ QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_SOURCE = qtimageformats-everywhere-src-$(QT5IMAGEFORMATS_VERSION).tar.xz QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 3f9ba667..ffd7ab57 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 37ed68b0243a30b836cda79802e3f33404b1792f7b845a25b2e4989dc2fed2a0 qtlocation-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtlocation-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 37ed68b0243a30b836cda79802e3f33404b1792f7b845a25b2e4989dc2fed2a0 qtlocation-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz.sha256 +sha256 58e498a5b496e3a38925398b244bbd57ba68cbb482f2a0d2ae51572e037100eb qtlocation-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index e9f1e4d9..212816d9 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -6,7 +6,7 @@ QT5LOCATION_VERSION = $(QT5_VERSION) QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz +QT5LOCATION_SOURCE = qtlocation-everywhere-src-$(QT5LOCATION_VERSION).tar.xz QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 5cb25379..2f6a8253 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtmultimedia-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 4952a00712e209ad34241b22cb338bad2f44c42a77316b3b05389faeee1e4e74 qtmultimedia-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtmultimedia-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 4952a00712e209ad34241b22cb338bad2f44c42a77316b3b05389faeee1e4e74 qtmultimedia-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz.sha256 +sha256 728078eff7dc21495d704a7cd17c604d74604604b45a3c58271608f90dea3c41 qtmultimedia-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 041ef490..f70ed854 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -6,7 +6,7 @@ QT5MULTIMEDIA_VERSION = $(QT5_VERSION) QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz +QT5MULTIMEDIA_SOURCE = qtmultimedia-everywhere-src-$(QT5MULTIMEDIA_VERSION).tar.xz QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES @@ -41,8 +41,12 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx) QT5MULTIMEDIA_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS endif +ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) +QT5MULTIMEDIA_DEPENDENCIES += gst-plugins-base +endif +#(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5MULTIMEDIA_QMAKEFLAGS)) define QT5MULTIMEDIA_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5MULTIMEDIA_QMAKEFLAGS)) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake) endef define QT5MULTIMEDIA_BUILD_CMDS @@ -53,18 +57,18 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(QT5_LA_PRL_FILES_FIXUP) endef - +#cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib ifeq ($(BR2_STATIC_LIBS),) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB - cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib + cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib endef endif define QT5MULTIMEDIA_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) + #$(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) endef endif diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index ca1e217d..b9e88a5a 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 16a205a09bfe9d54c38e9ef555e6f1ecd082576ef2a33cb80b6d49a7ccaed98b qtquickcontrols-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 16a205a09bfe9d54c38e9ef555e6f1ecd082576ef2a33cb80b6d49a7ccaed98b qtquickcontrols-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz.sha256 +sha256 4e4e5da02ab0b06d35b09356170013cfe36a773d15f92281f7e6d085c3f07537 qtquickcontrols-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 88e767bc..37dfdf82 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -6,7 +6,7 @@ QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-everywhere-src-$(QT5QUICKCONTROLS_VERSION).tar.xz QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative QT5QUICKCONTROLS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 15f23b5e..80d74aa7 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols2-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 1528a7a356e7073f5eeca93ba6e3330ba708d31c3a8f10dc1ce4546d9557640c qtquickcontrols2-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtquickcontrols2-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 1528a7a356e7073f5eeca93ba6e3330ba708d31c3a8f10dc1ce4546d9557640c qtquickcontrols2-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz.sha256 +sha256 f45630b652585b62204405b28432977e67c148ca5f1789a794654fd6c1bad086 qtquickcontrols2-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index f27cafc6..47dc3e79 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -6,7 +6,7 @@ QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_VERSION).tar.xz +QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-everywhere-src-$(QT5QUICKCONTROLS2_VERSION).tar.xz QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative QT5QUICKCONTROLS2_INSTALL_STAGING = YES diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index bcb37801..54008d09 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscript-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 4045da078600b5928f8206341c442cc7f5eec8c51f477f7367072ab5c28ee053 qtscript-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscript-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 4045da078600b5928f8206341c442cc7f5eec8c51f477f7367072ab5c28ee053 qtscript-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz.sha256 +sha256 bb84f3cc581078df4ff76705c5623cd88287f70f7405cbccf99e6fb6dedbec08 qtscript-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index b6c02d0d..3afbb7b8 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -6,7 +6,7 @@ QT5SCRIPT_VERSION = $(QT5_VERSION) QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz +QT5SCRIPT_SOURCE = qtscript-everywhere-src-$(QT5SCRIPT_VERSION).tar.xz QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index dbe81ecb..8de04b36 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscxml-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 1decc54e157a1492066fe0e7d534c6a9888c096731af7cac9b64c52fd3950b75 qtscxml-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtscxml-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 1decc54e157a1492066fe0e7d534c6a9888c096731af7cac9b64c52fd3950b75 qtscxml-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz.sha256 +sha256 13172767eda404f1b71ab35998a95af6633d700d2417fff3648d8c6dc6af68d7 qtscxml-everywhere-src-5.11.3.tar.xz # Hashes for license files: diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index 2d197a2b..c87d10a8 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -6,7 +6,7 @@ QT5SCXML_VERSION = $(QT5_VERSION) QT5SCXML_SITE = $(QT5_SITE) -QT5SCXML_SOURCE = qtscxml-opensource-src-$(QT5SCXML_VERSION).tar.xz +QT5SCXML_SOURCE = qtscxml-everywhere-src-$(QT5SCXML_VERSION).tar.xz QT5SCXML_DEPENDENCIES = qt5base qt5declarative QT5SCXML_INSTALL_STAGING = YES diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 1a78d467..a545b770 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsensors-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 793f3aa056b7ce9ae91acb599eab80525983e5e973bb4a2fdba82776ec9cd458 qtsensors-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsensors-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 793f3aa056b7ce9ae91acb599eab80525983e5e973bb4a2fdba82776ec9cd458 qtsensors-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz.sha256 +sha256 a75753d1d5607d4cb27b1849ea9612a65bb3a5271bb31bf0817edd143b620859 qtsensors-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index d4dc47e8..64f9841a 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -6,7 +6,7 @@ QT5SENSORS_VERSION = $(QT5_VERSION) QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_SOURCE = qtsensors-everywhere-src-$(QT5SENSORS_VERSION).tar.xz QT5SENSORS_DEPENDENCIES = qt5base QT5SENSORS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 005fd0b5..72432e4b 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialbus-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 ce91402e9781ef6ff37e313ce504b7f6fecb74e83d57d640fcbf82f1133fcbc4 qtserialbus-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialbus-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 ce91402e9781ef6ff37e313ce504b7f6fecb74e83d57d640fcbf82f1133fcbc4 qtserialbus-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz.sha256 +sha256 5664def35d4ad4aedef14bc529679851450262ea81477a69031ba81aa614c16d qtserialbus-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index 218aba4e..01db7625 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -6,7 +6,7 @@ QT5SERIALBUS_VERSION = $(QT5_VERSION) QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz +QT5SERIALBUS_SOURCE = qtserialbus-everywhere-src-$(QT5SERIALBUS_VERSION).tar.xz QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport QT5SERIALBUS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 04122ef8..ff7f7541 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialport-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 0c3d8e2908743c167113ce27be7b685e6f5c827c108107411d0c4c8b2f2b519c qtserialport-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtserialport-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 0c3d8e2908743c167113ce27be7b685e6f5c827c108107411d0c4c8b2f2b519c qtserialport-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz.mirrorlist +sha256 96c45e6d0d470626815f82b38ee48bf941e1bbfc10863087b69cc5f7bb766bda qtserialport-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 479870b1..f62ac994 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -6,7 +6,7 @@ QT5SERIALPORT_VERSION = $(QT5_VERSION) QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_SOURCE = qtserialport-everywhere-src-$(QT5SERIALPORT_VERSION).tar.xz QT5SERIALPORT_DEPENDENCIES = qt5base QT5SERIALPORT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index a94082c4..be31d44c 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsvg-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 a2f22732bfd4f0f0204443daaa59448298ab5018750dce4600d01d969355037a qtsvg-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtsvg-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 a2f22732bfd4f0f0204443daaa59448298ab5018750dce4600d01d969355037a qtsvg-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz.sha256 +sha256 21ea2c9c4e78101e98163bc19e463b8d8cdffa20e1ccd523ccc925b9f2cd4491 qtsvg-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 5a12755f..8c5c7e0f 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -6,7 +6,7 @@ QT5SVG_VERSION = $(QT5_VERSION) QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz +QT5SVG_SOURCE = qtsvg-everywhere-src-$(QT5SVG_VERSION).tar.xz QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 40176e6a..a773f32c 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 95aa5782d5a79be22fba36cea4dc2319cf2a2060a3cc1e24e6585b8d98996e87 qttools-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qttools-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 95aa5782d5a79be22fba36cea4dc2319cf2a2060a3cc1e24e6585b8d98996e87 qttools-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz.sha256 +sha256 c205e81bba9b87c6186604a05ab48e4e6cac0cd511525749dfd00b107b6f9f8e qttools-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index cf181e57..db8f3c3e 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -6,7 +6,7 @@ QT5TOOLS_VERSION = $(QT5_VERSION) QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-opensource-src-$(QT5TOOLS_VERSION).tar.xz +QT5TOOLS_SOURCE = qttools-everywhere-src-$(QT5TOOLS_VERSION).tar.xz QT5TOOLS_DEPENDENCIES = qt5base QT5TOOLS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 81c81edf..def25e03 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,8 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtvirtualkeyboard-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 bf742a886054f12a73621952879cf7a2182304c498bc31ec8a61ef376b07e1ee qtvirtualkeyboard-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtvirtualkeyboard-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 bf742a886054f12a73621952879cf7a2182304c498bc31ec8a61ef376b07e1ee qtvirtualkeyboard-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz.sha256 +sha256 8c5c40245a9dd2e9e504ce2d47d45079d8280436146797b24b8115ef163b4b9e qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 7d2201b5..04105858 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -6,7 +6,7 @@ QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION) QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE) -QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-opensource-src-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz +QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-everywhere-src-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES diff --git a/package/qt5/qt5wayland/0001-Handle-maximize-minimize-fullscreen-in-xdg_shell_v6.patch b/package/qt5/qt5wayland/0001-Handle-maximize-minimize-fullscreen-in-xdg_shell_v6.patch deleted file mode 100644 index 17a26463..00000000 --- a/package/qt5/qt5wayland/0001-Handle-maximize-minimize-fullscreen-in-xdg_shell_v6.patch +++ /dev/null @@ -1,148 +0,0 @@ -From a91582b1cb8fbcb3c1ed076e071dc9662c5cbb1d Mon Sep 17 00:00:00 2001 -From: Giulio Camuffo -Date: Sat, 1 Jul 2017 09:53:07 +0200 -Subject: [PATCH] Handle maximize/minimize/fullscreen in xdg_shell_v6 - -Change-Id: I385eb3279d91f1c38d2f5d46bc63b324f0456ca4 ---- - src/client/qwaylandwindow.cpp | 6 +++- - src/client/qwaylandxdgshellv6.cpp | 61 ++++++++++++++++++++++++++++++++++++--- - src/client/qwaylandxdgshellv6_p.h | 8 ++++- - 3 files changed, 69 insertions(+), 6 deletions(-) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index cac92a7..808aea9 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -971,7 +971,11 @@ bool QWaylandWindow::setWindowStateInternal(Qt::WindowStates state) - // As of february 2013 QWindow::setWindowState sets the new state value after - // QPlatformWindow::setWindowState returns, so we cannot rely on QWindow::windowState - // here. We use then this mState variable. -- mState = state; -+ // NOTE: The compositor does not tell us when the window is not minimized anymore, -+ // so we store the state except for the WindowMinimized value, to make sure that -+ // the equality check above does not return true when setWindowState(Qt::WindowMinimized) -+ // is called, even though the window is actually not minimized anymore. -+ mState = (Qt::WindowState)((int)state | (state & !Qt::WindowMinimized)); - - if (mShellSurface) { - createDecoration(); -diff --git a/src/client/qwaylandxdgshellv6.cpp b/src/client/qwaylandxdgshellv6.cpp -index cd81778..5ace219 100644 ---- a/src/client/qwaylandxdgshellv6.cpp -+++ b/src/client/qwaylandxdgshellv6.cpp -@@ -56,6 +56,8 @@ QWaylandXdgSurfaceV6::Toplevel::Toplevel(QWaylandXdgSurfaceV6 *xdgSurface) - : QtWayland::zxdg_toplevel_v6(xdgSurface->get_toplevel()) - , m_xdgSurface(xdgSurface) - { -+ m_configureState.fullscreen = false; -+ m_configureState.maximized = false; - } - - QWaylandXdgSurfaceV6::Toplevel::~Toplevel() -@@ -75,13 +77,35 @@ void QWaylandXdgSurfaceV6::Toplevel::zxdg_toplevel_v6_configure(int32_t width, i - m_configureState.width = width; - m_configureState.height = height; - -+ bool wasMaximized = m_configureState.maximized; -+ bool wasFullscreen = m_configureState.fullscreen; -+ - uint32_t *state = reinterpret_cast(states->data); - size_t numStates = states->size / sizeof(uint32_t); -- m_configureState.states.reserve(numStates); -- m_configureState.states.clear(); - -- for (size_t i = 0; i < numStates; i++) -- m_configureState.states << state[i]; -+ m_configureState.fullscreen = false; -+ m_configureState.maximized = false; -+ -+ for (size_t i = 0; i < numStates; i++) { -+ switch (state[i]) { -+ case ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED: -+ m_configureState.maximized = true; -+ break; -+ case ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN: -+ m_configureState.fullscreen = true; -+ break; -+ default: -+ break; -+ } -+ } -+ -+ if ((!wasMaximized && m_configureState.maximized) || (!wasFullscreen && m_configureState.fullscreen)) -+ m_normalSize = m_xdgSurface->m_window->window()->frameGeometry().size(); -+ -+ if ((width == 0 || height == 0) && !m_normalSize.isEmpty()) { -+ m_configureState.width = m_normalSize.width(); -+ m_configureState.height = m_normalSize.height(); -+ } - } - - void QWaylandXdgSurfaceV6::Toplevel::zxdg_toplevel_v6_close() -@@ -229,6 +253,35 @@ void QWaylandXdgSurfaceV6::zxdg_surface_v6_configure(uint32_t serial) - ack_configure(serial); - } - -+void QWaylandXdgSurfaceV6::setMaximized() -+{ -+ if (m_toplevel) -+ m_toplevel->set_maximized(); -+} -+ -+void QWaylandXdgSurfaceV6::setFullscreen() -+{ -+ if (m_toplevel) -+ m_toplevel->set_fullscreen(nullptr); -+} -+ -+void QWaylandXdgSurfaceV6::setNormal() -+{ -+ if (!m_toplevel) -+ return; -+ -+ if (m_toplevel->m_configureState.maximized) -+ m_toplevel->unset_maximized(); -+ if (m_toplevel->m_configureState.fullscreen) -+ m_toplevel->unset_fullscreen(); -+} -+ -+void QWaylandXdgSurfaceV6::setMinimized() -+{ -+ if (m_toplevel) -+ m_toplevel->set_minimized(); -+} -+ - - - QWaylandXdgShellV6::QWaylandXdgShellV6(struct ::wl_registry *registry, uint32_t id, uint32_t availableVersion) -diff --git a/src/client/qwaylandxdgshellv6_p.h b/src/client/qwaylandxdgshellv6_p.h -index 769f198..1acd8e0 100644 ---- a/src/client/qwaylandxdgshellv6_p.h -+++ b/src/client/qwaylandxdgshellv6_p.h -@@ -88,6 +88,10 @@ public: - - protected: - void zxdg_surface_v6_configure(uint32_t serial) override; -+ void setMaximized() override; -+ void setFullscreen() override; -+ void setNormal() override; -+ void setMinimized() override; - - private: - class Toplevel: public QtWayland::zxdg_toplevel_v6 -@@ -103,8 +107,10 @@ private: - - struct { - int32_t width, height; -- QVarLengthArray states; -+ bool maximized; -+ bool fullscreen; - } m_configureState; -+ QSize m_normalSize; - - QWaylandXdgSurfaceV6 *m_xdgSurface; - }; --- -1.9.1 - diff --git a/package/qt5/qt5wayland/0002_qt_wayland_src_client_qwaylandscreen.patch b/package/qt5/qt5wayland/0002_qt_wayland_src_client_qwaylandscreen.patch deleted file mode 100644 index 79975a40..00000000 --- a/package/qt5/qt5wayland/0002_qt_wayland_src_client_qwaylandscreen.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp -index ac59545..dc56ad5 100755 ---- a/src/client/qwaylandscreen.cpp -+++ b/src/client/qwaylandscreen.cpp -@@ -180,6 +180,11 @@ void QWaylandScreen::output_mode(uint32_t flags, int width, int height, int refr - if (!(flags & WL_OUTPUT_MODE_CURRENT)) - return; - -+ char *_displaysize = getenv("WAYLAND_FAKE_UI_SIZE"); -+ if (_displaysize != NULL) { -+ sscanf(_displaysize, "%dx%d@%d", &width, &height, &refresh); -+ } -+ - QSize size(width, height); - - if (size != mGeometry.size()) diff --git a/package/qt5/qt5wayland/0003-qwaylandwindow-Clear-current-surface-before-destroy.patch b/package/qt5/qt5wayland/0003-qwaylandwindow-Clear-current-surface-before-destroy.patch deleted file mode 100644 index 719c566a..00000000 --- a/package/qt5/qt5wayland/0003-qwaylandwindow-Clear-current-surface-before-destroy.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 443c7472a74dfe4ad6594b8562c9a554b5d9cfde Mon Sep 17 00:00:00 2001 -From: Jeffy Chen -Date: Wed, 6 Jun 2018 21:30:26 +0800 -Subject: [PATCH] qwaylandwindow: Clear current surface before destroy - -Signed-off-by: Jeffy Chen ---- - src/client/qwaylandwindow.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp -index 5908c1d..6d383a0 100644 ---- a/src/client/qwaylandwindow.cpp -+++ b/src/client/qwaylandwindow.cpp -@@ -246,8 +246,16 @@ void QWaylandWindow::reset() - mShellSurface = 0; - delete mSubSurfaceWindow; - mSubSurfaceWindow = 0; -- if (isInitialized()) -+ if (isInitialized()) { -+#ifndef QT_NO_OPENGL -+ QOpenGLContext *context = QOpenGLContext::currentContext(); -+ if (context && context->surface() == surface()) -+ context->doneCurrent(); -+#endif -+ invalidateSurface(); -+ - destroy(); -+ } - - if (mFrameCallback) - wl_callback_destroy(mFrameCallback); --- -2.11.0 - diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 86dc6517..f56ef37d 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,11 @@ -# hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz +# hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwayland-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 3f7496522013e6122bb8dc00d0c3cc7753a44dca94fa3b22096eaa21e6099874 qtwayland-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwayland-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 3f7496522013e6122bb8dc00d0c3cc7753a44dca94fa3b22096eaa21e6099874 qtwayland-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz.sha256 +sha256 62c94f29e461c849e479f39d21577b0c72f0f084250e126021edcf0719271fb2 qtwayland-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index 8a7f2e1f..3532939b 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -6,7 +6,7 @@ QT5WAYLAND_VERSION = $(QT5_VERSION) QT5WAYLAND_SITE = $(QT5_SITE) -QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_SOURCE = qtwayland-everywhere-src-$(QT5WAYLAND_VERSION).tar.xz QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland QT5WAYLAND_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index f1b69438..7af9eeab 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebchannel-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 90303a72da63f250b6d6731b74827b0a1764904aac790a7264a3f65c94039aa9 qtwebchannel-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebchannel-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 90303a72da63f250b6d6731b74827b0a1764904aac790a7264a3f65c94039aa9 qtwebchannel-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz.sha256 +sha256 3c254fa41b1af09c1e951131f3a1336dee70a15cbb8a82112488b38d29572df3 qtwebchannel-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index d46e053a..18029be0 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -6,7 +6,7 @@ QT5WEBCHANNEL_VERSION = $(QT5_VERSION) QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-opensource-src-$(QT5WEBCHANNEL_VERSION).tar.xz +QT5WEBCHANNEL_SOURCE = qtwebchannel-everywhere-src-$(QT5WEBCHANNEL_VERSION).tar.xz QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 9195c7f3..1dc24bd4 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,8 @@ -# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz +# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebengine-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 04b4305489b326bbbfe32b5f1da4a33ae034e54130776e3616b9e6d45a5a8271 qtwebengine-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebengine-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 04b4305489b326bbbfe32b5f1da4a33ae034e54130776e3616b9e6d45a5a8271 qtwebengine-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz.sha256 +sha256 5bb49ead71b851db4dc56f8fd97e0db72a268b22104129a06bac201d55d3b8fe qtwebengine-everywhere-src-5.11.3.tar.xz diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index 4d423f83..e3a542d6 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -6,7 +6,7 @@ QT5WEBENGINE_VERSION = $(QT5_VERSION) QT5WEBENGINE_SITE = $(QT5_SITE) -QT5WEBENGINE_SOURCE = qtwebengine-opensource-src-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_SOURCE = qtwebengine-everywhere-src-$(QT5WEBENGINE_VERSION).tar.xz QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp qt5base \ qt5declarative qt5webchannel host-bison host-flex host-gperf \ host-pkgconf host-python diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash index 6e4c090f..6f1978a5 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-examples-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-examples-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-everywhere-src-5.9.1.tar.xz.mirrorlist +sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-everywhere-src-5.9.1.tar.xz diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index 4c01d831..237feebf 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -13,7 +13,7 @@ QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION) QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION) endif -QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-everywhere-src-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5base qt5webkit QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3 diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 57ff2ac1..4544f7ba 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,8 +1,8 @@ -# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896 qtwebkit-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896 qtwebkit-everywhere-src-5.6.3.tar.xz -# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist -sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz +# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-everywhere-src-5.9.1.tar.xz.mirrorlist +sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-everywhere-src-5.9.1.tar.xz # Hashes for license files: sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2 diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 51866716..45bf05cf 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -13,7 +13,7 @@ QT5WEBKIT_VERSION = $(QT5_VERSION) QT5WEBKIT_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION) endif -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz +QT5WEBKIT_SOURCE = qtwebkit-everywhere-src-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ host-bison host-flex host-gperf host-python host-ruby \ qt5base sqlite diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 368be9b4..cfb93406 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebsockets-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 72970209f0d4260d11688d3d38d9e953d7fa4309a8a55e2c32726a545333e800 qtwebsockets-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtwebsockets-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 72970209f0d4260d11688d3d38d9e953d7fa4309a8a55e2c32726a545333e800 qtwebsockets-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz.sha256 +sha256 021090c1a92f11fcf2914168741c1364235896793685b7fae2bc23e3dd55d5b9 qtwebsockets-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 4cb2aed1..f246d40d 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -6,7 +6,7 @@ QT5WEBSOCKETS_VERSION = $(QT5_VERSION) QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-opensource-src-$(QT5WEBSOCKETS_VERSION).tar.xz +QT5WEBSOCKETS_SOURCE = qtwebsockets-everywhere-src-$(QT5WEBSOCKETS_VERSION).tar.xz QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 943577bb..74a57c01 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtx11extras-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 879b18c44550e1be86c29adcca555c92915aab9222c40384beae2f7aa22b22a8 qtx11extras-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtx11extras-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 879b18c44550e1be86c29adcca555c92915aab9222c40384beae2f7aa22b22a8 qtx11extras-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz.mirrorlist +sha256 f99eebe685f7cdbb71cd62903c2b2511548345535841bcc3f6b662205815cd85 qtx11extras-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 0905d5f7..568b022d 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -6,7 +6,7 @@ QT5X11EXTRAS_VERSION = $(QT5_VERSION) QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_SOURCE = qtx11extras-everywhere-src-$(QT5X11EXTRAS_VERSION).tar.xz QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 9c68eae1..614f2ae5 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,8 +1,11 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-everywhere-src-5.6.3.tar.xz.mirrorlist +sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-everywhere-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtxmlpatterns-opensource-src-5.9.4.tar.xz.mirrorlist -sha256 faf51ad39e5c2b856b38989c79d69253ad74d4b8d3278d4aaa79d3c547047f79 qtxmlpatterns-opensource-src-5.9.4.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.4/submodules/qtxmlpatterns-everywhere-src-5.9.4.tar.xz.mirrorlist +sha256 faf51ad39e5c2b856b38989c79d69253ad74d4b8d3278d4aaa79d3c547047f79 qtxmlpatterns-everywhere-src-5.9.4.tar.xz + +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz.sha256 +sha256 8bd00be30722570d22382b99679d07787a2d62d4891d1c47d738d634e2db0eee qtxmlpatterns-everywhere-src-5.11.3.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 65fd9bd3..c4a0b351 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -6,7 +6,7 @@ QT5XMLPATTERNS_VERSION = $(QT5_VERSION) QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).tar.xz +QT5XMLPATTERNS_SOURCE = qtxmlpatterns-everywhere-src-$(QT5XMLPATTERNS_VERSION).tar.xz QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES diff --git a/package/rockchip/Config.in b/package/rockchip/Config.in index 7e943aa5..872b2a84 100644 --- a/package/rockchip/Config.in +++ b/package/rockchip/Config.in @@ -141,10 +141,10 @@ source "package/rockchip/rkupdate/Config.in" source "package/rockchip/io/Config.in" source "package/rockchip/music/Config.in" source "package/rockchip/video/Config.in" -source "package/rockchip/camera/Config.in" +#source "package/rockchip/camera/Config.in" source "package/rockchip/carmachine/Config.in" source "package/rockchip/gallery/Config.in" -source "package/rockchip/QLauncher/Config.in" +#source "package/rockchip/QLauncher/Config.in" source "package/rockchip/settings/Config.in" source "package/rockchip/powermanager/Config.in" source "package/rockchip/audioservice/Config.in" -- 2.25.0