From c52336babd4bb45921366eb55657e0d5c2a8e548 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 22 Oct 2021 20:31:07 +0200 Subject: [PATCH] qt5: switch qtscript to kde maintenance branch bump qt3d,qtbase,qtsvg und qtdeclarative kde commits --- dev-qt/qt5/qt5-5.15.2.recipe | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dev-qt/qt5/qt5-5.15.2.recipe b/dev-qt/qt5/qt5-5.15.2.recipe index 9918f4f4f..f9381f65d 100644 --- a/dev-qt/qt5/qt5-5.15.2.recipe +++ b/dev-qt/qt5/qt5-5.15.2.recipe @@ -8,14 +8,14 @@ COPYRIGHT="2015-2020 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 FDL" -REVISION="6" +REVISION="7" baseURL="https://download.qt.io/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="72b026a22e6942eca4b70ba948022aecbd8965fc" +gitCommit01="7edec6e014de27b9dd03f63875c471aac606a918" SOURCE_URI_01="https://invent.kde.org/qt/qt/qt3d/-/archive/$gitCommit01/qt3d-$gitCommit01.tar.gz" -CHECKSUM_SHA256_01="d8c63283d27b2d04d9fd65e3f13b609a1acdbe59fd15d682da6b44df66a3e885" +CHECKSUM_SHA256_01="92af72cd1c7bfa1b1f3f3ab3e4bda90b35a0eab30f2c6a7214a5da2a5e819773" SOURCE_DIR_01="qt3d-$gitCommit01" PATCHES_01="qt3d-$portVersion.patchset qt3d-5.15.2+kde.patchset" @@ -25,9 +25,9 @@ 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" -gitCommit04="4102271bbd16d93984b54a3435995259e5641e1c" +gitCommit04="9749bcc95e465d38fb9d810d4c97b1e230465e0d" SOURCE_URI_04="https://invent.kde.org/qt/qt/qtbase/-/archive/$gitCommit04/qtbase-$gitCommit04.tar.gz" -CHECKSUM_SHA256_04="4d280f7c32058e67d44f826a39609555751143993bcbb85e8654fda005834e6d" +CHECKSUM_SHA256_04="69e43b7c4db0c84c08c1232946a16ac92de969af7ab87244238bbf354a266cc2" SOURCE_DIR_04="qtbase-$gitCommit04" PATCHES_04="qtbase-$portVersion.patchset qtbase-5.15.2+kde.patchset" @@ -40,9 +40,9 @@ 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" -gitCommit08="4f08a2da5b0da675cf6a75683a43a106f5a1e7b8" +gitCommit08="55324650f9e759a43dce927f823c9858574106c3" SOURCE_URI_08="https://invent.kde.org/qt/qt/qtdeclarative/-/archive/$gitCommit08/qtdeclarative-$gitCommit08.tar.gz" -CHECKSUM_SHA256_08="6c33fbf3d116191b014d7de8da0852c12dbdbedda8649280b042472e68b80b46" +CHECKSUM_SHA256_08="e4ffb1a1dfea29ca2ecfb218f4db37f159e8d359cb4c44fee96dd33186bc2b0e" SOURCE_DIR_08="qtdeclarative-$gitCommit08" PATCHES_08="qtdeclarative-$portVersion.patchset qtdeclarative-5.15.2+kde.patchset" @@ -95,9 +95,10 @@ SOURCE_DIR_22="qtquicktimeline-everywhere-src-$portVersion" SOURCE_URI_23="$baseURL/qtremoteobjects-everywhere-src-$portVersion.tar.xz" CHECKSUM_SHA256_23="6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2" SOURCE_DIR_23="qtremoteobjects-everywhere-src-$portVersion" -SOURCE_URI_24="$baseURL/qtscript-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256_24="a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e" -SOURCE_DIR_24="qtscript-everywhere-src-$portVersion" +gitCommit24="v5.15.6-lts" +SOURCE_URI_24="https://invent.kde.org/qt/qt/qtscript/-/archive/$gitCommit24/qtscript-$gitCommit24.tar.gz" +CHECKSUM_SHA256_24="367e7ea333d2047d0dd9b2749f8f6ae80c43a342d37834a2472fc13499f4d73b" +SOURCE_DIR_24="qtscript-$gitCommit24" SOURCE_URI_25="$baseURL/qtscxml-everywhere-src-$portVersion.tar.xz" CHECKSUM_SHA256_25="60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc" SOURCE_DIR_25="qtscxml-everywhere-src-$portVersion" @@ -114,9 +115,9 @@ 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" -gitCommit30="cfc616978b52a396b2ef6900546f7fc086d7cab3" +gitCommit30="24128cdf8bef53eddf31a5709bbbc46293006b1c" SOURCE_URI_30="https://invent.kde.org/qt/qt/qtsvg/-/archive/$gitCommit30/qtsvg-$gitCommit30.tar.gz" -CHECKSUM_SHA256_30="c356ce3c75f6621f33f4ffbc19bc13caea579410e3b4d0121278f0f780f7d479" +CHECKSUM_SHA256_30="c96e4510f454a64d38180d7011c02f4e4814211166b00c0f4f0966977a30b5fa" SOURCE_DIR_30="qtsvg-$gitCommit30" PATCHES_30="qtsvg-5.15.2+kde.patchset" gitCommit31="33693a928986006d79c1ee743733cde5966ac402"