From cece5044d47c0df421c9a744bbee9c39cdcf623e Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Tue, 15 Oct 2024 10:13:18 +0200 Subject: [PATCH] automatic version update by autodist [release 6.7.0-1mamba;Mon Oct 14 2024] --- kf6-solid-6.7.0-qt6-qtbase-6.7.3-2.patch | 34 ++++++++++++++++++++++++ kf6-solid-6.7.0-qt6-qtbase-6.7.3.patch | 11 ++++++++ kf6-solid.spec | 14 ++++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 kf6-solid-6.7.0-qt6-qtbase-6.7.3-2.patch create mode 100644 kf6-solid-6.7.0-qt6-qtbase-6.7.3.patch diff --git a/kf6-solid-6.7.0-qt6-qtbase-6.7.3-2.patch b/kf6-solid-6.7.0-qt6-qtbase-6.7.3-2.patch new file mode 100644 index 0000000..4caefd9 --- /dev/null +++ b/kf6-solid-6.7.0-qt6-qtbase-6.7.3-2.patch @@ -0,0 +1,34 @@ +--- solid-6.7.0/src/tools/solid-power/solid-power.cpp.orig 2024-10-14 10:19:42.438657405 +0200 ++++ solid-6.7.0/src/tools/solid-power/solid-power.cpp 2024-10-14 10:21:55.679962965 +0200 +@@ -26,7 +26,7 @@ + auto job = Solid::Power::isAcPlugged(this); + job->exec(); + +- QString status = job->isPlugged() ? "yes" : "no"; ++ QString status = job->isPlugged() ? QLatin1String("yes") : QLatin1String("no"); + + sCout << "is AC plugged:\t" << status << Qt::endl; + } +@@ -37,7 +37,7 @@ + + connect(power, &Power::acPluggedChanged, [](bool plugged) { + QTextStream lOut(stdout); +- QString status = plugged ? "yes" : "no"; ++ QString status = plugged ? QLatin1String("yes") : QLatin1String("no"); + lOut << "\tAC plugged changed:\t" << status << Qt::endl; + }); + +--- solid-6.7.0/src/tools/solid-power/main.cpp.orig 2024-10-14 10:06:30.172840937 +0200 ++++ solid-6.7.0/src/tools/solid-power/main.cpp 2024-10-14 10:19:03.459568017 +0200 +@@ -21,9 +21,9 @@ + 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(QLatin1String("command"), QCoreApplication::translate("solid-power", "Command to execute")); + +- QCommandLineOption commands("commands", QCoreApplication::translate("solid-power", "Show available commands")); ++ QCommandLineOption commands(QLatin1String("commands"), QCoreApplication::translate("solid-power", "Show available commands")); + parser.addOption(commands); + + parser.process(app); diff --git a/kf6-solid-6.7.0-qt6-qtbase-6.7.3.patch b/kf6-solid-6.7.0-qt6-qtbase-6.7.3.patch new file mode 100644 index 0000000..0b85857 --- /dev/null +++ b/kf6-solid-6.7.0-qt6-qtbase-6.7.3.patch @@ -0,0 +1,11 @@ +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/kf6-solid.spec b/kf6-solid.spec index e3a1b33..60c34cb 100644 --- a/kf6-solid.spec +++ b/kf6-solid.spec @@ -3,7 +3,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: kf6-solid -Version: 6.6.0 +Version: 6.7.0 Release: 1mamba Summary: KDE Frameworks 6 hardware abstraction framework Group: Graphical Desktop/Libraries/KDE @@ -12,9 +12,15 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://invent.kde.org/frameworks/solid Source: https://download.kde.org/%{stable_kf6}/frameworks/%{majver}/solid-%{version}.tar.xz +Patch0: kf6-solid-6.7.0-qt6-qtbase-6.7.3.patch +Patch1: kf6-solid-6.7.0-qt6-qtbase-6.7.3-2.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libQt6Core +BuildRequires: libQt6DBus +BuildRequires: libQt6Gui +BuildRequires: libQt6Xml BuildRequires: libgcc BuildRequires: libglvnd-devel BuildRequires: libimobiledevice-devel @@ -22,7 +28,6 @@ BuildRequires: libmount-devel BuildRequires: libplist-devel BuildRequires: libstdc++6-devel BuildRequires: libudev-devel -BuildRequires: qt6-qtbase-devel ## AUTOBUILDREQ-END BuildRequires: cmake BuildRequires: extra-cmake-modules @@ -63,6 +68,8 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -n %{framework}-%{version} +%patch 0 -p1 -b .qt6-qtbase-6.7.3 +%patch 1 -p1 -b .qt6-qtbase-6.7.3-2 %build %cmake_kf6 \ @@ -108,6 +115,9 @@ mv %{buildroot}%{_kf6_bindir}/solid-power{,6} %doc README.md TODO %changelog +* Mon Oct 14 2024 Automatic Build System 6.7.0-1mamba +- automatic version update by autodist + * Sat Sep 14 2024 Automatic Build System 6.6.0-1mamba - automatic version update by autodist