diff --git a/testing/qt6-mqtt/APKBUILD b/testing/qt6-mqtt/APKBUILD index a3b401b87624fbc960001ecc17e31d0abd03ed6d..7442985bb939ad4d873429d48a95bfb46940cf3b 100644 --- a/testing/qt6-mqtt/APKBUILD +++ b/testing/qt6-mqtt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan de Konink <stefan@konink.de> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qt6-mqtt -pkgver=6.5.1 +pkgver=6.5.2 pkgrel=0 pkgdesc="Qt module that Provides MQTT communication" url="https://qt.io/" @@ -43,5 +43,5 @@ package() { } sha512sums=" -5c296848e32ba4ed97b8e40f4f97d3af3c5b46ac56b86be63c672972b5e04cf02f5a4caa79005db89e0b71d590b9182cd3c0f0c106801331713fb06176bd3e59 qt6-mqtt-6.5.1.tar.gz +7c07b908b961733d8fcf94428c9acf0a197eaf0db6260c9f14c98ac8efe7e845c5aa0e3f42d82bc1905bd5e647e4b0c13ab3d9558709c86ea007976d5eb1dc8c qt6-mqtt-6.5.2.tar.gz " diff --git a/testing/qt6-qtwebengine/APKBUILD b/testing/qt6-qtwebengine/APKBUILD index 11e05730f80e2208e44540e255dde204e1ac7760..6471f0644c4b87bd82cff36f88ef4c7781a23026 100644 --- a/testing/qt6-qtwebengine/APKBUILD +++ b/testing/qt6-qtwebengine/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qt6-qtwebengine -pkgver=6.5.1 -pkgrel=1 +pkgver=6.5.2 +pkgrel=0 pkgdesc="Provides support for web applications using the Chromium browser project" url="https://qt.io/" # riscv64 unknown current CPU @@ -78,6 +78,7 @@ source="https://download.qt.io/$_rel/qt/${pkgver%.*}/${pkgver/_/-}/submodules/qt default-pthread-stacksize.patch fix-narrowing-cast.patch gcc13.patch + lfs64.patch pipewire-fcntl-call.patch systypes.patch " @@ -89,8 +90,8 @@ build() { export NM=llvm-nm export RANLIB=llvm-ranlib export LDFLAGS="$LDFLAGS -fuse-ld=lld" - export CFLAGS="$CFLAGS -Wno-builtin-macro-redefined -Wno-deprecated-declarations" - export CXXFLAGS="$CXXFLAGS -Wno-builtin-macro-redefined -Wno-deprecated-declarations" + export CFLAGS="${CFLAGS/-fstack-clash-protection} -D_LARGEFILE64_SOURCE -Wno-builtin-macro-redefined -Wno-deprecated-declarations" + export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection} -D_LARGEFILE64_SOURCE -Wno-builtin-macro-redefined -Wno-deprecated-declarations" cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ @@ -131,7 +132,7 @@ package() { } sha512sums=" -68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428 qtwebengine-everywhere-src-6.5.1.tar.xz +f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12 qtwebengine-everywhere-src-6.5.2.tar.xz 9a05c07c4616053d247b1200cdd1883e8067babc5ab5bc169ea1599643d120c445fb4db586f5e247e122711f37e148d13fc8a7443d879877d7c82fb1f778db58 0001-Enable-building-on-musl.patch 7b6ed37975c55e5ebc20b9a6207044b6f86102d69caa6fdd457078a7ae242026d3de5537651d3d86497ba18ddd1e97523aa082da4dff703a8a4f618bccd4af57 0002-temp-failure-retry.patch 82433802b2f22391a6321782eae7f60a2a8453b3a73199cfb7a4e7cd3fc7388ef9896651a7a55d0c8ec67bccb9d4b065709e0f48c0eeadda670225c0462590bb 0003-qt-musl-mallinfo.patch @@ -150,6 +151,7 @@ cebe80c406d5d7232d70fbe0988eb40d9d420bd785f9398b65ebfe6c56098ac6345dd5c907fcbdf0 8cac36aa644cb1c7d6cbe860dbc5aec2298eb5115db3ea1ac38bcd084ff1185ab21af954d3def0a823863abfe758e16fe231365ba7d8cd4348d5bd6147fae5f3 default-pthread-stacksize.patch 2bf4b7e66edc7cd3afddbcdfc9501d55eba4b6d11bbbc75f4107042f909a1fd5b5166e9274d2da53241f2c1cfde7472dfc640af23e3a3d9c2d01cf72ae5cfffd fix-narrowing-cast.patch 83057708d6deac9141c88637cccaaabef33d9276e9f02e123d7a782ab5cae46073bfcf6bf2aa4c57eca467b6bc3b6416354a5e7352ad38e71cfe5f46ae8d488a gcc13.patch +cef2bef9b6daac9c2d51e6a3430a6e7ffa21ecec7ce6a2160891db8fd24d32b47237a77a6b6bf1c9f52d7c9a4dadc9d5ea4bffa7da012367882aae8bdd3df926 lfs64.patch 3c3965bf6d7835c0f1744a11675a301639379fac93df7a9b631c029b652d32708f421ca8461595eb58d5e7e886ba5f959ff04436bae204e295d4bfb6f905bd37 pipewire-fcntl-call.patch 3f9268b47bcb03b485e39e49188f85e5943237713bdb1cf00e97b456064345314c02387c135f979a26cf48fc636a5d492ba7ce817741d4651ce404358a35751a systypes.patch " diff --git a/testing/qt6-qtwebengine/lfs64.patch b/testing/qt6-qtwebengine/lfs64.patch new file mode 100644 index 0000000000000000000000000000000000000000..871f3b6b671fb160e26af79b8dd2e2a276b47af8 --- /dev/null +++ b/testing/qt6-qtwebengine/lfs64.patch @@ -0,0 +1,41 @@ +diff --git a/src/3rdparty/gn/src/base/files/file.h b/src/3rdparty/gn/src/base/files/file.h +index 2c94eb4..b2db71a 100644 +--- a/src/3rdparty/gn/src/base/files/file.h ++++ b/src/3rdparty/gn/src/base/files/file.h +@@ -26,7 +26,7 @@ namespace base { + defined(OS_ANDROID) && __ANDROID_API__ < 21 + typedef struct stat stat_wrapper_t; + #elif defined(OS_POSIX) || defined(OS_FUCHSIA) +-typedef struct stat64 stat_wrapper_t; ++typedef struct stat stat_wrapper_t; + #endif + + // Thin wrapper around an OS-level file. +diff --git a/src/3rdparty/gn/src/base/files/file_util_posix.cc b/src/3rdparty/gn/src/base/files/file_util_posix.cc +index ac281c4..f05a2e8 100644 +--- a/src/3rdparty/gn/src/base/files/file_util_posix.cc ++++ b/src/3rdparty/gn/src/base/files/file_util_posix.cc +@@ -70,10 +70,10 @@ int CallLstat(const char* path, stat_wrapper_t* sb) { + } + #else + int CallStat(const char* path, stat_wrapper_t* sb) { +- return stat64(path, sb); ++ return stat(path, sb); + } + int CallLstat(const char* path, stat_wrapper_t* sb) { +- return lstat64(path, sb); ++ return lstat(path, sb); + } + #endif + +--- a/src/3rdparty/gn/src/base/files/file_posix.cc ++++ b/src/3rdparty/gn/src/base/files/file_posix.cc +@@ -32,7 +32,7 @@ + } + #else + int CallFstat(int fd, stat_wrapper_t* sb) { +- return fstat64(fd, sb); ++ return fstat(fd, sb); + } + #endif + diff --git a/testing/qt6-qtwebview/APKBUILD b/testing/qt6-qtwebview/APKBUILD index c06818020c1da9138029fb23a8638d9e5e28c035..14a007ef47bde95355763c569de6cdeeac11cdb1 100644 --- a/testing/qt6-qtwebview/APKBUILD +++ b/testing/qt6-qtwebview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qt6-qtwebview -pkgver=6.5.1 +pkgver=6.5.2 pkgrel=0 pkgdesc="Provides a way to display web content in a QML application" url="https://qt.io/" @@ -56,5 +56,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -669debc9b7a7562a1343bb65a7d1775c42404dd356184fc5d5180f5674cb8682e8e391f9673985263b8c2a7be1c0f6d5de1d2a20d6489cc5ef685b7a1280a01d qtwebview-everywhere-src-6.5.1.tar.xz +fd392bd0fce6534d09c79e43db5f16514ae243edd31e0c0ea3a9028a65af5b5c3e5b770ff91e6b924141c412b6e8ca2538767e8280d761f7d33428a5c06daf2a qtwebview-everywhere-src-6.5.2.tar.xz "