From 4eb16ff48bef438be4252cd19aedc87787722e12b37104103e268d9eeb175edf Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 17 Sep 2022 10:40:20 +0000 Subject: [PATCH] Plasma 5.25.90, lightly tested. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=352 --- kde-cli-tools-5.25.5.tar.xz | 3 --- kde-cli-tools-5.25.5.tar.xz.sig | 16 ---------------- kde-cli-tools-5.25.90.tar.xz | 3 +++ kde-cli-tools-5.25.90.tar.xz.sig | 16 ++++++++++++++++ kde-cli-tools5.changes | 20 ++++++++++++++++++++ kde-cli-tools5.spec | 8 ++++---- kdesu-add-some-i18n-love.patch | 26 +++++++++++++------------- 7 files changed, 56 insertions(+), 36 deletions(-) delete mode 100644 kde-cli-tools-5.25.5.tar.xz delete mode 100644 kde-cli-tools-5.25.5.tar.xz.sig create mode 100644 kde-cli-tools-5.25.90.tar.xz create mode 100644 kde-cli-tools-5.25.90.tar.xz.sig diff --git a/kde-cli-tools-5.25.5.tar.xz b/kde-cli-tools-5.25.5.tar.xz deleted file mode 100644 index 2c7c2b7..0000000 --- a/kde-cli-tools-5.25.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e38bb9150b42e6821403c3ee897bff9045a985974f73912d5cbb2db1fcb43444 -size 635412 diff --git a/kde-cli-tools-5.25.5.tar.xz.sig b/kde-cli-tools-5.25.5.tar.xz.sig deleted file mode 100644 index ab8b4bb..0000000 --- a/kde-cli-tools-5.25.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmMXNxAACgkQ11dEg7tX -sY1O2Q/+L1Z6nReV3/GrL3FAkYf76Wkp6hDt/B+idBxBaSpfMcjM6ejZ6ozntI3M -4VqASbSQF7genBpzt3CrldpZtiKFj6uE4v8SON36xQPv38xnoUmcun6clbhlG/nd -tXqa/6isyB5vyysILbU6PzTp1qpzoHuAZUOLC1RUfY+V3fMqchY4r0isilpi2qAS -N5wK/uOWLv8OAO6L51vbL8RFFHyuKWZoFYymNcYG3JkrCCX8OipfZgn/cdRIeqmJ -EciMRLPEpkUV+XE7gvVTOUMQYwCzXqlLDqqNEtyoHf6Tbja1NPNgOWfTi31HCrBo -xINPQX6HwJAg8//ukEWbHR27cvb7C38Hxko2wKH5B3HyDRMG+XGCqR0bv0bEcXLK -6amj9fIVBipDpE1RHD37ojKjG/7CNY6z7Fs04PiO/7v2WVhzM9x9KPsZyBVG2s/J -XSVHQ0l1EV7tSS+gDkhGQn5ehpZIXwGEktnzgmaAh5pMkXndlmlrXXhJjyGNhztq -tAome6VPBYDYuCQqqaJrgAd3bmDks46z5QBczersbcph+VJG80TatFlBaW8wr53H -N8Hm9pwPciZRqhUXhymiQd7dFAuni1kjjFAikwgf6ATQc9SN1n8WIhZhcRvB3KtW -FXiGUW7TXCPLf66Pqs0t634ROzhIQEvKpS6RM1vo+E21BKZk6BA= -=Im1M ------END PGP SIGNATURE----- diff --git a/kde-cli-tools-5.25.90.tar.xz b/kde-cli-tools-5.25.90.tar.xz new file mode 100644 index 0000000..488f685 --- /dev/null +++ b/kde-cli-tools-5.25.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db016d35f274ec8b2af1cf5c4e64e57a69520ff6705113987ce5dfe0cdea3bea +size 630324 diff --git a/kde-cli-tools-5.25.90.tar.xz.sig b/kde-cli-tools-5.25.90.tar.xz.sig new file mode 100644 index 0000000..968bc8d --- /dev/null +++ b/kde-cli-tools-5.25.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmMjBxQACgkQ11dEg7tX +sY3vyBAAqXZgVcn72AcrUNpkRxp8MPeYdKMHqRfGyHT+UwJbKA8bF16XGy7MKm2e +vMZqgq9yLL4HQhEwSeYuOHdimrcJvGBPMmqpE9wlabjpt4nJzbaxVR7tpNvy7Ebd +ZQcvoXpxGWCyJredtmj8DetEwy05btStE6eL+hSLKRmwqE5Zpx44MKYDhSYmJ8ox +F3lOGx07c7zE4MQMTOn2Ktw3qRqAaVtXZ8k7aOoyBT6qfK6T6k6PA5MbhFWRxOvl +832iKGUEVAiQe3kJYXJJLZDTid70QAO9Vcf41qrS0KjUj+QMw11PM5GJx7nZ1HHQ +OUCW0N+1AjNMTHHAsnzV2+e+Gi6WfYn7TxAK+WcXDwPsRItFvNnthqqjI9DwTmgW +WZW95Ip+gxGfYlEzYhuK+0ffTIKbyhp9fp6PJPwIFJXnhagpJe5q+LcryCPDqZx/ +EUFG8tPbhvETDug5+lo1c+FqcWQW+14FydcAGPol1lm/5s0zkVRjMMEhJUTU+UuJ +y3SYnJMTdOZuCPBORE7oZ4NRnqhYfqJfsPeaRoJipVanm81ULEoJ173nCHOs3FHg +VE0SD+xgObHaKI3VoigZc6oA8Gy4Uv9P5hNn9J7Zp5GFvCb38CLJQsUeQw8IvXyO +rm2O3n8Yd4CkzkOcdybxuNJqllgK+C3KBFnJI02EwPbAxGpTpVA= +=OZ/G +-----END PGP SIGNATURE----- diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 477537a..0870a3a 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Sep 15 20:46:22 UTC 2022 - Fabian Vogt + +- Update to 5.25.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.25.90 +- Changes since 5.25.5: + * Add missing license files and remove unused one + * Port away from deprecated KIO code + * We depend against qt5.15.2 + * kstart: Don't print pid of spawned job + * Utilize kcmutils_generate_desktop_file cmake method + * KMessageBox::sorry is deprecated in kf5.97 + * Fix DBus name for KPluginMetaData based KCMs (kde#455943) + * Request passing unit tests on Linux and BSD + * Use cmakedefine01 + * Add missing include +- Refresh kdesu-add-some-i18n-love.patch + ------------------------------------------------------------------- Tue Sep 6 16:55:35 UTC 2022 - Fabian Vogt diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 0f48e87..91dc8e2 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -16,18 +16,18 @@ # -%define kf5_version 5.86.0 +%define kf5_version 5.98.0 %bcond_without released Name: kde-cli-tools5 -Version: 5.25.5 +Version: 5.25.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 released} -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 61f690d..fe1314f 100644 --- a/kdesu-add-some-i18n-love.patch +++ b/kdesu-add-some-i18n-love.patch @@ -11,24 +11,24 @@ BUG: boo#852256 kdesu/kdesu.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -Index: kde-cli-tools-5.15.80git.20210118T171249~517a2f9/kdesu/kdesu.cpp +Index: kde-cli-tools-5.17.80git.20220801T014355~e85be44/kdesu/kdesu.cpp =================================================================== ---- 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 @@ +--- kde-cli-tools-5.17.80git.20220801T014355~e85be44.orig/kdesu/kdesu.cpp 2022-08-01 03:43:55.000000000 +0200 ++++ kde-cli-tools-5.17.80git.20220801T014355~e85be44/kdesu/kdesu.cpp 2022-08-01 05:47:00.996968576 +0200 +@@ -165,10 +165,10 @@ int result = startApp(parser); 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))); +- KMessageBox::error(nullptr, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command))); ++ KMessageBox::error(nullptr, i18n("Cannot execute command '%1'.", QString::fromUtf8(command))); } 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))); +- KMessageBox::error(nullptr, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command))); ++ KMessageBox::error(nullptr, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromUtf8(command))); } return result; -@@ -201,7 +201,7 @@ +@@ -202,7 +202,7 @@ } // Get target uid @@ -37,7 +37,7 @@ Index: kde-cli-tools-5.15.80git.20210118T171249~517a2f9/kdesu/kdesu.cpp QByteArray auth_user = user; struct passwd *pw = getpwnam(user.constData()); if (pw == nullptr) { -@@ -255,7 +255,7 @@ +@@ -256,7 +256,7 @@ // Get command if (p.isSet(QStringLiteral("c"))) { @@ -46,7 +46,7 @@ Index: kde-cli-tools-5.15.80git.20210118T171249~517a2f9/kdesu/kdesu.cpp // 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 -@@ -337,7 +337,7 @@ +@@ -339,7 +339,7 @@ // } KUser u; @@ -55,7 +55,7 @@ Index: kde-cli-tools-5.15.80git.20210118T171249~517a2f9/kdesu/kdesu.cpp if (keep && !terminal && !just_started) { client.setPriority(priority); -@@ -445,7 +445,7 @@ +@@ -448,7 +448,7 @@ result = WEXITSTATUS(result); return result; } else if (keep && have_daemon) { @@ -64,7 +64,7 @@ Index: kde-cli-tools-5.15.80git.20210118T171249~517a2f9/kdesu/kdesu.cpp client.setPriority(priority); client.setScheduler(scheduler); int result = client.exec(command, user, options, env); -@@ -462,7 +462,7 @@ +@@ -465,7 +465,7 @@ proc.setPriority(priority); proc.setScheduler(scheduler); proc.setCommand(command);