diff --git a/debian/changelog b/debian/changelog index 32f605b..42e598e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ qt6-base (6.3.0+dfsg-1) UNRELEASED; urgency=medium [ Patrick Franz ] * New upstream release (6.3.0). * Update ABI to 6.3.0. + * Remove upstream_QStorageInfo-limit-Linux-only-code-with- + Q_OS_LINUX.patch as it has been applied upstream. -- Debian Qt/KDE Maintainers Sun, 01 May 2022 01:08:36 +0200 diff --git a/debian/patches/series b/debian/patches/series index 347b333..37f81df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,3 @@ -# fixed in 6.3 -upstream_QStorageInfo-limit-Linux-only-code-with-Q_OS_LINUX.patch - # fixed in 6.4 upstream_CMake-add-support-for-GNU-Hurd.patch upstream_QProcess-Unix-fallback-on-_POSIX_PIPE_BUF-w-missing-.patch diff --git a/debian/patches/upstream_QStorageInfo-limit-Linux-only-code-with-Q_OS_LINUX.patch b/debian/patches/upstream_QStorageInfo-limit-Linux-only-code-with-Q_OS_LINUX.patch deleted file mode 100644 index 6a6da5b..0000000 --- a/debian/patches/upstream_QStorageInfo-limit-Linux-only-code-with-Q_OS_LINUX.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bf2fe41616c54712f78ea0ffd173f3614eb20190 Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Sun, 21 Nov 2021 09:25:30 +0100 -Subject: [PATCH] QStorageInfo: limit Linux-only code with Q_OS_LINUX - -This fixes a build problem (use of PATH_MAX) by eliminating a -Linux-specific condition that can't happen on HURD anyway. - -Change-Id: I5dcaf104a60b7850b8af3964fc4cd02ab24acd7b -Reviewed-by: Thiago Macieira -(cherry picked from commit 5558eb4edb62ddc920fd5f4171e732fb7cbe53a7) -Reviewed-by: Qt Cherry-pick Bot ---- - src/corelib/io/qstorageinfo_unix.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp -index 566ffe46bc..2b635f63bb 100644 ---- a/src/corelib/io/qstorageinfo_unix.cpp -+++ b/src/corelib/io/qstorageinfo_unix.cpp -@@ -568,6 +568,7 @@ inline QByteArray QStorageIterator::fileSystemType() const - - inline QByteArray QStorageIterator::device() const - { -+#ifdef Q_OS_LINUX - // check that the device exists - if (mnt.mnt_fsname[0] == '/' && access(mnt.mnt_fsname, F_OK) != 0) { - // It doesn't, so let's try to resolve the dev_t from /dev/block. -@@ -583,6 +584,7 @@ inline QByteArray QStorageIterator::device() const - return dev; - } - } -+#endif - return QByteArray(mnt.mnt_fsname); - } - --- -2.34.1 -