From d8a7b2ab136183b26a5e57b790f0ae9f308260aa037cf7a4fddb79b1a9f846bc Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 24 Jan 2021 21:11:02 +0000 Subject: [PATCH] Plasma 5.21 Beta - this time tested! kwin doesn't use libqaccessibilityclient yet and qqc2-breeze-style is not packaged, but only needed for Plasma Mobile. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=298 --- kde-cli-tools-5.20.5.tar.xz | 3 -- kde-cli-tools-5.20.5.tar.xz.sig | 11 ------- kde-cli-tools-5.20.90.tar.xz | 3 ++ kde-cli-tools-5.20.90.tar.xz.sig | 11 +++++++ kde-cli-tools5.changes | 24 ++++++++++++++++ kde-cli-tools5.spec | 6 ++-- kdesu-add-some-i18n-love.patch | 49 ++++++++++++++++---------------- 7 files changed, 65 insertions(+), 42 deletions(-) delete mode 100644 kde-cli-tools-5.20.5.tar.xz delete mode 100644 kde-cli-tools-5.20.5.tar.xz.sig create mode 100644 kde-cli-tools-5.20.90.tar.xz create mode 100644 kde-cli-tools-5.20.90.tar.xz.sig diff --git a/kde-cli-tools-5.20.5.tar.xz b/kde-cli-tools-5.20.5.tar.xz deleted file mode 100644 index ebafab6..0000000 --- a/kde-cli-tools-5.20.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0440b2d0359bca871134bfdbcc71b72c22af8c88601f1abceb83219a1877627c -size 602472 diff --git a/kde-cli-tools-5.20.5.tar.xz.sig b/kde-cli-tools-5.20.5.tar.xz.sig deleted file mode 100644 index d190e7e..0000000 --- a/kde-cli-tools-5.20.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl/0UsMACgkQ7JTRj38F -mX5EpQf+Lg9aXORwJiWPFAGSt8B3heeG8rzM1y42eb9QFO/07j6WCpALrlrrOajz -D++Pat1+sLhAa9at9ebfY/ykWqBUH0zh6uywIEE9XBmhrwgbpX4ugn/Zk+sfa/GW -REkOPBeQuBafJT3GmBFqsPzheLECA14IRMTpysEh03RGMpZ1ug/wuZ28Uwj7+tve -+NK2nH3PnLqCFYFzE/a5mOlvKNDW7PcJU0hHU6g1rNo/fdh/x5XvySysUoqaUO9o -yO7iW8336DaB2JIfDIJLt39JjeZy3oD39ogIGvGh8mZt/IL8sHgrUmHABMu5aG1N -bn6/Mish6DpYaiiG1DekMUIi/3HqTg== -=xNOt ------END PGP SIGNATURE----- diff --git a/kde-cli-tools-5.20.90.tar.xz b/kde-cli-tools-5.20.90.tar.xz new file mode 100644 index 0000000..4ca6f76 --- /dev/null +++ b/kde-cli-tools-5.20.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db9287ccba29f09329d7298e77ef7c761d190e9786a48ee11a0cfa19c900d8eb +size 611288 diff --git a/kde-cli-tools-5.20.90.tar.xz.sig b/kde-cli-tools-5.20.90.tar.xz.sig new file mode 100644 index 0000000..039f945 --- /dev/null +++ b/kde-cli-tools-5.20.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmAJducACgkQ7JTRj38F +mX7vJAgAheK8vy80G56JoGjB9P65cf+N8NoECgn8yBCerf7nTivlFgOJbl3YKhf2 +yW35UX+tTQH4OF2qlcgClUm3c3McsXV7TMXXAgXT/w/RXRLUG3PmZvh4K11ecdK9 +z9BaP4yiAaVvEpYCJMNEJnwGTowCkZf66FdLeYPVMy5Zdiyga7EmMR6aRTDarUOB +7rtJf9iykiUm2DkVflaVIA64jhIJuO4eX2mcXncQl3SxehXYqqEPj8ud5svxHKde +iKAPpqQJzB5iHKolzNsUJ7N9wxdfGN7/ECHN7+JXhaQtfYcZ/1pUJ0Cn4x6r68c2 +dlgp3zOA0Nyr4wX05gUVPHrSqNS5LQ== +=P7qV +-----END PGP SIGNATURE----- diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index c59ff7e..63bb37f 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 21 21:31:33 UTC 2021 - Fabian Vogt + +- Update to 5.20.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/20.90/ +- Changes since 5.20.5: + * Update .gitignore + * Add pre-commit hook for clang-format + * Add .git-blame-ignore-revs file + * Run clang-format + * Prevent clang-format uglification + * Add .gitignore file to ignore generated .clang-format file + * kioclient: add "appmenu" command to use a kopenwith dialog as a basic launcher + * Require C++17 + * Avoid pointless KCModuleInfo usage + * If include is define in .h remove it if it's defined in .cpp too (scripted) + * Do not explicitely define Exec line for KCM + * Now it depends against new version. Old code can be removed + * Partly port away from KMimeTypeTrader + * Documentation fixes + * Ignore options after positional arguments (kde#426896) + ------------------------------------------------------------------- Tue Jan 5 14:40:02 UTC 2021 - Fabian Vogt diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index fe69d51..be50397 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -19,15 +19,15 @@ %define kf5_version 5.54.0 %bcond_without lang Name: kde-cli-tools5 -Version: 5.20.5 +Version: 5.20.90 Release: 0 Summary: Additional CLI tools for KDE applications License: GPL-2.0-or-later Group: System/GUI/KDE URL: http://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz +Source: https://download.kde.org/unstable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 diff --git a/kdesu-add-some-i18n-love.patch b/kdesu-add-some-i18n-love.patch index 71b08c3..61f690d 100644 --- a/kdesu-add-some-i18n-love.patch +++ b/kdesu-add-some-i18n-love.patch @@ -11,61 +11,60 @@ BUG: boo#852256 kdesu/kdesu.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -Index: kde-cli-tools-5.14.80git.20180925T084325~290b262/kdesu/kdesu.cpp +Index: kde-cli-tools-5.15.80git.20210118T171249~517a2f9/kdesu/kdesu.cpp =================================================================== ---- kde-cli-tools-5.14.80git.20180925T084325~290b262.orig/kdesu/kdesu.cpp -+++ kde-cli-tools-5.14.80git.20180925T084325~290b262/kdesu/kdesu.cpp -@@ -157,11 +157,11 @@ int main(int argc, char *argv[]) +--- kde-cli-tools-5.15.80git.20210118T171249~517a2f9.orig/kdesu/kdesu.cpp 2021-01-19 09:50:49.604400930 +0100 ++++ kde-cli-tools-5.15.80git.20210118T171249~517a2f9/kdesu/kdesu.cpp 2021-01-19 09:53:33.170263817 +0100 +@@ -164,10 +164,10 @@ + int result = startApp(parser); - if (result == 127) - { + if (result == 127) { - KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command))); + KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'.", QString::fromUtf8(command))); } - if (result == -2) - { + if (result == -2) { - KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command))); + KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromUtf8(command))); } return result; -@@ -196,7 +196,7 @@ static int startApp(QCommandLineParser& - prompt = false; +@@ -201,7 +201,7 @@ + } // Get target uid - const QByteArray user = p.value(QStringLiteral("u")).toLocal8Bit(); + const QByteArray user = p.value(QStringLiteral("u")).toUtf8(); QByteArray auth_user = user; struct passwd *pw = getpwnam(user.constData()); - if (pw == nullptr) -@@ -256,7 +256,7 @@ static int startApp(QCommandLineParser& + if (pw == nullptr) { +@@ -255,7 +255,7 @@ + // Get command - if (p.isSet(QStringLiteral("c"))) - { + if (p.isSet(QStringLiteral("c"))) { - command = p.value(QStringLiteral("c")).toLocal8Bit(); + command = p.value(QStringLiteral("c")).toUtf8(); // Accepting additional arguments here is somewhat weird, // but one can conceive use cases: have a complex command with // redirections and additional file names which need to be quoted -@@ -344,7 +344,7 @@ static int startApp(QCommandLineParser& - // } +@@ -337,7 +337,7 @@ + // } KUser u; -- env << (QByteArray) ("KDESU_USER=" + u.loginName().toLocal8Bit()); -+ env << (QByteArray) ("KDESU_USER=" + u.loginName().toUtf8()); +- env << (QByteArray)("KDESU_USER=" + u.loginName().toLocal8Bit()); ++ env << (QByteArray)("KDESU_USER=" + u.loginName().toUtf8()); - if (keep && !terminal && !just_started) - { -@@ -456,7 +456,7 @@ static int startApp(QCommandLineParser& - } - else if (keep && have_daemon) - { + if (keep && !terminal && !just_started) { + client.setPriority(priority); +@@ -445,7 +445,7 @@ + result = WEXITSTATUS(result); + return result; + } else if (keep && have_daemon) { - client.setPass(password.toLocal8Bit().constData(), timeout); + client.setPass(password.toUtf8().constData(), timeout); client.setPriority(priority); client.setScheduler(scheduler); int result = client.exec(command, user, options, env); -@@ -475,7 +475,7 @@ static int startApp(QCommandLineParser& +@@ -462,7 +462,7 @@ proc.setPriority(priority); proc.setScheduler(scheduler); proc.setCommand(command);