mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-29 11:38:52 +02:00
Qt6, bump to (disabled) 6.10.2 (#13862)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From d63093325035dbd1ad13fef4ac97d0486fa32e96 Mon Sep 17 00:00:00 2001
|
||||
From b26b783c8a0431a373ca05e73408ec8496c506e5 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 4 Sep 2024 22:58:42 +1000
|
||||
Subject: Add Haiku support
|
||||
@@ -31,10 +31,10 @@ index 4b75756..9054315 100644
|
||||
#elif PX_XBOXONE
|
||||
#include "foundation/XboxOne/PxXboxOneIntrinsics.h"
|
||||
diff --git a/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h b/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h
|
||||
index 630c7c0..59bd337 100644
|
||||
index 105e96f..6a8a7e6 100644
|
||||
--- a/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h
|
||||
+++ b/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h
|
||||
@@ -104,6 +104,8 @@ Operating system defines, see http://sourceforge.net/p/predef/wiki/OperatingSyst
|
||||
@@ -101,6 +101,8 @@ Operating system defines, see http://sourceforge.net/p/predef/wiki/OperatingSyst
|
||||
#define PX_IOS 1
|
||||
#elif defined(__APPLE__)
|
||||
#define PX_OSX 1
|
||||
@@ -43,7 +43,7 @@ index 630c7c0..59bd337 100644
|
||||
#elif defined(__ORBIS__)
|
||||
#define PX_PS4 1
|
||||
#elif defined(__NX__)
|
||||
@@ -194,6 +196,9 @@ define anything not defined on this platform to 0
|
||||
@@ -191,6 +193,9 @@ define anything not defined on this platform to 0
|
||||
#ifndef PX_OSX
|
||||
#define PX_OSX 0
|
||||
#endif
|
||||
@@ -53,7 +53,7 @@ index 630c7c0..59bd337 100644
|
||||
#ifndef PX_PS4
|
||||
#define PX_PS4 0
|
||||
#endif
|
||||
@@ -269,7 +274,7 @@ family shortcuts
|
||||
@@ -266,7 +271,7 @@ family shortcuts
|
||||
#define PX_MICROSOFT_FAMILY (PX_XBOXONE || PX_WINDOWS_FAMILY || PX_XBOX_SERIES_X)
|
||||
#define PX_LINUX_FAMILY (PX_LINUX || PX_ANDROID)
|
||||
#define PX_APPLE_FAMILY (PX_IOS || PX_OSX) // equivalent to #if __APPLE__
|
||||
@@ -62,7 +62,7 @@ index 630c7c0..59bd337 100644
|
||||
#if defined(__EMSCRIPTEN__)
|
||||
#define PX_EMSCRIPTEN 1
|
||||
#else
|
||||
@@ -307,7 +312,7 @@ Assert macro
|
||||
@@ -304,7 +309,7 @@ Assert macro
|
||||
DLL export macros
|
||||
*/
|
||||
#ifndef PX_C_EXPORT
|
||||
@@ -241,5 +241,5 @@ index 46034b0..58b4059 100644
|
||||
#else
|
||||
return typeid(T).name();
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
@@ -4,14 +4,14 @@ used for developing software with a graphical user interface, and also used \
|
||||
for developing non-GUI programs such as command-line tools and consoles for \
|
||||
servers."
|
||||
HOMEPAGE="https://qt.io/"
|
||||
COPYRIGHT="2015-2025 The Qt Company Ltd."
|
||||
COPYRIGHT="2015-2026 The Qt Company Ltd."
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU LGPL v3
|
||||
GNU FDL v1"
|
||||
REVISION="1"
|
||||
QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive"
|
||||
QT_MIRROR_URI="https://download.qt.io/official_releases"
|
||||
SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtquick3dphysics-everywhere-src-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="5f1e2f7e591faf14d0d7e6e397a15707a7b8536e52cb3c07ce3425ddf55826a0"
|
||||
CHECKSUM_SHA256="b7aff67bd05794351d7c19b178c54b674afc3ea2b4632df892aaee98f12c1cdb"
|
||||
SOURCE_DIR="qtquick3dphysics-everywhere-src-$portVersion"
|
||||
PATCHES="qt6_quick3dphysics-$portVersion.patchset"
|
||||
|
||||
@@ -73,7 +73,6 @@ BUILD_PREREQUIRES="
|
||||
cmd:find
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:ninja
|
||||
cmd:perl
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
Reference in New Issue
Block a user