haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: bump kde commits

Browse Source
This commit is contained in:
Jerome Duval
2022-02-22 13:33:15 +01:00
parent 8e459c1349
commit 6e5c1f5ac2
2 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dev-qt/qt5/patches/qtquick3d-5.15.2.patchset
View File

@@ -1,25 +0,0 @@
From dd75d95ebba5536fcf8b8d5302b2540ce2f53722 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 25 May 2021 18:49:49 +0200
Subject: [PATCH] fix system assimp
---
src/plugins/assetimporters/assimp/assimp.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/assetimporters/assimp/assimp.pro b/src/plugins/assetimporters/assimp/assimp.pro
index ca5c499..174a075 100644
--- a/src/plugins/assetimporters/assimp/assimp.pro
+++ b/src/plugins/assetimporters/assimp/assimp.pro
@@ -10,7 +10,7 @@ QT_FOR_CONFIG += assetimporters-private
include($$OUT_PWD/../qtassetimporters-config.pri)
qtConfig(system-assimp):!if(cross_compile:host_build) {
- QMAKE_USE_PRIVATE += assimp
+ QMAKE_USE_PRIVATE += quick3d-assimp
} else {
include(../../../3rdparty/assimp/assimp.pri)
}
--
2.30.0

41
dev-qt/qt5/qt5-5.15.2.recipe
View File

@@ -8,14 +8,14 @@ COPYRIGHT="2015-2020 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3
FDL"
REVISION="7"
REVISION="8"
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="7edec6e014de27b9dd03f63875c471aac606a918"
gitCommit01="dba14d48611b9e9d59576172658779ab4a39b416"
SOURCE_URI_01="https://invent.kde.org/qt/qt/qt3d/-/archive/$gitCommit01/qt3d-$gitCommit01.tar.gz"
CHECKSUM_SHA256_01="92af72cd1c7bfa1b1f3f3ab3e4bda90b35a0eab30f2c6a7214a5da2a5e819773"
CHECKSUM_SHA256_01="9304af566f37f30ee01310e305270ba87f31d53d9ca78df1988fcbaf8cde4ae9"
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="9749bcc95e465d38fb9d810d4c97b1e230465e0d"
gitCommit04="541ad810a511f5078f2844c5d3eda76ed8bb2081"
SOURCE_URI_04="https://invent.kde.org/qt/qt/qtbase/-/archive/$gitCommit04/qtbase-$gitCommit04.tar.gz"
CHECKSUM_SHA256_04="69e43b7c4db0c84c08c1232946a16ac92de969af7ab87244238bbf354a266cc2"
CHECKSUM_SHA256_04="7e7d63e349458566b69cf03e8b39a18c7792237f2d9a212ff96f7a8129ed9119"
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="55324650f9e759a43dce927f823c9858574106c3"
gitCommit08="29ee9a0e9f02ec74153a2cf09dc63722bc273544"
SOURCE_URI_08="https://invent.kde.org/qt/qt/qtdeclarative/-/archive/$gitCommit08/qtdeclarative-$gitCommit08.tar.gz"
CHECKSUM_SHA256_08="e4ffb1a1dfea29ca2ecfb218f4db37f159e8d359cb4c44fee96dd33186bc2b0e"
CHECKSUM_SHA256_08="5c99605da5d1bcb2c48664c40ce03ddb9679badbe3796291a46aceaebe50238e"
SOURCE_DIR_08="qtdeclarative-$gitCommit08"
PATCHES_08="qtdeclarative-$portVersion.patchset
qtdeclarative-5.15.2+kde.patchset"
@@ -77,12 +77,11 @@ SOURCE_DIR_17="qtnetworkauth-everywhere-src-$portVersion"
SOURCE_URI_18="$baseURL/qtpurchasing-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_18="87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227"
SOURCE_DIR_18="qtpurchasing-everywhere-src-$portVersion"
gitCommit19="e3dfdf1bed735dc720f08c4a01cdc7ddbe7623f7"
gitCommit19="3e3e53c834b25dc2959dd30f319d12d6f84ee1e3"
SOURCE_URI_19="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$gitCommit19/qtquick3d-$gitCommit19.tar.gz"
CHECKSUM_SHA256_19="fafdfa20fe348514efe7be7946689aa6a661b1ff9688a4bca0d0745fe7902689"
CHECKSUM_SHA256_19="bdc720feaaa70577d0c2547aefca908c92336c8ab65f10eefecd696b1df4a7c6"
SOURCE_DIR_19="qtquick3d-$gitCommit19"
PATCHES_19="qtquick3d-$portVersion.patchset
qtquick3d-5.15.2+kde.patchset"
PATCHES_19="qtquick3d-5.15.2+kde.patchset"
SOURCE_URI_20="$baseURL/qtquickcontrols-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_20="c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5"
SOURCE_DIR_20="qtquickcontrols-everywhere-src-$portVersion"
@@ -95,9 +94,9 @@ 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"
gitCommit24="v5.15.6-lts"
gitCommit24="v5.15.8-lts"
SOURCE_URI_24="https://invent.kde.org/qt/qt/qtscript/-/archive/$gitCommit24/qtscript-$gitCommit24.tar.gz"
CHECKSUM_SHA256_24="367e7ea333d2047d0dd9b2749f8f6ae80c43a342d37834a2472fc13499f4d73b"
CHECKSUM_SHA256_24="1766f51d05670c575ab853acdb039e066f6caab98f12090aab9a79d121f97aa2"
SOURCE_DIR_24="qtscript-$gitCommit24"
SOURCE_URI_25="$baseURL/qtscxml-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_25="60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc"
@@ -115,9 +114,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="24128cdf8bef53eddf31a5709bbbc46293006b1c"
gitCommit30="728012f7762ecd5762d493f8796907c6456f31e7"
SOURCE_URI_30="https://invent.kde.org/qt/qt/qtsvg/-/archive/$gitCommit30/qtsvg-$gitCommit30.tar.gz"
CHECKSUM_SHA256_30="c96e4510f454a64d38180d7011c02f4e4814211166b00c0f4f0966977a30b5fa"
CHECKSUM_SHA256_30="35f459d0de5a786b3708a48cfc322664755542db6a4fbe6c306976de7a0bb400"
SOURCE_DIR_30="qtsvg-$gitCommit30"
PATCHES_30="qtsvg-5.15.2+kde.patchset"
gitCommit31="33693a928986006d79c1ee743733cde5966ac402"
@@ -240,8 +239,8 @@ PROVIDES="
# qtremoteobjects
lib:libQt5RemoteObjects$secondaryArchSuffix = $portVersion compat >= 5
# qtscript
lib:libQt5Script$secondaryArchSuffix = 5.15.6 compat >= 5
lib:libQt5ScriptTools$secondaryArchSuffix = 5.15.6 compat >= 5
lib:libQt5Script$secondaryArchSuffix = 5.15.8 compat >= 5
lib:libQt5ScriptTools$secondaryArchSuffix = 5.15.8 compat >= 5
# qtscxml
lib:libQt5Scxml$secondaryArchSuffix = $portVersion compat >= 5
# qtsensors
@@ -383,8 +382,8 @@ PROVIDES_devel="
# qtremoteobjects
devel:libQt5RemoteObjects$secondaryArchSuffix = $portVersion compat >= 5
# qtscript
devel:libQt5Script$secondaryArchSuffix = 5.15.6 compat >= 5
devel:libQt5ScriptTools$secondaryArchSuffix = 5.15.6 compat >= 5
devel:libQt5Script$secondaryArchSuffix = 5.15.8 compat >= 5
devel:libQt5ScriptTools$secondaryArchSuffix = 5.15.8 compat >= 5
# qtscxml
devel:libQt5Scxml$secondaryArchSuffix = $portVersion compat >= 5
# qtsensors
@@ -641,8 +640,8 @@ defineDebugInfoPackage qt5$secondaryArchSuffix \
"$libDir"/libQt5NetworkAuth.so.$portVersion \
"$libDir"/libQt5Purchasing.so.$portVersion \
"$libDir"/libQt5RemoteObjects.so.$portVersion \
"$libDir"/libQt5Script.so.5.15.6 \
"$libDir"/libQt5ScriptTools.so.5.15.6 \
"$libDir"/libQt5Script.so.5.15.8 \
"$libDir"/libQt5ScriptTools.so.5.15.8 \
"$libDir"/libQt5Scxml.so.$portVersion \
"$libDir"/libQt5Sensors.so.$portVersion \
"$libDir"/libQt5SerialBus.so.$portVersion \