From 8caefe704b4f4e2bd32a1c368101c496e340e4ed Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 4 Sep 2024 18:31:08 +0000 Subject: [PATCH] qt6_quick3d: bump version --- .../patches/qt6_quick3d-6.7.0.patchset | 22 ------------------- ...-6.7.0.recipe => qt6_quick3d-6.7.2.recipe} | 5 ++--- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 dev-qt/qt6-quick3d/patches/qt6_quick3d-6.7.0.patchset rename dev-qt/qt6-quick3d/{qt6_quick3d-6.7.0.recipe => qt6_quick3d-6.7.2.recipe} (97%) diff --git a/dev-qt/qt6-quick3d/patches/qt6_quick3d-6.7.0.patchset b/dev-qt/qt6-quick3d/patches/qt6_quick3d-6.7.0.patchset deleted file mode 100644 index 96f5dbf56..000000000 --- a/dev-qt/qt6-quick3d/patches/qt6_quick3d-6.7.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From dca6ba90bfe70c1ec7770213191cc37d19dac46e Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 10 Apr 2024 22:11:02 +1000 -Subject: Fix build - - -diff --git a/src/3rdparty/assimp/src/contrib/unzip/ioapi.c b/src/3rdparty/assimp/src/contrib/unzip/ioapi.c -index 0ca29db..2aca20f 100644 ---- a/src/3rdparty/assimp/src/contrib/unzip/ioapi.c -+++ b/src/3rdparty/assimp/src/contrib/unzip/ioapi.c -@@ -14,7 +14,7 @@ - #define _CRT_SECURE_NO_WARNINGS - #endif - --#if defined(__APPLE__) || defined(IOAPI_NO_64) -+#if defined(__APPLE__) || defined(__HAIKU__) || defined(IOAPI_NO_64) - // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions - #define FOPEN_FUNC(filename, mode) fopen(filename, mode) - #define FTELLO_FUNC(stream) ftello(stream) --- -2.43.2 - diff --git a/dev-qt/qt6-quick3d/qt6_quick3d-6.7.0.recipe b/dev-qt/qt6-quick3d/qt6_quick3d-6.7.2.recipe similarity index 97% rename from dev-qt/qt6-quick3d/qt6_quick3d-6.7.0.recipe rename to dev-qt/qt6-quick3d/qt6_quick3d-6.7.2.recipe index 04321a85a..a3ea70543 100644 --- a/dev-qt/qt6-quick3d/qt6_quick3d-6.7.0.recipe +++ b/dev-qt/qt6-quick3d/qt6_quick3d-6.7.2.recipe @@ -8,12 +8,11 @@ COPYRIGHT="2015-2024 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3 GNU FDL v1" -REVISION="2" +REVISION="1" QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive" SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtquick3d-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="8bb943bf3f65a933b74fcd93d927e22b8621484030586c15586728e2f67ed910" +CHECKSUM_SHA256="bb8ff9aec6da2e2d3b3986cc859333a98b2f3d4bbe564c5733e8f1a089d15270" SOURCE_DIR="qtquick3d-everywhere-src-$portVersion" -PATCHES="qt6_quick3d-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86"