qt-installer-framework: update to 4.8.0

This commit is contained in:
مهدي شينون (Mehdi Chinoune) 2024-05-16 17:23:52 +01:00
parent 244d43cc64
commit c6b29aab50
2 changed files with 9 additions and 8 deletions

View File

@ -11,17 +11,18 @@ diff --git a/src/libs/kdtools/updateoperations.cpp b/src/libs/kdtools/updateoper
index aeeaffe..4df8c49 100644 index aeeaffe..4df8c49 100644
--- a/src/libs/kdtools/updateoperations.cpp --- a/src/libs/kdtools/updateoperations.cpp
+++ b/src/libs/kdtools/updateoperations.cpp +++ b/src/libs/kdtools/updateoperations.cpp
@@ -524,7 +524,8 @@ void RmdirOperation::backup() @@ -580,7 +580,9 @@ void RmdirOperation::backup()
bool RmdirOperation::performOperation()
{ {
// Requires only one parameter. That is the name of the file to remove. // Requires only one parameter. That is the name of the file to remove.
- if (!checkArgumentCount(1)) // Optionally UNDOOPERATION can be added as well
- if (!checkArgumentCount(1, 3, QLatin1String("<file to remove> [UNDOOPERATION, \"\"]")))
+ // A second optional parameter of true indicates recursive deletion. + // A second optional parameter of true indicates recursive deletion.
+ if (!checkArgumentCount(1) && !checkArgumentCount(2)) + if (!checkArgumentCount(1, 3, QLatin1String("<file to remove> [UNDOOPERATION, \"\"]")) &&
+ !checkArgumentCount(2, 4, QLatin1String("<file to remove> [UNDOOPERATION, \"\"]")))
return false; return false;
const QString firstArg = arguments().at(0); const QString firstArg = arguments().at(0);
@@ -536,8 +537,11 @@ bool RmdirOperation::performOperation() @@ -592,8 +595,11 @@ bool RmdirOperation::performOperation()
return false; return false;
} }

View File

@ -4,7 +4,7 @@ _realname=installer-framework
pkgbase=mingw-w64-qt-${_realname} pkgbase=mingw-w64-qt-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-qt-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-qt-${_realname}"
pkgdesc="The Qt Installer Framework used for the Qt SDK installer (mingw-w64)" pkgdesc="The Qt Installer Framework used for the Qt SDK installer (mingw-w64)"
pkgver=4.7.0 pkgver=4.8.0
pkgrel=1 pkgrel=1
arch=('any') arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -39,9 +39,9 @@ source=(https://download.qt.io/official_releases/qt-${_realname}/${pkgver}/${_re
"0010-fix-version-pass-to-windres.patch" "0010-fix-version-pass-to-windres.patch"
"0011-fix-redefined-mode_t.patch" "0011-fix-redefined-mode_t.patch"
"0012-get_timezone-not-available-on-msvcrt.patch") "0012-get_timezone-not-available-on-msvcrt.patch")
sha256sums=('6a88bdf40be359aca5ac66328c597a14d3520db40c04db3c8d0174cf1f4b8aa7' sha256sums=('fc9a110ead81bc7e9bb70917383e181ce8a9b2d2cd36e41538848da50a679f11'
'4100a93ac7e117a32430d22187a4ebe94e7830d94d2c23b85651bc1d95821409' '4100a93ac7e117a32430d22187a4ebe94e7830d94d2c23b85651bc1d95821409'
'4db7a4c3e6ea3a26de6493e4e2b683251060c7c8cefacf6bfa458026e541e906' '3de4920ee4f04cce6bc791b01e2ee9894958b26c47dcac7a4e2843eb429154b5'
'2aaf51f346edb6db2367262d0d8e1bb77d0afee51fabd5b2766038a97ebf0ca6' '2aaf51f346edb6db2367262d0d8e1bb77d0afee51fabd5b2766038a97ebf0ca6'
'd4d52149e6cbc595222589c92b3a2f1ba48a36d19a27952dfb5dc063d7b417b3' 'd4d52149e6cbc595222589c92b3a2f1ba48a36d19a27952dfb5dc063d7b417b3'
'00857e9a654ecaed93ec79898389329799fdc01968b7562ae1889498b12c943d' '00857e9a654ecaed93ec79898389329799fdc01968b7562ae1889498b12c943d'