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 deleted file mode 100644 index 4caefd9..0000000 --- a/kf6-solid-6.7.0-qt6-qtbase-6.7.3-2.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 deleted file mode 100644 index 0b85857..0000000 --- a/kf6-solid-6.7.0-qt6-qtbase-6.7.3.patch +++ /dev/null @@ -1,11 +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/kf6-solid.spec b/kf6-solid.spec index 60c34cb..516a35f 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.7.0 +Version: 6.8.0 Release: 1mamba Summary: KDE Frameworks 6 hardware abstraction framework Group: Graphical Desktop/Libraries/KDE @@ -12,8 +12,6 @@ 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 @@ -68,11 +66,10 @@ 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 \ + -Wno-dev \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=ON \ -DWITH_NEW_POWER_ASYNC_API=ON \ @@ -85,8 +82,6 @@ This package contains libraries and header files for developing applications tha [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %cmake_install -mv %{buildroot}%{_kf6_bindir}/solid-power{,6} - %find_lang %{name} --with-qt --all-name || touch %{name}.lang %clean @@ -96,7 +91,6 @@ mv %{buildroot}%{_kf6_bindir}/solid-power{,6} %files -f %{name}.lang %defattr(-,root,root) %{_kf6_bindir}/solid-hardware6 -%{_kf6_bindir}/solid-power6 %{_datadir}/qlogging-categories6/solid.*categories %files -n lib%{name} @@ -115,6 +109,9 @@ mv %{buildroot}%{_kf6_bindir}/solid-power{,6} %doc README.md TODO %changelog +* Sun Nov 10 2024 Automatic Build System 6.8.0-1mamba +- automatic version update by autodist + * Mon Oct 14 2024 Automatic Build System 6.7.0-1mamba - automatic version update by autodist