Qt, bump to version 6.10.3 (#13935)

This commit is contained in:
Schrijvers Luc
2026-04-13 14:15:19 +02:00
committed by GitHub
parent 9aadbc5e80
commit 6ea379be33
80 changed files with 174 additions and 5625 deletions

View File

@@ -1,14 +1,14 @@
From 9815e10b39d63d6433e66e311d78e93e0b44b358 Mon Sep 17 00:00:00 2001
From c83292167b43f48a381ef6a5c1b38cea7fc9b895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 11 Feb 2019 15:53:20 +1000
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index 8721278..da10678 100644
index 573b742..6678c61 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -47,13 +47,19 @@ static QStringList filteredDeviceFilePaths()
@@ -48,13 +48,19 @@ static QStringList filteredDeviceFilePaths()
<< QStringLiteral("cu*");
#elif defined(Q_OS_QNX)
<< QStringLiteral("ser*");
@@ -30,5 +30,5 @@ index 8721278..da10678 100644
deviceDir.setNameFilters(deviceFileNameFilterList);
deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
--
2.51.0
2.52.0

View File

@@ -1,34 +0,0 @@
From eceaeaec743a6d2de9f05ba4942106e2af05f935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 11 Feb 2019 15:53:20 +1000
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index 93760e2..d9a45af 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -79,13 +79,19 @@ static QStringList filteredDeviceFilePaths()
<< QStringLiteral("cu*");
#elif defined(Q_OS_QNX)
<< QStringLiteral("ser*");
+#elif defined(Q_OS_HAIKU)
+ << QStringLiteral("*serial*")
+ << QStringLiteral("usb*");
#else
;
#endif
QStringList result;
-
+#if defined(Q_OS_HAIKU)
+ QDir deviceDir(QStringLiteral("/dev/ports"));
+#else
QDir deviceDir(QStringLiteral("/dev"));
+#endif
if (deviceDir.exists()) {
deviceDir.setNameFilters(deviceFileNameFilterList);
deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
--
2.30.2

View File

@@ -11,12 +11,12 @@ LICENSE="GNU LGPL v2.1
REVISION="1"
QT_MIRROR_URI="https://download.qt.io/official_releases"
SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtserialport-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="b40cbf29da111ffa8fee7e7cb44b9097042782cd17a10448a83ff3156cdebd6b"
CHECKSUM_SHA256="3fb30bec133316b6f65b6e03a38087a59c7d337cd9b021486a814a9bc10a31ef"
SOURCE_DIR="qtserialport-everywhere-src-$portVersion"
PATCHES="qt6_serialport-$portVersion.patchset"
ARCHITECTURES="?all !x86_gcc2"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

View File

@@ -1,93 +0,0 @@
SUMMARY="Provides access to hardware and virtual serial ports"
DESCRIPTION="Qt is a cross-platform application framework that is widely \
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-2024 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"
SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtserialport-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="21c34cd1161cb5197bcec662d26a17647b59b6fdff5c364576883c42dbd3b4fc"
SOURCE_DIR="qtserialport-everywhere-src-$portVersion"
PATCHES="qt6_serialport-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
qt6_serialport$secondaryArchSuffix = $portVersion compat >= 6
lib:libQt6SerialPort$secondaryArchSuffix = $portVersion compat >= 6
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
"
PROVIDES_devel="
qt6_serialport${secondaryArchSuffix}_devel = $portVersion compat >= 6
devel:libQt6SerialPort$secondaryArchSuffix = $portVersion compat >= 6
"
REQUIRES_devel="
qt6_serialport$secondaryArchSuffix == $portVersion base
qt6_base${secondaryArchSuffix}_devel
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libQt6Core$secondaryArchSuffix == $portVersion
"
BUILD_PREREQUIRES="
cmd:awk
cmd:cmake
cmd:find
cmd:g++$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:ninja
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:python3
cmd:sed
cmd:xargs
"
BUILD()
{
export DISABLE_ASLR=1
cmake -B build -S $sourceDir -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS=-fPIC
find -name cmake_install.cmake -exec sed -i "s|set(CMAKE_INSTALL_PREFIX.*|set(CMAKE_INSTALL_PREFIX \"$prefix\")|" {} \;
ninja -v -C build $jobArgs
}
INSTALL()
{
ninja -C build install
prepareInstalledDevelLibs \
libQt6SerialPort
# fix pkgconfig files
fixPkgconfig
sed -i "s|includedir=.*|includedir=$includeDir/Qt6|" \
$developLibDir/pkgconfig/*.pc
cd $libDir
for i in lib*.so.6.*;do
ln -fs $i $(echo $i | cut -f1,2 -d.)
done
packageEntries devel \
$developDir \
$libDir/cmake \
$dataDir/Qt6/mkspecs
}