qt5: switch to kde maintenance branches

This commit is contained in:
Jerome Duval
2021-04-08 22:21:02 +02:00
parent b02cb67137
commit c4b2045748
4 changed files with 89 additions and 12 deletions

View File

@@ -0,0 +1,25 @@
From 7179102e731fc751339678d33a705b045dae26c1 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 17 Nov 2020 11:07:30 +0100
Subject: Revert Bump version
Change-Id: I5697edf968dfaebe25c73899d26ed234631e55dc
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
---
.qmake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.qmake.conf b/.qmake.conf
index 1bf1a80..9476d20 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -6,4 +6,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS
QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD)
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.2
--
2.30.0

View File

@@ -0,0 +1,23 @@
From 568763928a78b52373932b01be17e040f7c3fa50 Mon Sep 17 00:00:00 2001
From: Jani Heikkinen <jani.heikkinen@qt.io>
Date: Tue, 27 Oct 2020 07:48:21 +0200
Subject: [PATCH] Revert Bump version
Change-Id: I58fee19a72cda6a19ba168f55caf764c73ffd1c8
---
.qmake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.qmake.conf b/.qmake.conf
index 85b893856b..4e82106546 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -4,4 +4,4 @@ CONFIG += warning_clean
DEFINES += QT_NO_LINKED_LIST
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.2
--
GitLab

View File

@@ -0,0 +1,23 @@
From 9aac88424a1b76e0198b52437af58a6d94aff8e9 Mon Sep 17 00:00:00 2001
From: Jani Heikkinen <jani.heikkinen@qt.io>
Date: Fri, 6 Nov 2020 11:28:20 +0200
Subject: [PATCH] Revert Bump version
Change-Id: Ic1028c7ee449c807933dfc0564052f778026fdea
---
.qmake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.qmake.conf b/.qmake.conf
index ba84e234..bbf484f4 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.2
--
GitLab

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2015-2020 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3
FDL"
REVISION="2"
REVISION="3"
baseURL="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules"
SOURCE_URI="https://github.com/qt/qt5/archive/$portVersion.tar.gz"
SOURCE_DIR="qt5-$portVersion"
@@ -22,10 +22,12 @@ SOURCE_DIR_02="qtactiveqt-everywhere-src-$portVersion"
SOURCE_URI_03="$baseURL/qtandroidextras-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_03="5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd"
SOURCE_DIR_03="qtandroidextras-everywhere-src-$portVersion"
SOURCE_URI_04="$baseURL/qtbase-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_04="909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8"
SOURCE_DIR_04="qtbase-everywhere-src-$portVersion"
PATCHES_04="qtbase-$portVersion.patchset"
gitCommit04="cb2da673f53815a5cfe15f50df49b98032429f9e"
SOURCE_URI_04="https://invent.kde.org/qt/qt/qtbase/-/archive/$gitCommit04/qtbase-$gitCommit04.tar.gz"
CHECKSUM_SHA256_04="8ee9a52f9f7b4ad0b655f288150dcec5357fb4f95253320e5b23781850716ff3"
SOURCE_DIR_04="qtbase-$gitCommit04"
PATCHES_04="qtbase-$portVersion.patchset
qtbase-5.15.2+kde.patchset"
SOURCE_URI_05="$baseURL/qtcharts-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_05="e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11"
SOURCE_DIR_05="qtcharts-everywhere-src-$portVersion"
@@ -35,10 +37,12 @@ SOURCE_DIR_06="qtconnectivity-everywhere-src-$portVersion"
SOURCE_URI_07="$baseURL/qtdatavis3d-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_07="226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd"
SOURCE_DIR_07="qtdatavis3d-everywhere-src-$portVersion"
SOURCE_URI_08="$baseURL/qtdeclarative-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_08="c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651"
SOURCE_DIR_08="qtdeclarative-everywhere-src-$portVersion"
PATCHES_08="qtdeclarative-$portVersion.patchset"
gitCommit08="e203a185cfab199a89a33b903096d6d0023a8a88"
SOURCE_URI_08="https://invent.kde.org/qt/qt/qtdeclarative/-/archive/$gitCommit08/qtdeclarative-$gitCommit08.tar.gz"
CHECKSUM_SHA256_08="4ff77a056e47bd3b1d81dbf7b2e3e5be56fd5be1214313baa71353ba6868d132"
SOURCE_DIR_08="qtdeclarative-$gitCommit08"
PATCHES_08="qtdeclarative-$portVersion.patchset
qtdeclarative-5.15.2+kde.patchset"
SOURCE_URI_09="$baseURL/qtdoc-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_09="a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4"
SOURCE_DIR_09="qtdoc-everywhere-src-$portVersion"
@@ -104,9 +108,11 @@ PATCHES_28="qtserialport-$portVersion.patchset"
SOURCE_URI_29="$baseURL/qtspeech-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_29="c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5"
SOURCE_DIR_29="qtspeech-everywhere-src-$portVersion"
SOURCE_URI_30="$baseURL/qtsvg-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_30="8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e"
SOURCE_DIR_30="qtsvg-everywhere-src-$portVersion"
gitCommit30="95990cbeebc0ab9959e2a925a93ad4897416bbb7"
SOURCE_URI_30="https://invent.kde.org/qt/qt/qtsvg/-/archive/$gitCommit30/qtsvg-$gitCommit30.tar.gz"
CHECKSUM_SHA256_30="98369a865a12cb95986ac7bc6626f479b7b27a7b3eb515aaee29fe94e943b743"
SOURCE_DIR_30="qtsvg-$gitCommit30"
PATCHES_30="qtsvg-5.15.2+kde.patchset"
SOURCE_URI_31="$baseURL/qttools-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_31="c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc"
SOURCE_DIR_31="qttools-everywhere-src-$portVersion"