Tomaz Canabrava pushed to branch main at Arch Linux / Packaging / Packages /
solid
Commits:
b797da11 by Tomaz Canabrava at 2024-11-08T18:54:15+01:00
Remove unused patch
- - - - -
2 changed files:
- PKGBUILD
- − wrong_argument_qchar.diff
Changes:
=====================================
PKGBUILD
=====================================
@@ -26,21 +26,14 @@ makedepends=(doxygen
qt6-tools)
optdepends=('qt5-declarative: QML bindings')
groups=(kf6)
-source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
- wrong_argument_qchar.diff)
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig})
sha256sums=('ace5145f59db548bcf423cb6b70fd870fefba37f07a649164394a802b3ca7941'
- 'SKIP'
- '45992baabd84bad5bf080fdb72eda3fb7f2e8234a0693690dc74b15dac591a93')
+ 'SKIP')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB # David Faure
<[email protected]>
E0A3EB202F8E57528E13E72FD7574483BB57B18D # Jonathan Esk-Riddell
<[email protected]>
90A968ACA84537CC27B99EAF2C8DF587A6D4AAC1 # Nicolas Fella
<[email protected]>
)
-prepare() {
- cd $pkgname-$pkgver
- patch -p1 < ../wrong_argument_qchar.diff
-}
-
build() {
cmake -B build -S $pkgname-$pkgver \
-DBUILD_TESTING=OFF \
=====================================
wrong_argument_qchar.diff deleted
=====================================
@@ -1,49 +0,0 @@
-diff --git a/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
b/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
-index 83e4425e..a85e5f0a 100644
---- a/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
-+++ b/src/solid/power/backends/freedesktop/logindinhibitionargument.cpp
-@@ -19,5 +19,5 @@ QString
LogindInhibitionArgument::fromPowerState(Power::InhibitionTypes states)
- if (states | Power::Shutdown) {
- args << QStringLiteral("shutdown");
- }
-- return args.join(QChar(':'));
-+ return args.join(QLatin1Char(':'));
- }
-diff --git a/src/tools/solid-power/main.cpp b/src/tools/solid-power/main.cpp
-index 497a3d84..03dc58e7 100644
---- a/src/tools/solid-power/main.cpp
-+++ b/src/tools/solid-power/main.cpp
-@@ -21,9 +21,9 @@ int main(int argc, char **argv)
- QCommandLineParser parser;
-
parser.setApplicationDescription(QCoreApplication::translate("solid-power",
"Tool to know and set the power management state of your device"));
- parser.addHelpOption();
-- parser.addPositionalArgument("command",
QCoreApplication::translate("solid-power", "Command to execute"));
-+ parser.addPositionalArgument(QStringLiteral("command"),
QCoreApplication::translate("solid-power", "Command to execute"));
-
-- QCommandLineOption commands("commands",
QCoreApplication::translate("solid-power", "Show available commands"));
-+ QCommandLineOption commands(QStringLiteral("commands"),
QCoreApplication::translate("solid-power", "Show available commands"));
- parser.addOption(commands);
-
- parser.process(app);
-diff --git a/src/tools/solid-power/solid-power.cpp
b/src/tools/solid-power/solid-power.cpp
-index 8fe0d8c2..257a19ba 100644
---- a/src/tools/solid-power/solid-power.cpp
-+++ b/src/tools/solid-power/solid-power.cpp
-@@ -26,7 +26,7 @@ void SolidPower::show()
- auto job = Solid::Power::isAcPlugged(this);
- job->exec();
-
-- QString status = job->isPlugged() ? "yes" : "no";
-+ QString status = job->isPlugged() ? tr("yes") : tr("no");
-
- sCout << "is AC plugged:\t" << status << Qt::endl;
- }
-@@ -37,7 +37,7 @@ void SolidPower::listen()
-
- connect(power, &Power::acPluggedChanged, [](bool plugged) {
- QTextStream lOut(stdout);
-- QString status = plugged ? "yes" : "no";
-+ QString status = plugged ? tr("yes") : tr("no");
- lOut << "\tAC plugged changed:\t" << status << Qt::endl;
- });
-
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/solid/-/commit/b797da11094c610f4bb01f83a1dcaf774e5bbf5c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/solid/-/commit/b797da11094c610f4bb01f83a1dcaf774e5bbf5c
You're receiving this email because of your account on gitlab.archlinux.org.
