components/library/qt6/Makefile
@@ -10,21 +10,19 @@ # # Copyright 2022 Daniel Chan # Copyright 2023 Niklas Poslovski # USE_OPENSSL11= yes include ../../../make-rules/shared-macros.mk QT6_VERSION = 6.3 QT6_VERSION = 6.6 COMPONENT_NAME= qt COMPONENT_VERSION_MJR= $(QT6_VERSION) COMPONENT_VERSION= $(COMPONENT_VERSION_MJR).2 COMPONENT_REVISION= 1 COMPONENT_VERSION= $(COMPONENT_VERSION_MJR).0 COMPONENT_SUMMARY= Qt cross-platform application and UI framework COMPONENT_PROJECT_URL= https://www.qt.io/ COMPONENT_SRC= $(COMPONENT_NAME)-everywhere-src-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= sha256:b90524f686224a0e5a945c1d65307e16a375348dbe275c9ac11de171fe31374a COMPONENT_ARCHIVE_HASH= sha256:652538fcb5d175d8f8176c84c847b79177c87847b7273dccaec1897d80b50002 COMPONENT_ARCHIVE_URL= https://download.qt.io/official_releases/qt/$(COMPONENT_VERSION_MJR)/$(COMPONENT_VERSION)/single/$(COMPONENT_ARCHIVE) COMPONENT_FMRI= library/qt6 COMPONENT_CLASSIFICATION= Desktop (GNOME)/Libraries @@ -37,19 +35,11 @@ QT_PREFIX= $(QT6_BASEDIR) QT_ARCHSUBDIR.64= $(MACH64) QT_PLATFORM.64= solaris-g++-64 QT_ARCHSUBDIR= $(MACH64) QT_PLATFORM= solaris-g++-64 # build with the distribution preferred libjpeg implementation CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS) CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS) LDFLAGS += $(JPEG_LDFLAGS) OPENSSL_VERSION = 1.1 LDFLAGS += -Wl,-rpath,$(QT6_LIBDIR):$(CLANG_LIBDIR):$(MYSQL_LIBDIR):$(PG_LIBDIR) LDFLAGS += -Wl,-rpath,$(QT6_LIBDIR):$(USRLIBDIR)/xorg/$(MACH64)/:$(CLANG_LIBDIR):$(MYSQL_LIBDIR):$(PG_LIBDIR):$(JPEG_LIBDIR) CONFIGURE_OPTIONS = -prefix $(QT_PREFIX) #CONFIGURE_OPTIONS+= -verbose CONFIGURE_OPTIONS+= -opensource CONFIGURE_OPTIONS+= -confirm-license CONFIGURE_OPTIONS+= -nomake examples @@ -60,26 +50,28 @@ CONFIGURE_OPTIONS+= -xcb-xlib CONFIGURE_OPTIONS+= -bundled-xcb-xinput CONFIGURE_OPTIONS+= -openssl-linked CONFIGURE_OPTIONS+= -bindir $(QT_PREFIX)/bin/$(QT_ARCHSUBDIR.$(BITS)) CONFIGURE_OPTIONS+= -libexecdir $(QT_PREFIX)/bin/$(QT_ARCHSUBDIR.$(BITS)) CONFIGURE_OPTIONS+= -libdir $(QT_PREFIX)/lib/$(QT_ARCHSUBDIR.$(BITS)) CONFIGURE_OPTIONS+= -plugindir $(QT_PREFIX)/plugins/$(QT_ARCHSUBDIR.$(BITS)) CONFIGURE_OPTIONS+= -qmldir $(QT_PREFIX)/qml/$(QT_ARCHSUBDIR.$(BITS)) CONFIGURE_OPTIONS+= -platform $(QT_PLATFORM.$(BITS)) CONFIGURE_OPTIONS+= -bindir $(QT_PREFIX)/bin/$(QT_ARCHSUBDIR) CONFIGURE_OPTIONS+= -libexecdir $(QT_PREFIX)/bin/$(QT_ARCHSUBDIR) CONFIGURE_OPTIONS+= -libdir $(QT_PREFIX)/lib/$(QT_ARCHSUBDIR) CONFIGURE_OPTIONS+= -plugindir $(QT_PREFIX)/plugins/$(QT_ARCHSUBDIR) CONFIGURE_OPTIONS+= -qmldir $(QT_PREFIX)/qml/$(QT_ARCHSUBDIR) CONFIGURE_OPTIONS+= -platform $(QT_PLATFORM) CONFIGURE_OPTIONS+= -plugin-sql-mysql CONFIGURE_OPTIONS+= -plugin-sql-psql CONFIGURE_OPTIONS+= -plugin-sql-sqlite CONFIGURE_OPTIONS+= -plugin-system-sqlite CONFIGURE_OPTIONS+= -cmake-generator 'Unix Makefiles' CONFIGURE_OPTIONS+= -no-gstreamer CONFIGURE_OPTIONS+= -no-pch CONFIGURE_OPTIONS.64+= CMAKE_PREFIX_PATH="$(BUILD_DIR)/amd64/qtbase/lib/amd64/cmake;$(CLANG_PREFIX)" CONFIGURE_OPTIONS.64+= MySQL_LIBRARY=$(MYSQL_LIBDIR)/libmysqlclient.so CONFIGURE_OPTIONS.64+= MySQL_INCLUDE_DIR=$(MYSQL_INCDIR) CONFIGURE_OPTIONS.64+= PostgreSQL_LIBRARY=$(PG_LIBDIR)/libpq.so CONFIGURE_OPTIONS.64+= PostgreSQL_INCLUDE_DIR=$(PG_INCDIR) CONFIGURE_OPTIONS+= $(CONFIGURE_OPTIONS.$(BITS)) COMPONENT_POST_CONFIGURE_ACTION.64= mkdir -p $(BUILD_DIR)/amd64/qtbase/translations CONFIGURE_OPTIONS+= -skip qtgrpc CONFIGURE_OPTIONS+= CMAKE_PREFIX_PATH="$(BUILD_DIR)/amd64/qtbase/lib/amd64/cmake" CONFIGURE_OPTIONS+= MySQL_LIBRARY=$(MYSQL_LIBDIR)/libmysqlclient.so CONFIGURE_OPTIONS+= MySQL_INCLUDE_DIR=$(MYSQL_INCDIR) CONFIGURE_OPTIONS+= PostgreSQL_LIBRARY=$(PG_LIBDIR)/libpq.so CONFIGURE_OPTIONS+= PostgreSQL_INCLUDE_DIR=$(PG_INCDIR) CONFIGURE_OPTIONS+= JPEG_LIBRARY=$(JPEG_LIBDIR)/libjpeg.so CONFIGURE_OPTIONS+= JPEG_INCLUDE_DIR=$(JPEG_INCDIR) COMPONENT_POST_CONFIGURE_ACTION= mkdir -p $(BUILD_DIR)/amd64/qtbase/translations ; COMPONENT_POST_CONFIGURE_ACTION+= $(GSED) -i 's;LINK_LIBRARIES =;LINK_LIBRARIES = -lgcc ;' $(@D)/build.ninja ; COMPONENT_INSTALL_ENV = DESTDIR=$(PROTO_DIR) include $(WS_MAKE_RULES)/cmake.mk @@ -91,7 +83,21 @@ $(COMPONENT_POST_CONFIGURE_ACTION) $(TOUCH) $@ COMPONENT_INSTALL_ENV+= INSTALL_ROOT=$(PROTO_DIR) # build the configured source $(BUILD_DIR)/%/.built: $(BUILD_DIR)/%/.configured $(COMPONENT_PRE_BUILD_ACTION) (cd $(@D) ; $(ENV) $(COMPONENT_BUILD_ENV) \ cmake --build . --parallel) $(COMPONENT_POST_BUILD_ACTION) $(TOUCH) $@ # install the built source into a prototype area $(BUILD_DIR)/%/.installed: $(BUILD_DIR)/%/.built $(COMPONENT_PRE_INSTALL_ACTION) (cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) \ cmake --install .) $(COMPONENT_POST_INSTALL_ACTION) $(TOUCH) $@ # Build dependencies REQUIRED_PACKAGES += $(CLANG_DEVELOPER_PKG) @@ -102,37 +108,36 @@ REQUIRED_PACKAGES += x11/keyboard/data-xkb REQUIRED_PACKAGES += x11/library/libpthread-stubs # Manually added dependencies REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG) # Auto-generated dependencies PYTHON_REQUIRED_PACKAGES += runtime/python REQUIRED_PACKAGES += $(CLANG_RUNTIME_PKG) REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG) REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG) REQUIRED_PACKAGES += $(ICU_LIBRARY_PKG) REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG) REQUIRED_PACKAGES += $(MYSQL_LIBRARY_PKG) REQUIRED_PACKAGES += $(PG_LIBRARY_PKG) REQUIRED_PACKAGES += SUNWcs REQUIRED_PACKAGES += codec/jasper REQUIRED_PACKAGES += compress/zstd REQUIRED_PACKAGES += database/sqlite-3 REQUIRED_PACKAGES += image/library/libjpeg6 REQUIRED_PACKAGES += image/library/libjpeg6-ijg REQUIRED_PACKAGES += image/library/libpng16 REQUIRED_PACKAGES += image/library/libtiff REQUIRED_PACKAGES += library/audio/gstreamer1 REQUIRED_PACKAGES += library/audio/gstreamer1/plugin/base REQUIRED_PACKAGES += library/audio/pulseaudio REQUIRED_PACKAGES += library/brotli REQUIRED_PACKAGES += library/c++/harfbuzz REQUIRED_PACKAGES += library/desktop/gdk-pixbuf REQUIRED_PACKAGES += library/desktop/gtk3 REQUIRED_PACKAGES += library/desktop/pango REQUIRED_PACKAGES += library/desktop/speech-dispatcher REQUIRED_PACKAGES += library/double-conversion REQUIRED_PACKAGES += library/glib2 REQUIRED_PACKAGES += library/graphics/libmng REQUIRED_PACKAGES += library/icu REQUIRED_PACKAGES += library/libwebp REQUIRED_PACKAGES += library/pcre2 REQUIRED_PACKAGES += library/print/cups-libs REQUIRED_PACKAGES += library/security/openssl-11 REQUIRED_PACKAGES += library/security/openssl-31 REQUIRED_PACKAGES += library/unixodbc REQUIRED_PACKAGES += library/zlib REQUIRED_PACKAGES += shell/bash @@ -144,12 +149,14 @@ REQUIRED_PACKAGES += system/library/math REQUIRED_PACKAGES += system/library/security/gss REQUIRED_PACKAGES += text/hunspell REQUIRED_PACKAGES += x11/library/libdrm REQUIRED_PACKAGES += x11/library/libice REQUIRED_PACKAGES += x11/library/libsm REQUIRED_PACKAGES += x11/library/libx11 REQUIRED_PACKAGES += x11/library/libxcb REQUIRED_PACKAGES += x11/library/libxkbcommon REQUIRED_PACKAGES += x11/library/mesa REQUIRED_PACKAGES += x11/library/xcb-util-cursor REQUIRED_PACKAGES += x11/library/xcb-util-image REQUIRED_PACKAGES += x11/library/xcb-util-keysyms REQUIRED_PACKAGES += x11/library/xcb-util-renderutil components/library/qt6/manifests/sample-manifest.p5m
Diff too large components/library/qt6/patches/04-qv4assemblercommon_p.h.patch
File was deleted components/library/qt6/patches/05-lupdateCmakeLists.txt.patch
@@ -6,6 +6,6 @@ endif() + +set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti") # special case end ##################################################################### ## lupdate Tool: components/library/qt6/patches/07-python-version.patch
@@ -1,9 +1,27 @@ diff -Nru qt-everywhere-src-6.4.2.orig/qtbase/util/testrunner/qt-testrunner.py qt-everywhere-src-6.4.2/qtbase/util/testrunner/qt-testrunner.py --- qt-everywhere-src-6.4.2.orig/qtbase/util/testrunner/qt-testrunner.py 2022-11-16 08:54:24.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtbase/util/testrunner/qt-testrunner.py 2023-01-12 16:14:36.145376179 +0000 --- qt-everywhere-src-6.4.2.orig/qtbase/util/testrunner/qt-testrunner.py 2022-11-16 08:54:24.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtbase/util/testrunner/qt-testrunner.py 2023-01-12 16:14:36.145376179 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3.9 # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 diff -Nru qt-everywhere-src-6.5.1.orig/qtbase/util/testrunner/sanitizer-testrunner.py qt-everywhere-src-6.5.1/qtbase/util/testrunner/sanitizer-testrunner.py --- qt-everywhere-src-6.5.1.orig/qtbase/util/testrunner/sanitizer-testrunner.py 2023-06-12 08:54:24.000000000 +0000 +++ qt-everywhere-src-6.5.1/qtbase/util/testrunner/sanitizer-testrunner.py 2023-06-12 16:14:36.145376179 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3.9 # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 ############################################################################# diff -Nru qt-everywhere-src-6.4.2.orig/qtbase/mkspecs/features/uikit/devices.py qt-everywhere-src-6.4.2/qtbase/mkspecs/features/uikit/devices.py --- qt-everywhere-src-6.4.2.orig/qtbase/mkspecs/features/uikit/devices.py 2022-11-16 08:54:24.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtbase/mkspecs/features/uikit/devices.py 2023-01-12 16:16:13.690349675 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3.9 # Copyright (C) 2017 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
New file @@ -0,0 +1,264 @@ diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h 2023-01-12 09:46:33.266160798 +0000 @@ -34,7 +34,7 @@ #if PX_WINDOWS_FAMILY #include "foundation/windows/PxWindowsIntrinsics.h" -#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4) +#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 || PX_SOLARIS) #include "foundation/unix/PxUnixIntrinsics.h" #elif PX_XBOXONE #include "foundation/XboxOne/PxXboxOneIntrinsics.h" diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h 2023-01-12 10:07:19.377991385 +0000 @@ -108,6 +108,8 @@ #define PX_PS4 1 #elif defined(__NX__) #define PX_SWITCH 1 +#elif defined(__sun) +#define PX_SOLARIS 1 #else #error "Unknown operating system" #endif @@ -193,6 +195,9 @@ #ifndef PX_SWITCH #define PX_SWITCH 0 #endif +#ifndef PX_SOLARIS +#define PX_SOLARIS 0 +#endif #ifndef PX_UWP #define PX_UWP 0 #endif @@ -253,7 +258,7 @@ #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__ -#define PX_UNIX_FAMILY (PX_LINUX_FAMILY || PX_APPLE_FAMILY) // shortcut for unix/posix platforms +#define PX_UNIX_FAMILY (PX_LINUX_FAMILY || PX_APPLE_FAMILY || PX_SOLARIS) // shortcut for unix/posix platforms #if defined(__EMSCRIPTEN__) #define PX_EMSCRIPTEN 1 #else diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h 2023-01-12 09:49:38.925791130 +0000 @@ -33,7 +33,7 @@ #include "foundation/Px.h" #include "foundation/PxSharedAssert.h" -#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY) +#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SOLARIS) #error "This file should only be included by Unix builds!!" #endif diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsAllocator.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsAllocator.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsAllocator.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsAllocator.h 2023-01-12 09:53:34.519815438 +0000 @@ -118,6 +118,9 @@ #elif PX_SWITCH #include <malloc.h> #define PxAlloca(x) alloca(x) +#elif PX_SOLARIS + #include <alloca.h> + #define PxAlloca(x) alloca(x) #endif #define PxAllocaAligned(x, alignment) ((size_t(PxAlloca(x + alignment)) + (alignment - 1)) & ~size_t(alignment - 1)) diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsFPU.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsFPU.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsFPU.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsFPU.h 2023-01-12 09:55:32.586641342 +0000 @@ -79,7 +79,7 @@ #if PX_WINDOWS_FAMILY || PX_XBOXONE || PX_XBOX_SERIES_X #include "windows/PsWindowsFPU.h" -#elif (PX_LINUX && PX_SSE2) || PX_PS4 || PX_OSX +#elif (PX_LINUX && PX_SSE2) || PX_PS4 || PX_OSX || PX_SOLARIS #include "unix/PsUnixFPU.h" #else PX_INLINE physx::shdfnd::SIMDGuard::SIMDGuard() diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsIntrinsics.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsIntrinsics.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsIntrinsics.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsIntrinsics.h 2023-01-12 09:56:07.055424800 +0000 @@ -34,7 +34,7 @@ #if PX_WINDOWS_FAMILY #include "windows/PsWindowsIntrinsics.h" -#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4) +#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 || PX_SOLARIS) #include "unix/PsUnixIntrinsics.h" #elif PX_XBOXONE #include "XboxOne/PsXboxOneIntrinsics.h" diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsThread.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsThread.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsThread.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsThread.h 2023-01-12 09:54:47.501172410 +0000 @@ -41,7 +41,7 @@ #if PX_WINDOWS_FAMILY || PX_XBOXONE || PX_XBOX_SERIES_X #define PxSpinLockPause() __asm pause -#elif PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SWITCH +#elif PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SWITCH || PX_SOLARIS #define PxSpinLockPause() asm("nop") #else #error "Platform not supported!" diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsTime.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsTime.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsTime.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsTime.h 2023-01-12 09:56:59.177171999 +0000 @@ -84,7 +84,7 @@ Second getLastTime() const; private: -#if PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 +#if PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 || PX_SOLARIS Second mLastTime; #else int64_t mTickCount; diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixFPU.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixFPU.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixFPU.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixFPU.h 2023-01-12 12:14:21.264356558 +0000 @@ -32,7 +32,7 @@ #include "foundation/PxPreprocessor.h" -#if PX_LINUX || PX_PS4 || PX_OSX +#if PX_LINUX || PX_PS4 || PX_OSX || PX_SOLARIS #if PX_X86 || PX_X64 #if PX_EMSCRIPTEN diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixIntrinsics.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixIntrinsics.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixIntrinsics.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixIntrinsics.h 2023-01-12 09:58:21.950222631 +0000 @@ -45,7 +45,7 @@ // this file is for internal intrinsics - that is, intrinsics that are used in // cross platform code but do not appear in the API -#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY) +#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SOLARIS) #error "This file should only be included by unix builds!!" #endif diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/physxextensions/src/serialization/SnSerialUtils.cpp qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/physxextensions/src/serialization/SnSerialUtils.cpp --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/physxextensions/src/serialization/SnSerialUtils.cpp 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/physxextensions/src/serialization/SnSerialUtils.cpp 2023-01-12 10:03:41.356389570 +0000 @@ -39,7 +39,7 @@ namespace { -#define SN_NUM_BINARY_PLATFORMS 19 +#define SN_NUM_BINARY_PLATFORMS 20 const PxU32 sBinaryPlatformTags[SN_NUM_BINARY_PLATFORMS] = { PX_MAKE_FOURCC('W','_','3','2'), @@ -82,6 +82,7 @@ "uwparm64", "macarm", "linuxarm", + "solaris64", "unknown", }; @@ -127,8 +128,10 @@ return sBinaryPlatformTags[16]; #elif PX_LINUX && PX_ARM return sBinaryPlatformTags[17]; +#elif PX_SOLARIS && PX_A64 + return sBinaryPlatformTags[18] #else - return sBinaryPlatformTags[18]; + return sBinaryPlatformTags[19]; #endif } diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/sse2/PsUnixSse2AoS.h qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/sse2/PsUnixSse2AoS.h --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/sse2/PsUnixSse2AoS.h 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/sse2/PsUnixSse2AoS.h 2023-01-12 10:38:01.826091091 +0000 @@ -43,7 +43,7 @@ namespace aos { -#if PX_EMSCRIPTEN +#if PX_EMSCRIPTEN || PX_SOLARIS typedef int8_t __int8_t; typedef int16_t __int16_t; typedef int32_t __int32_t; diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixFPU.cpp qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixFPU.cpp --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixFPU.cpp 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixFPU.cpp 2023-01-12 11:27:56.161455763 +0000 @@ -28,7 +28,7 @@ // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #include "PsFPU.h" -#if !(defined(__CYGWIN__) || PX_ANDROID || PX_PS4) +#if !(defined(__CYGWIN__) || PX_ANDROID || PX_PS4 || PX_SOLARIS) #include <fenv.h> PX_COMPILE_TIME_ASSERT(8 * sizeof(uint32_t) >= sizeof(fenv_t)); #endif @@ -42,6 +42,8 @@ { #if defined(__CYGWIN__) #pragma message "FPUGuard::FPUGuard() is not implemented" +#elif PX_SOLARIS +#pragma message "FPUGuard::FPUGuard() is not implemented" #elif PX_ANDROID // not supported unless ARM_HARD_FLOAT is enabled. #elif PX_PS4 @@ -72,6 +74,8 @@ { #if defined(__CYGWIN__) #pragma message "FPUGuard::~FPUGuard() is not implemented" +#elif PX_SOLARIS +#pragma message "FPUGuard::~FPUGuard() is not implemented" #elif PX_ANDROID // not supported unless ARM_HARD_FLOAT is enabled. #elif PX_PS4 diff -Nru qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp --- qt-everywhere-src-6.4.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp 2022-12-12 20:36:44.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp 2023-01-12 11:37:01.207995499 +0000 @@ -36,7 +36,7 @@ #include "PsThread.h" #include <math.h> -#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && __GLIBC__ +#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && !PX_SOLARIS && __GLIBC__ #include <bits/local_lim.h> // PTHREAD_STACK_MIN #endif #include <stdio.h> @@ -44,7 +44,7 @@ #include <unistd.h> #if !PX_PS4 #include <sys/syscall.h> -#if !PX_APPLE_FAMILY && !PX_EMSCRIPTEN +#if !PX_APPLE_FAMILY && !PX_EMSCRIPTEN && !PX_SOLARIS #include <asm/unistd.h> #include <sys/resource.h> #endif @@ -115,7 +115,7 @@ // AM: TODO: neither of the below are implemented #elif PX_APPLE_FAMILY threadImpl.tid = syscall(SYS_gettid); -#elif PX_EMSCRIPTEN +#elif PX_EMSCRIPTEN || PX_SOLARIS threadImpl.tid = pthread_self(); #else threadImpl.tid = syscall(__NR_gettid); @@ -313,6 +313,8 @@ prevMask = setAffinityMaskPS4(getThread(this)->thread, mask); #elif PX_EMSCRIPTEN // not supported +#elif PX_SOLARIS + // not supported #elif !PX_APPLE_FAMILY // Apple doesn't support syscall with getaffinity and setaffinity int32_t errGet = syscall(__NR_sched_getaffinity, getThread(this)->tid, sizeof(prevMask), &prevMask); if(errGet < 0) diff -Nru qt-everywhere-src-6.5.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/pvd/include/PxProfileAllocatorWrapper.h qt-everywhere-src-6.5.2/qtquick3dphysics/src/3rdparty/PhysX/source/pvd/include/PxProfileAllocatorWrapper.h --- qt-everywhere-src-6.5.2.orig/qtquick3dphysics/src/3rdparty/PhysX/source/pvd/include/PxProfileAllocatorWrapper.h 2023-09-19 22:33:53.903393945 +0200 +++ qt-everywhere-src-6.5.2/qtquick3dphysics/src/3rdparty/PhysX/source/pvd/include/PxProfileAllocatorWrapper.h 2023-09-19 22:34:06.459406024 +0200 @@ -38,6 +38,7 @@ #include "PsArray.h" #include "PsHashMap.h" +#include <typeinfo> namespace physx { namespace profile {
New file @@ -0,0 +1,14 @@ diff -Nru qt-everywhere-src-6.4.2.orig/qtbase/src/corelib/global/qversiontagging.h qt-everywhere-src-6.4.2/qtbase/src/corelib/global/qversiontagging.h --- qt-everywhere-src-6.4.2.orig/qtbase/src/corelib/global/qversiontagging.h 2022-11-16 08:54:24.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtbase/src/corelib/global/qversiontagging.h 2023-01-12 12:33:44.008992611 +0000 @@ -109,7 +109,9 @@ #endif #ifdef Q_OF_ELF -# define QT_VERSION_TAG_SYMBOL(prefix, sym, m, n) sym +//# define QT_VERSION_TAG_SYMBOL(prefix, sym, m, n) sym +# define QT_VERSION_TAG_SYMBOL2(prefix, sym, m, n) prefix ## sym ## _ ## m ## _ ## n +# define QT_VERSION_TAG_SYMBOL(prefix, sym, m, n) QT_VERSION_TAG_SYMBOL2(prefix, sym, m, n) #else # define QT_VERSION_TAG_SYMBOL2(prefix, sym, m, n) prefix ## sym ## _ ## m ## _ ## n # define QT_VERSION_TAG_SYMBOL(prefix, sym, m, n) QT_VERSION_TAG_SYMBOL2(prefix, sym, m, n) components/library/qt6/patches/12-no-exclude-libs.patch
New file @@ -0,0 +1,12 @@ diff -Nru qt-everywhere-src-6.4.2.orig/qtmultimedia/cmake/FindFFmpeg.cmake qt-everywhere-src-6.4.2/qtmultimedia/cmake/FindFFmpeg.cmake --- qt-everywhere-src-6.4.2.orig/qtmultimedia/cmake/FindFFmpeg.cmake 2022-12-12 20:36:40.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtmultimedia/cmake/FindFFmpeg.cmake 2023-01-12 13:37:20.345900539 +0000 @@ -248,7 +248,7 @@ endif() target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "${${_component}_LIBRARY}") if (UNIX AND NOT APPLE) - target_link_options(FFmpeg::${_lowerComponent} INTERFACE "-Wl,--exclude-libs=lib${_lowerComponent}") + target_link_options(FFmpeg::${_lowerComponent} INTERFACE "-W") endif () endif() else() components/library/qt6/patches/13-disable-encumbered.patch
New file @@ -0,0 +1,21 @@ diff -Nru qt-everywhere-src-6.4.2.orig/qtmultimedia/src/multimedia/configure.cmake qt-everywhere-src-6.4.2/qtmultimedia/src/multimedia/configure.cmake --- qt-everywhere-src-6.4.2.orig/qtmultimedia/src/multimedia/configure.cmake 2022-12-12 20:36:40.000000000 +0000 +++ qt-everywhere-src-6.4.2/qtmultimedia/src/multimedia/configure.cmake 2023-01-13 11:41:44.337836000 +0000 @@ -73,7 +73,7 @@ LABEL "FFmpeg" ENABLE INPUT_ffmpeg STREQUAL 'yes' DISABLE INPUT_ffmpeg STREQUAL 'no' - CONDITION FFmpeg_FOUND AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio) + CONDITION false ) qt_feature("alsa" PUBLIC PRIVATE LABEL "ALSA (experimental)" @@ -111,7 +111,7 @@ ) qt_feature("gstreamer_photography" PRIVATE LABEL "GStreamer Photography" - CONDITION ( QT_FEATURE_gstreamer_1_0 AND GStreamer_Photography_FOUND ) + CONDITION false ) qt_feature("gstreamer_gl" PRIVATE LABEL "GStreamer OpenGL" components/library/qt6/patches/14-qv4stacklimits.cpp.patch
New file @@ -0,0 +1,12 @@ diff -Nru qt-everywhere-src-6.5.1.orig/qtdeclarative/src/qml/memory/qv4stacklimits.cpp qt-everywhere-src-6.5.1/qtdeclarative/src/qml/memory/qv4stacklimits.cpp --- qt-everywhere-src-6.5.1.orig/qtdeclarative/src/qml/memory/qv4stacklimits.cpp 2023-05-16 09:17:22.000000000 +0200 +++ qt-everywhere-src-6.5.1/qtdeclarative/src/qml/memory/qv4stacklimits.cpp 2023-06-12 19:02:06.160995926 +0200 @@ -235,7 +235,7 @@ pthread_t thread = pthread_self(); pthread_attr_t sattr; -# if defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(Q_OS_NETBSD) +# if defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(Q_OS_NETBSD) || defined(Q_OS_SOLARIS) pthread_attr_get_np(thread, &sattr); # else pthread_getattr_np(thread, &sattr); components/library/qt6/patches/15-FBXBinaryTokenizer.cpp.patch
New file @@ -0,0 +1,12 @@ diff -Nru qt-everywhere-src-6.6.0.orig/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp qt-everywhere-src-6.6.0/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp --- qt-everywhere-src-6.6.0.orig/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-10-04 00:00:49.000000000 +0200 +++ qt-everywhere-src-6.6.0/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-11-26 21:55:33.251058769 +0100 @@ -50,7 +50,7 @@ #include "FBXTokenizer.h" #include "FBXUtil.h" #include <assimp/defs.h> -#include <stdint.h> +#include <cstdint> #include <assimp/Exceptional.h> #include <assimp/ByteSwapper.h> #include <assimp/DefaultLogger.hpp> components/library/qt6/pkg5
@@ -1,6 +1,5 @@ { "dependencies": [ "SUNWcs", "codec/jasper", "compress/zstd", "database/freetds", @@ -9,17 +8,19 @@ "database/postgres-15/developer", "database/postgres-15/library", "database/sqlite-3", "developer/clang-15", "image/library/libjpeg6", "image/library/libjpeg6-ijg", "developer/clang-17", "image/library/libjpeg8-turbo", "image/library/libpng16", "image/library/libtiff", "library/audio/gstreamer1", "library/audio/gstreamer1/plugin/base", "library/audio/pulseaudio", "library/brotli", "library/c++/harfbuzz", "library/desktop/gdk-pixbuf", "library/desktop/gtk3", "library/desktop/pango", "library/desktop/speech-dispatcher", "library/double-conversion", "library/glib2", "library/graphics/libmng", @@ -27,10 +28,10 @@ "library/libwebp", "library/pcre2", "library/print/cups-libs", "library/security/openssl-11", "library/security/openssl-31", "library/unixodbc", "library/zlib", "runtime/clang-15", "runtime/clang-17", "runtime/python-39", "shell/bash", "shell/ksh93", @@ -38,13 +39,14 @@ "system/library", "system/library/fontconfig", "system/library/freetype-2", "system/library/g++-10-runtime", "system/library/gcc-10-runtime", "system/library/g++-13-runtime", "system/library/gcc-13-runtime", "system/library/libdbus", "system/library/math", "system/library/security/gss", "text/hunspell", "x11/keyboard/data-xkb", "x11/library/libdrm", "x11/library/libice", "x11/library/libpthread-stubs", "x11/library/libsm", @@ -52,6 +54,7 @@ "x11/library/libxcb", "x11/library/libxkbcommon", "x11/library/mesa", "x11/library/xcb-util-cursor", "x11/library/xcb-util-image", "x11/library/xcb-util-keysyms", "x11/library/xcb-util-renderutil", components/library/qt6/qt6.p5m
Diff too large
