summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuflone2025-02-02 15:18:59 +0100
committerMuflone2025-02-02 15:18:59 +0100
commit5ed63030f36ab11889bd33bb7fade0062f19537d (patch)
tree08077d0353b5c4abd4898f66d3fe2c9e41de10ed
parent375c36b9c7f3eaa583076a10f4ae60bc436a621a (diff)
downloadaur-qt-installer-framework.tar.gz
Updated package qt-installer-framework 4.8.1-3
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--qt6_8_1.patch90
3 files changed, 99 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5233d3147711..97d4bc918dcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qt-installer-framework
pkgdesc = The Qt Installer Framework used for the Qt SDK installer
pkgver = 4.8.1
- pkgrel = 2
+ pkgrel = 3
url = http://qt-project.org/wiki/Qt-Installer-Framework
arch = x86_64
license = GFDL-1.3-only
@@ -16,10 +16,12 @@ pkgbase = qt-installer-framework
source = qt6_7.patch::https://github.com/qtproject/installer-framework/commit/0b1103b41db101d2a509e1bdf5385b29410e41e9.patch
source = qt6_8.patch::https://github.com/qtproject/installer-framework/commit/d24e8c20ea263e4528f11553a4dfbd93433b203e.patch
source = core5compat.patch
+ source = qt6_8_1.patch
sha256sums = cab2fa4d5f04298cfe4f63b9721bb389d1efb0fa7333a0ed0795b4ff51108978
sha256sums = 7e1961f741f0de55b01d568b57a3f4a25841c774b6eb293866272e048d73412a
sha256sums = 586e80274375ace226476ecc8014a8391d9ac1fc70d9e382fb1b25582e815fb8
sha256sums = e6013877697814051f1e1483d106da05b612ac24d9b43c868764f77d91b91b20
+ sha256sums = 94e36e7195895a3076158aa978681bb989ac19b9d6fe8a00662f156f6c076860
pkgname = qt-installer-framework
pkgdesc = The Qt Installer Framework used for the Qt SDK installer
diff --git a/PKGBUILD b/PKGBUILD
index c4a9f45df829..9b7117efbb22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgbase=qt-installer-framework
pkgname=(qt-installer-framework qt-installer-framework-docs)
pkgver=4.8.1
-pkgrel=2
+pkgrel=3
pkgdesc='The Qt Installer Framework used for the Qt SDK installer'
arch=('x86_64')
url='http://qt-project.org/wiki/Qt-Installer-Framework'
@@ -14,17 +14,20 @@ makedepends=('qt6-tools' 'qt6-declarative' 'qt6-5compat' 'clang' 'libarchive')
source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/qtproject/installer-framework/archive/${pkgver}.tar.gz"
"qt6_7.patch"::"https://github.com/qtproject/installer-framework/commit/0b1103b41db101d2a509e1bdf5385b29410e41e9.patch"
"qt6_8.patch"::"https://github.com/qtproject/installer-framework/commit/d24e8c20ea263e4528f11553a4dfbd93433b203e.patch"
- "core5compat.patch")
+ "core5compat.patch"
+ "qt6_8_1.patch")
sha256sums=('cab2fa4d5f04298cfe4f63b9721bb389d1efb0fa7333a0ed0795b4ff51108978'
'7e1961f741f0de55b01d568b57a3f4a25841c774b6eb293866272e048d73412a'
'586e80274375ace226476ecc8014a8391d9ac1fc70d9e382fb1b25582e815fb8'
- 'e6013877697814051f1e1483d106da05b612ac24d9b43c868764f77d91b91b20')
+ 'e6013877697814051f1e1483d106da05b612ac24d9b43c868764f77d91b91b20'
+ '94e36e7195895a3076158aa978681bb989ac19b9d6fe8a00662f156f6c076860')
options=('!lto')
prepare() {
cd "installer-framework-${pkgver}"
patch -p1 -i "${srcdir}/qt6_7.patch"
patch -p1 -i "${srcdir}/qt6_8.patch"
+ patch -p1 -i "${srcdir}/qt6_8_1.patch"
patch -p1 -i "${srcdir}/core5compat.patch"
}
diff --git a/qt6_8_1.patch b/qt6_8_1.patch
new file mode 100644
index 000000000000..a42ba8e78989
--- /dev/null
+++ b/qt6_8_1.patch
@@ -0,0 +1,90 @@
+diff -Naur installer-framework-4.8.1.orig/src/libs/installer/binaryformatengine.cpp installer-framework-4.8.1/src/libs/installer/binaryformatengine.cpp
+--- installer-framework-4.8.1.orig/src/libs/installer/binaryformatengine.cpp 2025-01-26 21:10:21.904198528 +0100
++++ installer-framework-4.8.1/src/libs/installer/binaryformatengine.cpp 2025-02-02 14:48:43.663444647 +0100
+@@ -266,14 +266,6 @@
+ */
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+ QAbstractFileEngine::IteratorUniquePtr
+-BinaryFormatEngine::beginEntryList(const QString &path, QDir::Filters filters,
+- const QStringList &filterNames)
+-{
+- const QStringList entries = entryList(filters, filterNames);
+- return std::make_unique<StringListIterator>(path, entries, filters, filterNames);
+-}
+-
+-QAbstractFileEngine::IteratorUniquePtr
+ BinaryFormatEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames)
+ {
+ const QStringList entries = entryList(filters, filterNames);
+diff -Naur installer-framework-4.8.1.orig/src/libs/installer/binaryformatengine.h installer-framework-4.8.1/src/libs/installer/binaryformatengine.h
+--- installer-framework-4.8.1.orig/src/libs/installer/binaryformatengine.h 2025-01-26 21:10:21.904198528 +0100
++++ installer-framework-4.8.1/src/libs/installer/binaryformatengine.h 2025-02-02 14:32:33.436791815 +0100
+@@ -62,7 +62,6 @@
+ FileFlags fileFlags(FileFlags type = FileInfoAll) const override;
+
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+- IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames) override;
+ IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames) override;
+ QStringList entryList(QDirListing::IteratorFlags filters, const QStringList &filterNames) const override;
+ #else
+diff -Naur installer-framework-4.8.1.orig/src/libs/installer/remotefileengine.cpp installer-framework-4.8.1/src/libs/installer/remotefileengine.cpp
+--- installer-framework-4.8.1.orig/src/libs/installer/remotefileengine.cpp 2025-01-26 21:10:21.904198528 +0100
++++ installer-framework-4.8.1/src/libs/installer/remotefileengine.cpp 2025-02-02 14:35:52.237030579 +0100
+@@ -80,7 +80,7 @@
+ class RemoteFileEngineIterator : public QAbstractFileEngineIterator
+ {
+ public:
+- RemoteFileEngineIterator(const QString &path, QDir::Filters filters, const QStringList &nameFilters,
++ RemoteFileEngineIterator(const QString &path, QDirListing::IteratorFlags filters, const QStringList &nameFilters,
+ const QStringList &files)
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+ : QAbstractFileEngineIterator(path, filters, nameFilters)
+@@ -177,8 +177,7 @@
+ */
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+ QAbstractFileEngine::IteratorUniquePtr
+-RemoteFileEngine::beginEntryList(const QString &path, QDir::Filters filters,
+- const QStringList &filterNames)
++RemoteFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames)
+ #else
+ QAbstractFileEngine::Iterator* RemoteFileEngine::beginEntryList(QDir::Filters filters,
+ const QStringList &filterNames)
+@@ -246,6 +245,16 @@
+ {
+ if ((const_cast<RemoteFileEngine *>(this))->connectToServer()) {
+ return callRemoteMethod<QStringList>
++ (QString::fromLatin1(Protocol::QAbstractFileEngineEntryList),
++ static_cast<qint32>(filters), filterNames);
++ }
++ return m_fileEngine.entryList(filters, filterNames);
++}
++
++QStringList RemoteFileEngine::entryList(QDirListing::IteratorFlags filters, const QStringList &filterNames) const
++{
++ if ((const_cast<RemoteFileEngine *>(this))->connectToServer()) {
++ return callRemoteMethod<QStringList>
+ (QString::fromLatin1(Protocol::QAbstractFileEngineEntryList),
+ static_cast<qint32>(filters), filterNames);
+ }
+diff -Naur installer-framework-4.8.1.orig/src/libs/installer/remotefileengine.h installer-framework-4.8.1/src/libs/installer/remotefileengine.h
+--- installer-framework-4.8.1.orig/src/libs/installer/remotefileengine.h 2025-01-26 21:10:21.904198528 +0100
++++ installer-framework-4.8.1/src/libs/installer/remotefileengine.h 2025-02-02 14:35:46.713115235 +0100
+@@ -86,6 +86,7 @@
+ bool caseSensitive() const override;
+ bool isRelativePath() const override;
+ QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override;
++ QStringList entryList(QDirListing::IteratorFlags filters, const QStringList &filterNames) const override;
+ FileFlags fileFlags(FileFlags type = FileInfoAll) const override;
+ bool setPermissions(uint perms) override;
+ QString fileName(FileName file = DefaultName) const override;
+@@ -102,8 +103,9 @@
+ uchar *map(qint64, qint64, QFile::MemoryMapFlags) { return 0; }
+ bool unmap(uchar *) { return true; }
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+- IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames) override;
++ IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames) override;
+ IteratorUniquePtr endEntryList() override;
++
+ #else
+ Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
+ Iterator *endEntryList() override;