Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72120dff8bae
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9d1ed1df2ead
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on May 26, 2021

  1. qt5: switch 3d quick3d and tools to kde maintenance branch 

    bump qtbase,qtsvg und qtdeclarative kde commits
use system assimp
    @korli
    korli committed May 26, 2021
    Copy the full SHA
    9d1ed1d View commit details
22 changes: 22 additions & 0 deletions dev-qt/qt5/patches/qt3d-5.15.2+kde.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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

---
.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

22 changes: 22 additions & 0 deletions dev-qt/qt5/patches/qtquick3d-5.15.2+kde.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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

---
.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

25 changes: 25 additions & 0 deletions dev-qt/qt5/patches/qtquick3d-5.15.2.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
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

23 changes: 23 additions & 0 deletions dev-qt/qt5/patches/qttools-5.15.2+kde.patchset
View file
Original file line number Diff line number Diff line change
@@ -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 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

43 changes: 26 additions & 17 deletions dev-qt/qt5/qt5-5.15.2.recipe
View file
Original file line number Diff line number Diff line change
@@ -8,24 +8,26 @@ COPYRIGHT="2015-2020 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3
FDL"
REVISION="4"
REVISION="5"
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"
SOURCE_URI_01="$baseURL/qt3d-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_01="03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d"
SOURCE_DIR_01="qt3d-everywhere-src-$portVersion"
PATCHES_01="qt3d-$portVersion.patchset"
gitCommit01="72b026a22e6942eca4b70ba948022aecbd8965fc"
SOURCE_URI_01="https://invent.kde.org/qt/qt/qt3d/-/archive/$gitCommit01/qt3d-$gitCommit01.tar.gz"
CHECKSUM_SHA256_01="d8c63283d27b2d04d9fd65e3f13b609a1acdbe59fd15d682da6b44df66a3e885"
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_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="97bf6942ed9e540dcd1826da8e314"
gitCommit04="4102271bbd16d93984b54a3435995259e5641e1c"
SOURCE_URI_04="https://invent.kde.org/qt/qt/qtbase/-/archive/$gitCommit04/qtbase-$gitCommit04.tar.gz"
CHECKSUM_SHA256_04="0d8173bb7d539383bb506d8821af118d0f8c16255e0d1bafd9d3f0cbc320c741"
CHECKSUM_SHA256_04="4d280f7c32058e67d44f826a39609555751143993bcbb85e8654fda005834e6d"
SOURCE_DIR_04="qtbase-$gitCommit04"
PATCHES_04="qtbase-$portVersion.patchset
qtbase-5.15.2+kde.patchset"
@@ -38,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="e203a185cfab199a89a33b903096d6d0023a8a88"
gitCommit08="4f08a2da5b0da675cf6a75683a43a106f5a1e7b8"
SOURCE_URI_08="https://invent.kde.org/qt/qt/qtdeclarative/-/archive/$gitCommit08/qtdeclarative-$gitCommit08.tar.gz"
CHECKSUM_SHA256_08="4ff77a056e47bd3b1d81dbf7b2e3e5be56fd5be1214313baa71353ba6868d132"
CHECKSUM_SHA256_08="6c33fbf3d116191b014d7de8da0852c12dbdbedda8649280b042472e68b80b46"
SOURCE_DIR_08="qtdeclarative-$gitCommit08"
PATCHES_08="qtdeclarative-$portVersion.patchset
qtdeclarative-5.15.2+kde.patchset"
@@ -75,9 +77,12 @@ 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"
SOURCE_URI_19="$baseURL/qtquick3d-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256_19="5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb"
SOURCE_DIR_19="qtquick3d-everywhere-src-$portVersion"
gitCommit19="e3dfdf1bed735dc720f08c4a01cdc7ddbe7623f7"
SOURCE_URI_19="https://invent.kde.org/qt/qt/qtquick3d/-/archive/$gitCommit19/qtquick3d-$gitCommit19.tar.gz"
CHECKSUM_SHA256_19="fafdfa20fe348514efe7be7946689aa6a661b1ff9688a4bca0d0745fe7902689"
SOURCE_DIR_19="qtquick3d-$gitCommit19"
PATCHES_19="qtquick3d-$portVersion.patchset
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"
@@ -109,14 +114,16 @@ 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="95990cbeebc0ab9959e2a925a93ad4897416bbb7"
gitCommit30="cfc616978b52a396b2ef6900546f7fc086d7cab3"
SOURCE_URI_30="https://invent.kde.org/qt/qt/qtsvg/-/archive/$gitCommit30/qtsvg-$gitCommit30.tar.gz"
CHECKSUM_SHA256_30="98369a865a12cb95986ac7bc6626f479b7b27a7b3eb515aaee29fe94e943b743"
CHECKSUM_SHA256_30="c356ce3c75f6621f33f4ffbc19bc13caea579410e3b4d0121278f0f780f7d479"
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"
gitCommit31="33693a928986006d79c1ee743733cde5966ac402"
SOURCE_URI_31="https://invent.kde.org/qt/qt/qttools/-/archive/$gitCommit31/qttools-$gitCommit31.tar.gz"
CHECKSUM_SHA256_31="1f48bdb316a42dc41e8cf977ea4b93c368ca6d5c40e7d6e836d9717a19f82e40"
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_DIR_32="qttranslations-everywhere-src-$portVersion"
@@ -265,6 +272,7 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
cmd:qsystray
lib:libassimp$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libdouble_conversion$secondaryArchSuffix
lib:libegl$secondaryArchSuffix
@@ -519,6 +527,7 @@ REQUIRES_tools="

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libassimp$secondaryArchSuffix
devel:libclang$secondaryArchSuffix >= 9
devel:libclanganalysis$secondaryArchSuffix >= 9
devel:libLLVM_9$secondaryArchSuffix