From 112659703c68d72b739b5fb92e2b87b88e726faa Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 12 May 2023 22:47:11 +0200 Subject: [PATCH] qt5: bump version --- dev-qt/qt5/patches/qt3d-5.15.2+kde.patchset | 22 -- dev-qt/qt5/patches/qt3d-5.15.2.patchset | 23 --- dev-qt/qt5/patches/qtbase-5.15.2+kde.patchset | 25 --- ...5.15.2.patchset => qtbase-5.15.9.patchset} | 0 .../patches/qtdeclarative-5.15.2+kde.patchset | 23 --- ...patchset => qtdeclarative-5.15.9.patchset} | 0 ....2.patchset => qtlocation-5.15.9.patchset} | 0 .../qt5/patches/qtquick3d-5.15.2+kde.patchset | 22 -- ....patchset => qtserialport-5.15.9.patchset} | 0 dev-qt/qt5/patches/qtsvg-5.15.2+kde.patchset | 23 --- .../qt5/patches/qttools-5.15.2+kde.patchset | 23 --- .../{qt5-5.15.2.recipe => qt5-5.15.9.recipe} | 191 +++++++++--------- 12 files changed, 92 insertions(+), 260 deletions(-) delete mode 100644 dev-qt/qt5/patches/qt3d-5.15.2+kde.patchset delete mode 100644 dev-qt/qt5/patches/qt3d-5.15.2.patchset delete mode 100644 dev-qt/qt5/patches/qtbase-5.15.2+kde.patchset rename dev-qt/qt5/patches/{qtbase-5.15.2.patchset => qtbase-5.15.9.patchset} (100%) delete mode 100644 dev-qt/qt5/patches/qtdeclarative-5.15.2+kde.patchset rename dev-qt/qt5/patches/{qtdeclarative-5.15.2.patchset => qtdeclarative-5.15.9.patchset} (100%) rename dev-qt/qt5/patches/{qtlocation-5.15.2.patchset => qtlocation-5.15.9.patchset} (100%) delete mode 100644 dev-qt/qt5/patches/qtquick3d-5.15.2+kde.patchset rename dev-qt/qt5/patches/{qtserialport-5.15.2.patchset => qtserialport-5.15.9.patchset} (100%) delete mode 100644 dev-qt/qt5/patches/qtsvg-5.15.2+kde.patchset delete mode 100644 dev-qt/qt5/patches/qttools-5.15.2+kde.patchset rename dev-qt/qt5/{qt5-5.15.2.recipe => qt5-5.15.9.recipe} (83%) diff --git a/dev-qt/qt5/patches/qt3d-5.15.2+kde.patchset b/dev-qt/qt5/patches/qt3d-5.15.2+kde.patchset deleted file mode 100644 index 3ea41a714..000000000 --- a/dev-qt/qt5/patches/qt3d-5.15.2+kde.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 568763928a78b52373932b01be17e040f7c3fa50 Mon Sep 17 00:00:00 2001 -From: Jani Heikkinen -Date: Tue, 27 Oct 2020 07:48:21 +0200 -Subject: [PATCH] Revert Bump version - ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index a17c069..a4c27d0 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -6,4 +6,4 @@ load(qt_build_config) - DEFINES += QT_NO_FOREACH - DEFINES += QT_NO_JAVA_STYLE_ITERATORS - --MODULE_VERSION = 5.15.3 -+MODULE_VERSION = 5.15.2 --- -GitLab - diff --git a/dev-qt/qt5/patches/qt3d-5.15.2.patchset b/dev-qt/qt5/patches/qt3d-5.15.2.patchset deleted file mode 100644 index 6cce6d0c6..000000000 --- a/dev-qt/qt5/patches/qt3d-5.15.2.patchset +++ /dev/null @@ -1,23 +0,0 @@ - -From cbe4a359a377c03c2036f7e9474faa84e58a5a10 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 11 Feb 2019 15:57:25 +1000 -Subject: Fix build qt3d zip module - - -diff --git a/src/3rdparty/assimp/contrib/zip/src/miniz.h b/src/3rdparty/assimp/contrib/zip/src/miniz.h -index 2e4e223..6436df5 100644 ---- a/src/3rdparty/assimp/contrib/zip/src/miniz.h -+++ b/src/3rdparty/assimp/contrib/zip/src/miniz.h -@@ -2917,7 +2917,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, - #define MZ_FFLUSH fflush - #define MZ_FREOPEN(f, m, s) freopen(f, m, s) - #define MZ_DELETE_FILE remove -- #elif defined(__GNUC__) && _LARGEFILE64_SOURCE -+ #elif defined(__GNUC__) && _LARGEFILE64_SOURCE && !defined(__HAIKU__) - #ifndef MINIZ_NO_TIME - #include - #endif --- -2.28.0 - diff --git a/dev-qt/qt5/patches/qtbase-5.15.2+kde.patchset b/dev-qt/qt5/patches/qtbase-5.15.2+kde.patchset deleted file mode 100644 index d2178541b..000000000 --- a/dev-qt/qt5/patches/qtbase-5.15.2+kde.patchset +++ /dev/null @@ -1,25 +0,0 @@ -From 7179102e731fc751339678d33a705b045dae26c1 Mon Sep 17 00:00:00 2001 -From: Liang Qi -Date: Tue, 17 Nov 2020 11:07:30 +0100 -Subject: Revert Bump version - -Change-Id: I5697edf968dfaebe25c73899d26ed234631e55dc -Reviewed-by: Kevin Funk -Reviewed-by: Jani Heikkinen ---- - .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 - diff --git a/dev-qt/qt5/patches/qtbase-5.15.2.patchset b/dev-qt/qt5/patches/qtbase-5.15.9.patchset similarity index 100% rename from dev-qt/qt5/patches/qtbase-5.15.2.patchset rename to dev-qt/qt5/patches/qtbase-5.15.9.patchset diff --git a/dev-qt/qt5/patches/qtdeclarative-5.15.2+kde.patchset b/dev-qt/qt5/patches/qtdeclarative-5.15.2+kde.patchset deleted file mode 100644 index 388ce7822..000000000 --- a/dev-qt/qt5/patches/qtdeclarative-5.15.2+kde.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From 568763928a78b52373932b01be17e040f7c3fa50 Mon Sep 17 00:00:00 2001 -From: Jani Heikkinen -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 - diff --git a/dev-qt/qt5/patches/qtdeclarative-5.15.2.patchset b/dev-qt/qt5/patches/qtdeclarative-5.15.9.patchset similarity index 100% rename from dev-qt/qt5/patches/qtdeclarative-5.15.2.patchset rename to dev-qt/qt5/patches/qtdeclarative-5.15.9.patchset diff --git a/dev-qt/qt5/patches/qtlocation-5.15.2.patchset b/dev-qt/qt5/patches/qtlocation-5.15.9.patchset similarity index 100% rename from dev-qt/qt5/patches/qtlocation-5.15.2.patchset rename to dev-qt/qt5/patches/qtlocation-5.15.9.patchset diff --git a/dev-qt/qt5/patches/qtquick3d-5.15.2+kde.patchset b/dev-qt/qt5/patches/qtquick3d-5.15.2+kde.patchset deleted file mode 100644 index 34db1a5dd..000000000 --- a/dev-qt/qt5/patches/qtquick3d-5.15.2+kde.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 568763928a78b52373932b01be17e040f7c3fa50 Mon Sep 17 00:00:00 2001 -From: Jani Heikkinen -Date: Tue, 27 Oct 2020 07:48:21 +0200 -Subject: [PATCH] Revert Bump version - ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index bbf484f..ba84e23 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 - diff --git a/dev-qt/qt5/patches/qtserialport-5.15.2.patchset b/dev-qt/qt5/patches/qtserialport-5.15.9.patchset similarity index 100% rename from dev-qt/qt5/patches/qtserialport-5.15.2.patchset rename to dev-qt/qt5/patches/qtserialport-5.15.9.patchset diff --git a/dev-qt/qt5/patches/qtsvg-5.15.2+kde.patchset b/dev-qt/qt5/patches/qtsvg-5.15.2+kde.patchset deleted file mode 100644 index 7fb7b21f8..000000000 --- a/dev-qt/qt5/patches/qtsvg-5.15.2+kde.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From 9aac88424a1b76e0198b52437af58a6d94aff8e9 Mon Sep 17 00:00:00 2001 -From: Jani Heikkinen -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 - diff --git a/dev-qt/qt5/patches/qttools-5.15.2+kde.patchset b/dev-qt/qt5/patches/qttools-5.15.2+kde.patchset deleted file mode 100644 index 54ed6697b..000000000 --- a/dev-qt/qt5/patches/qttools-5.15.2+kde.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From 568763928a78b52373932b01be17e040f7c3fa50 Mon Sep 17 00:00:00 2001 -From: Jani Heikkinen -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 0556170..6ec606e 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -2,4 +2,4 @@ load(qt_build_config) - - DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST - --MODULE_VERSION = 5.15.3 -+MODULE_VERSION = 5.15.2 --- -GitLab - diff --git a/dev-qt/qt5/qt5-5.15.2.recipe b/dev-qt/qt5/qt5-5.15.9.recipe similarity index 83% rename from dev-qt/qt5/qt5-5.15.2.recipe rename to dev-qt/qt5/qt5-5.15.9.recipe index bc5fa5438..ebc9488dc 100644 --- a/dev-qt/qt5/qt5-5.15.2.recipe +++ b/dev-qt/qt5/qt5-5.15.9.recipe @@ -8,155 +8,148 @@ COPYRIGHT="2015-2020 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 FDL" -REVISION="10" +REVISION="1" #baseURL="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules" baseURL="http://qt-mirror.dannhauer.de/official_releases/qt/${portVersion%.*}/$portVersion/submodules/" -SOURCE_URI="https://github.com/qt/qt5/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="b404979e3ec79afc6484c527246ec919cd0a5b3927d172b321b4598e1de52d69" -SOURCE_DIR="qt5-$portVersion" -gitCommit01="dba14d48611b9e9d59576172658779ab4a39b416" +SOURCE_URI="https://github.com/qt/qt5/archive/v$portVersion-lts-lgpl.tar.gz" +CHECKSUM_SHA256="06b18ab92e57a4e05c52ffc7057f91df84c9928582d4b9388f729027dbfb77e0" +SOURCE_DIR="qt5-$portVersion-lts-lgpl" +gitCommit01="e94b0fa39a2f4bf260969fb18bf075dba39b2df1" SOURCE_URI_01="https://invent.kde.org/qt/qt/qt3d/-/archive/$gitCommit01/qt3d-$gitCommit01.tar.gz" -CHECKSUM_SHA256_01="9304af566f37f30ee01310e305270ba87f31d53d9ca78df1988fcbaf8cde4ae9" +CHECKSUM_SHA256_01="be5e5c138ec1fca8913f94567460ac612c10be0b705eff4d6b60c8d95255808c" SOURCE_DIR_01="qt3d-$gitCommit01" -PATCHES_01="qt3d-$portVersion.patchset - qt3d-5.15.2+kde.patchset" -SOURCE_URI_02="$baseURL/qtactiveqt-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_02="868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c" +SOURCE_URI_02="$baseURL/qtactiveqt-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_02="bbbd92518b363cb999247e591b4264df0eebc3cdfe9d120e8fc20eb0c9dd64a6" SOURCE_DIR_02="qtactiveqt-everywhere-src-$portVersion" -SOURCE_URI_03="$baseURL/qtandroidextras-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_03="5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd" +SOURCE_URI_03="$baseURL/qtandroidextras-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_03="512602a55f90858ebaf02c99e04761fa413b7ea37a8ba2abe1c78ee1e1b58770" SOURCE_DIR_03="qtandroidextras-everywhere-src-$portVersion" -gitCommit04="541ad810a511f5078f2844c5d3eda76ed8bb2081" +gitCommit04="84152777a48af444a902bbf4df8b38146171c20d" SOURCE_URI_04="https://invent.kde.org/qt/qt/qtbase/-/archive/$gitCommit04/qtbase-$gitCommit04.tar.gz" -CHECKSUM_SHA256_04="7e7d63e349458566b69cf03e8b39a18c7792237f2d9a212ff96f7a8129ed9119" +CHECKSUM_SHA256_04="fb62fcf19b2240f253fddaff74c174f562ef85b75f3ff2ca75e84060744b1c2e" 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" +PATCHES_04="qtbase-$portVersion.patchset" +SOURCE_URI_05="$baseURL/qtcharts-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_05="2ee4df662ceeda868268dd890f0e89033a4d89e7f4188f4c1b03ce315c9af816" SOURCE_DIR_05="qtcharts-everywhere-src-$portVersion" -SOURCE_URI_06="$baseURL/qtconnectivity-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_06="0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0" +SOURCE_URI_06="$baseURL/qtconnectivity-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_06="850f40ede3647baf3fad4ac262dac9a79dd5b2037fbb35f2731131dbfa46cb56" SOURCE_DIR_06="qtconnectivity-everywhere-src-$portVersion" -SOURCE_URI_07="$baseURL/qtdatavis3d-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_07="226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd" +SOURCE_URI_07="$baseURL/qtdatavis3d-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_07="ead6744e085736525e5fe3867e0fb095cdb91d06f92c7e524844d53cd7e2bb90" SOURCE_DIR_07="qtdatavis3d-everywhere-src-$portVersion" -gitCommit08="29ee9a0e9f02ec74153a2cf09dc63722bc273544" +gitCommit08="c21cad9f47eb7baa40341ec9b70dadb86f65a179" SOURCE_URI_08="https://invent.kde.org/qt/qt/qtdeclarative/-/archive/$gitCommit08/qtdeclarative-$gitCommit08.tar.gz" -CHECKSUM_SHA256_08="5c99605da5d1bcb2c48664c40ce03ddb9679badbe3796291a46aceaebe50238e" +CHECKSUM_SHA256_08="74d3f5b2124e9a820ab157ae198612b578f228599e9660dfee3d6daf2ed35594" 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" +PATCHES_08="qtdeclarative-$portVersion.patchset" +SOURCE_URI_09="$baseURL/qtdoc-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_09="a4db8d5635ae2e3e5797765752a14c5fd1a3a5f2009e8880bf51ebbd409f7a98" SOURCE_DIR_09="qtdoc-everywhere-src-$portVersion" -SOURCE_URI_10="$baseURL/qtgamepad-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_10="c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c" +SOURCE_URI_10="$baseURL/qtgamepad-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_10="0d2ab4fb2db67711df2addf2fd47bd559696a78ccd4ac41951f8fed28b256a6b" SOURCE_DIR_10="qtgamepad-everywhere-src-$portVersion" -SOURCE_URI_11="$baseURL/qtgraphicaleffects-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_11="ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4" +SOURCE_URI_11="$baseURL/qtgraphicaleffects-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_11="1c2b83c0996b73cfd750032ecd24d8d72b5e9b91f131341a3cb06d976e2b2a12" SOURCE_DIR_11="qtgraphicaleffects-everywhere-src-$portVersion" -SOURCE_URI_12="$baseURL/qtimageformats-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_12="bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7" +SOURCE_URI_12="$baseURL/qtimageformats-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_12="2435f9c4ef4a03292f0a911c8da14ef6ad38775b6f97722f4a8863e1aae61ba3" SOURCE_DIR_12="qtimageformats-everywhere-src-$portVersion" -SOURCE_URI_13="$baseURL/qtlocation-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_13="984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0" +SOURCE_URI_13="$baseURL/qtlocation-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_13="2d08ef5ee952e0bbcdd74c6664e6f6115c35a31f8299b3d5356375433e887586" SOURCE_DIR_13="qtlocation-everywhere-src-$portVersion" PATCHES_13="qtlocation-$portVersion.patchset" -SOURCE_URI_14="$baseURL/qtlottie-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_14="cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517" +SOURCE_URI_14="$baseURL/qtlottie-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_14="0e679af1d127cbac8f7ffaea1807ae7aefde14831dae317ad1b29d35a19db826" SOURCE_DIR_14="qtlottie-everywhere-src-$portVersion" -SOURCE_URI_15="$baseURL/qtmacextras-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_15="6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e" +SOURCE_URI_15="$baseURL/qtmacextras-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_15="951eb75c113d36dc4ce08b600dbedf84e6e5858286876e88f4499afed0ccd394" SOURCE_DIR_15="qtmacextras-everywhere-src-$portVersion" -SOURCE_URI_16="$baseURL/qtmultimedia-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_16="0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5" +SOURCE_URI_16="$baseURL/qtmultimedia-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_16="453e30affb938ea0427b82509c955cbe2d0846ef27e58aa3a53a99c27cf7c772" SOURCE_DIR_16="qtmultimedia-everywhere-src-$portVersion" -SOURCE_URI_17="$baseURL/qtnetworkauth-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_17="fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85" +SOURCE_URI_17="$baseURL/qtnetworkauth-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_17="088ab0ecc8958ebbc21b44dc152515d79159e0603948a574d8097fb444a75984" SOURCE_DIR_17="qtnetworkauth-everywhere-src-$portVersion" -SOURCE_URI_18="$baseURL/qtpurchasing-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_18="87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227" +SOURCE_URI_18="$baseURL/qtpurchasing-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_18="e7f45fa86f50a5c017c9091f909f29caec25bfe55a5bf9cc5c7a4f5adcbbb889" SOURCE_DIR_18="qtpurchasing-everywhere-src-$portVersion" -gitCommit19="3e3e53c834b25dc2959dd30f319d12d6f84ee1e3" +gitCommit19="ccd0284235e9e3e1f97d808125af5024d3f04140" SOURCE_URI_19="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$gitCommit19/qtquick3d-$gitCommit19.tar.gz" -CHECKSUM_SHA256_19="bdc720feaaa70577d0c2547aefca908c92336c8ab65f10eefecd696b1df4a7c6" +CHECKSUM_SHA256_19="eb85ca25d1389c830b1ef007b8b6b2096896c3002202f43cb99f942b7c84a2bd" SOURCE_DIR_19="qtquick3d-$gitCommit19" -PATCHES_19="qtquick3d-5.15.2+kde.patchset" -SOURCE_URI_20="$baseURL/qtquickcontrols-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_20="c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5" +SOURCE_URI_20="$baseURL/qtquickcontrols-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_20="958c46e54c400f2a5e8ce04d917d302ad39181d389079b6671213b233c560b1b" SOURCE_DIR_20="qtquickcontrols-everywhere-src-$portVersion" -SOURCE_URI_21="$baseURL/qtquickcontrols2-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_21="671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919" +SOURCE_URI_21="$baseURL/qtquickcontrols2-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_21="be2c54c5b85d921567918bd17e783f0ba10328c7eac01439fbf26192cb878882" SOURCE_DIR_21="qtquickcontrols2-everywhere-src-$portVersion" -SOURCE_URI_22="$baseURL/qtquicktimeline-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_22="b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28" +SOURCE_URI_22="$baseURL/qtquicktimeline-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_22="b01ded88b511787bb229347820e1c82989b40441705fb25680648be888e8d671" SOURCE_DIR_22="qtquicktimeline-everywhere-src-$portVersion" -SOURCE_URI_23="$baseURL/qtremoteobjects-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_23="6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2" +SOURCE_URI_23="$baseURL/qtremoteobjects-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_23="dadbc8cea632471db8ed52864b1047d2bc756c828a4690c23b40b3eebf415753" SOURCE_DIR_23="qtremoteobjects-everywhere-src-$portVersion" -gitCommit24="v5.15.8-lts" +gitCommit24="v5.15.13-lts" SOURCE_URI_24="https://invent.kde.org/qt/qt/qtscript/-/archive/$gitCommit24/qtscript-$gitCommit24.tar.gz" -CHECKSUM_SHA256_24="1766f51d05670c575ab853acdb039e066f6caab98f12090aab9a79d121f97aa2" +CHECKSUM_SHA256_24="0b68ab71bad5edf0439f7238196154e975e8d98fb860e1dcda20d6698e89c528" SOURCE_DIR_24="qtscript-$gitCommit24" -SOURCE_URI_25="$baseURL/qtscxml-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_25="60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc" +SOURCE_URI_25="$baseURL/qtscxml-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_25="b15e74e37366d8d08e2ae649b992ded7dee2952b3b8e5a418d2a57f6c0d8d043" SOURCE_DIR_25="qtscxml-everywhere-src-$portVersion" -SOURCE_URI_26="$baseURL/qtsensors-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_26="3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839" +SOURCE_URI_26="$baseURL/qtsensors-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_26="7f8790b40302b8178c404a9a23a43724871996882ff249d08642651f6ac6018c" SOURCE_DIR_26="qtsensors-everywhere-src-$portVersion" -SOURCE_URI_27="$baseURL/qtserialbus-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_27="aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88" +SOURCE_URI_27="$baseURL/qtserialbus-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_27="e9124618e18e07ba9ea83f21532ff0e8c2c02e6d6966621d001fcc9febcb93a2" SOURCE_DIR_27="qtserialbus-everywhere-src-$portVersion" -SOURCE_URI_28="$baseURL/qtserialport-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_28="59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d" +SOURCE_URI_28="$baseURL/qtserialport-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_28="67d20803f08b33973d7eded2e5c75083704e43b005d4c3bc9c6e8a91755bc025" SOURCE_DIR_28="qtserialport-everywhere-src-$portVersion" PATCHES_28="qtserialport-$portVersion.patchset" -SOURCE_URI_29="$baseURL/qtspeech-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_29="c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5" +SOURCE_URI_29="$baseURL/qtspeech-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_29="4f9f7db0e919f782863c73ea872283ca905d6464221b9b789bfa0f4460e92a90" SOURCE_DIR_29="qtspeech-everywhere-src-$portVersion" -gitCommit30="728012f7762ecd5762d493f8796907c6456f31e7" +gitCommit30="837b5163e17edbd3a9f098e9a1ab73febab419b4" SOURCE_URI_30="https://invent.kde.org/qt/qt/qtsvg/-/archive/$gitCommit30/qtsvg-$gitCommit30.tar.gz" -CHECKSUM_SHA256_30="35f459d0de5a786b3708a48cfc322664755542db6a4fbe6c306976de7a0bb400" +CHECKSUM_SHA256_30="cf2d9b17de2c78ee9c2beb42074a0ccae2feb15a885400eb2136b60b1fbea510" SOURCE_DIR_30="qtsvg-$gitCommit30" -PATCHES_30="qtsvg-5.15.2+kde.patchset" -gitCommit31="33693a928986006d79c1ee743733cde5966ac402" +gitCommit31="5649efd376ed7dbb171905e9edebbd547d1f73eb" SOURCE_URI_31="https://invent.kde.org/qt/qt/qttools/-/archive/$gitCommit31/qttools-$gitCommit31.tar.gz" -CHECKSUM_SHA256_31="1f48bdb316a42dc41e8cf977ea4b93c368ca6d5c40e7d6e836d9717a19f82e40" +CHECKSUM_SHA256_31="e608c7480c83eaf3addc1122d6bc761aecd01b17c8961866deb1f306c98cf4b9" SOURCE_DIR_31="qttools-$gitCommit31" -PATCHES_31="qttools-5.15.2+kde.patchset" -SOURCE_URI_32="$baseURL/qttranslations-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_32="d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8" +SOURCE_URI_32="$baseURL/qttranslations-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_32="35f4c4496e8a1f0605b3fb2e28c4b08e191796c9c03c32175a608e9c4dc4bb60" SOURCE_DIR_32="qttranslations-everywhere-src-$portVersion" -SOURCE_URI_33="$baseURL/qtvirtualkeyboard-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_33="9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55" +SOURCE_URI_33="$baseURL/qtvirtualkeyboard-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_33="5b31a91ea95562fa5d5ceb08b22b06adfcb20a2b90385f905a71dddb9dc88bf0" SOURCE_DIR_33="qtvirtualkeyboard-everywhere-src-$portVersion" -SOURCE_URI_34="$baseURL/qtwayland-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_34="193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5" +SOURCE_URI_34="$baseURL/qtwayland-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_34="b719baf33068f3b92309ac610c3b7ed70edb5bf1e8fa07eefc7cbae6ab6a3c12" SOURCE_DIR_34="qtwayland-everywhere-src-$portVersion" -SOURCE_URI_35="$baseURL/qtwebchannel-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_35="127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1" +SOURCE_URI_35="$baseURL/qtwebchannel-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_35="594a350bd92665df33a5839cf66ac1e43911e7653f4fc796b4a30aa85b428789" SOURCE_DIR_35="qtwebchannel-everywhere-src-$portVersion" -#SOURCE_URI_36="$baseURL/qtwebengine-everywhere-src-$portVersion.tar.xz" +#SOURCE_URI_36="$baseURL/qtwebengine-everywhere-opensource-src-$portVersion.tar.xz" #CHECKSUM_SHA256_36="c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0" -#SOURCE_DIR_36="qtwebengine-everywhere-src-$portVersion" -SOURCE_URI_37="$baseURL/qtwebglplugin-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_37="81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446" +#SOURCE_DIR_36="qtwebengine-everywhere-opensource-src-$portVersion" +SOURCE_URI_37="$baseURL/qtwebglplugin-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_37="ebdfce37cad0b923784ba373efa39d827ea73ffb5fd57400b6264ffde98f8815" SOURCE_DIR_37="qtwebglplugin-everywhere-src-$portVersion" -SOURCE_URI_38="$baseURL/qtwebsockets-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_38="a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f" +SOURCE_URI_38="$baseURL/qtwebsockets-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_38="059bf13cdec01f7f8aa082bb9c40a72afde2d12d6bbfc703f4f723b768558e46" SOURCE_DIR_38="qtwebsockets-everywhere-src-$portVersion" -SOURCE_URI_39="$baseURL/qtwebview-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_39="be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7" +SOURCE_URI_39="$baseURL/qtwebview-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_39="1f2128f97a6092aa8aa79ff9c49de5f0dd885f1cd918ad1f6db20db0041dbbea" SOURCE_DIR_39="qtwebview-everywhere-src-$portVersion" -SOURCE_URI_40="$baseURL/qtwinextras-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_40="65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e" +SOURCE_URI_40="$baseURL/qtwinextras-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_40="ea5107105b2072ea7194c16cc0721212f28f77c484ce38b370aaa78bfca45798" SOURCE_DIR_40="qtwinextras-everywhere-src-$portVersion" -SOURCE_URI_41="$baseURL/qtx11extras-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_41="7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e" +SOURCE_URI_41="$baseURL/qtx11extras-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_41="7ba3123de7b4ff87d02f513ffa1e4c4284e8f882563d114f29cb98d4c00fcbdb" SOURCE_DIR_41="qtx11extras-everywhere-src-$portVersion" -SOURCE_URI_42="$baseURL/qtxmlpatterns-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_42="76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa" +SOURCE_URI_42="$baseURL/qtxmlpatterns-everywhere-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256_42="bb674703ba72d304698991d9d8dc20eace2bd4d8e0b5704b042cc19d873960e9" SOURCE_DIR_42="qtxmlpatterns-everywhere-src-$portVersion" ADDITIONAL_FILES=" Assistant.rdef.in @@ -640,8 +633,8 @@ defineDebugInfoPackage qt5$secondaryArchSuffix \ "$libDir"/libQt5NetworkAuth.so.$portVersion \ "$libDir"/libQt5Purchasing.so.$portVersion \ "$libDir"/libQt5RemoteObjects.so.$portVersion \ - "$libDir"/libQt5Script.so.5.15.8 \ - "$libDir"/libQt5ScriptTools.so.5.15.8 \ + "$libDir"/libQt5Script.so.5.15.13 \ + "$libDir"/libQt5ScriptTools.so.5.15.13 \ "$libDir"/libQt5Scxml.so.$portVersion \ "$libDir"/libQt5Sensors.so.$portVersion \ "$libDir"/libQt5SerialBus.so.$portVersion \