From a1d240d7226653cfcfdddd82902287c179ae161eae6e0e7ba248438d0db0992e Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 19 Jan 2019 09:06:58 +0000 Subject: [PATCH 1/2] Plasma 5.15 Beta. Again to adjust for kwin5 change in the target prj. When accepting, don't forward just yet to let the kwin5 sr pass. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=219 --- kde-cli-tools-5.14.5.tar.xz | 3 --- kde-cli-tools-5.14.5.tar.xz.sig | 11 ----------- kde-cli-tools-5.14.90.tar.xz | 3 +++ kde-cli-tools-5.14.90.tar.xz.sig | 11 +++++++++++ kde-cli-tools5.changes | 18 ++++++++++++++++++ kde-cli-tools5.spec | 6 +++--- kdesu-add-some-i18n-love.patch | 20 ++++++++++---------- 7 files changed, 45 insertions(+), 27 deletions(-) delete mode 100644 kde-cli-tools-5.14.5.tar.xz delete mode 100644 kde-cli-tools-5.14.5.tar.xz.sig create mode 100644 kde-cli-tools-5.14.90.tar.xz create mode 100644 kde-cli-tools-5.14.90.tar.xz.sig diff --git a/kde-cli-tools-5.14.5.tar.xz b/kde-cli-tools-5.14.5.tar.xz deleted file mode 100644 index 258dbbb..0000000 --- a/kde-cli-tools-5.14.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9626655df213c3b386f4ba0d16ab523bc97d05b6a1dcb02c3b001345b1b4b906 -size 584812 diff --git a/kde-cli-tools-5.14.5.tar.xz.sig b/kde-cli-tools-5.14.5.tar.xz.sig deleted file mode 100644 index 430d429..0000000 --- a/kde-cli-tools-5.14.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlw0qS8ACgkQ7JTRj38F -mX5+cwgAmHdUSfTIVqPm/TT8iK/KiOeus/w4UdLwp6dEulAZyPn0Gg7KZr0qei2c -TXXZY+Z4eYZDGvGMP8WVstltpJJl05zjPWDK+ft5uFhwehtsmdGnUuZ8qU6jpadW -45GI0A5lDzODreYQXvMSTqYJ5w44ZagItnf9ZWpbBwLXIOU6tJ2l6riXA22RQC3i -znjlY7bnEEsIL/zcrvoL0MjH2nBlN0tsfT+OVuSV8cd31EG1rblXMpGHOkdmtjjB -FUCVbhbpnJGdntYf9JwfO83IVecRQ48rePJ3eAqRqx/rZrJQnrhUOOvf9m6g6ufa -Yp+o3gdVDzgUV5JeglyuWWY6irlg9A== -=Hhqt ------END PGP SIGNATURE----- diff --git a/kde-cli-tools-5.14.90.tar.xz b/kde-cli-tools-5.14.90.tar.xz new file mode 100644 index 0000000..c1fdc10 --- /dev/null +++ b/kde-cli-tools-5.14.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a8302d3fdabbb07a13312f24545024d246dcea2cb858344ced1fb2aad0df37c +size 584908 diff --git a/kde-cli-tools-5.14.90.tar.xz.sig b/kde-cli-tools-5.14.90.tar.xz.sig new file mode 100644 index 0000000..4b08735 --- /dev/null +++ b/kde-cli-tools-5.14.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlxAc0cACgkQ7JTRj38F +mX5x/wf9FVpFvzbH3vZ0cUSOQkndzPkMAWUPILjDZYuGlxpoRUsOatw0a+xyVfqJ +qMGALyRVyXifE7ZWmPB654arnm5HFVUD368GQH2hvlKHD23fMmnhhkz4A3OvHKmr +K+UD7MaaJ3xAuyorWLaRhHkITTai3w7vyFMBv8yC4Cm99QXj2hSoUpuI2V/rkY3R +9e2qdrGrUuX+okxf8Dcbo3NL2Xs+6VGodDDuQMgJp5og9LrdjLQFVOsU/ZEiemvu +Q7jTu4Qtkjm3rK6aZRl9uVy6P77xrtP6FCqbwIhK4wO1sd/pr62NoNZcA88E2pPu +SleYUOFdPLROcZfCRM9Ygfsz0Fqp+w== +=XaWd +-----END PGP SIGNATURE----- diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 9621aa3..3b677b0 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jan 17 18:46:00 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.14.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.14.90.php +- Changes since 5.14.5: + * bump KF5 dependency to required 5.54 as agreed at start of Plasma 5.15 cycle + * [kde-cli-tools] Add search ellipsis to label, make label more consistent with HIG + * Remove KDE3 reference in kdeeject (kde#357986) + * Fix logic error in kioclient noninteractive argument handling + * Keep kioclient alive whilst we're showing error messages + * Fix KIOClient non-interactive mode handling renamed prompts + * KLineEdit::setClearButtonShown() is deprecated, port away. + * Use KDEFrameworkCompilerSettings +- Refresh kdesu-add-some-i18n-love.patch + ------------------------------------------------------------------- Tue Jan 8 13:36:47 UTC 2019 - fabian@ritter-vogt.de diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index be04877..1f01943 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -18,15 +18,15 @@ %bcond_without lang Name: kde-cli-tools5 -Version: 5.14.5 +Version: 5.14.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 062c85c..71b08c3 100644 --- a/kdesu-add-some-i18n-love.patch +++ b/kdesu-add-some-i18n-love.patch @@ -11,10 +11,10 @@ BUG: boo#852256 kdesu/kdesu.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -Index: kde-cli-tools-5.13.80git.20180712T134017~d95c4ef/kdesu/kdesu.cpp +Index: kde-cli-tools-5.14.80git.20180925T084325~290b262/kdesu/kdesu.cpp =================================================================== ---- kde-cli-tools-5.13.80git.20180712T134017~d95c4ef.orig/kdesu/kdesu.cpp -+++ kde-cli-tools-5.13.80git.20180712T134017~d95c4ef/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[]) if (result == 127) @@ -33,10 +33,10 @@ Index: kde-cli-tools-5.13.80git.20180712T134017~d95c4ef/kdesu/kdesu.cpp prompt = false; // Get target uid -- QByteArray user = p.value(QStringLiteral("u")).toLocal8Bit(); -+ QByteArray user = p.value(QStringLiteral("u")).toUtf8(); +- 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); + struct passwd *pw = getpwnam(user.constData()); if (pw == nullptr) @@ -256,7 +256,7 @@ static int startApp(QCommandLineParser& // Get command @@ -60,8 +60,8 @@ Index: kde-cli-tools-5.13.80git.20180712T134017~d95c4ef/kdesu/kdesu.cpp } else if (keep && have_daemon) { -- client.setPass(password.toLocal8Bit(), timeout); -+ client.setPass(password.toUtf8(), timeout); +- 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); @@ -69,8 +69,8 @@ Index: kde-cli-tools-5.13.80git.20180712T134017~d95c4ef/kdesu/kdesu.cpp proc.setPriority(priority); proc.setScheduler(scheduler); proc.setCommand(command); -- int result = proc.exec(password.toLocal8Bit()); -+ int result = proc.exec(password.toUtf8()); +- int result = proc.exec(password.toLocal8Bit().constData()); ++ int result = proc.exec(password.toUtf8().constData()); return result; } return -1; From 17268c35d390f01db31adc00cb9eef368a237930365af6acf7f21fbed67290eb Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 7 Feb 2019 20:23:34 +0000 Subject: [PATCH 2/2] Plasma 5.15.0 - maybe final tars OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=220 --- kde-cli-tools-5.14.90.tar.xz | 3 --- kde-cli-tools-5.14.90.tar.xz.sig | 11 ----------- kde-cli-tools-5.15.0.tar.xz | 3 +++ kde-cli-tools-5.15.0.tar.xz.sig | 11 +++++++++++ kde-cli-tools5.changes | 11 +++++++++++ kde-cli-tools5.spec | 30 ++++++++++++++++-------------- 6 files changed, 41 insertions(+), 28 deletions(-) delete mode 100644 kde-cli-tools-5.14.90.tar.xz delete mode 100644 kde-cli-tools-5.14.90.tar.xz.sig create mode 100644 kde-cli-tools-5.15.0.tar.xz create mode 100644 kde-cli-tools-5.15.0.tar.xz.sig diff --git a/kde-cli-tools-5.14.90.tar.xz b/kde-cli-tools-5.14.90.tar.xz deleted file mode 100644 index c1fdc10..0000000 --- a/kde-cli-tools-5.14.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a8302d3fdabbb07a13312f24545024d246dcea2cb858344ced1fb2aad0df37c -size 584908 diff --git a/kde-cli-tools-5.14.90.tar.xz.sig b/kde-cli-tools-5.14.90.tar.xz.sig deleted file mode 100644 index 4b08735..0000000 --- a/kde-cli-tools-5.14.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlxAc0cACgkQ7JTRj38F -mX5x/wf9FVpFvzbH3vZ0cUSOQkndzPkMAWUPILjDZYuGlxpoRUsOatw0a+xyVfqJ -qMGALyRVyXifE7ZWmPB654arnm5HFVUD368GQH2hvlKHD23fMmnhhkz4A3OvHKmr -K+UD7MaaJ3xAuyorWLaRhHkITTai3w7vyFMBv8yC4Cm99QXj2hSoUpuI2V/rkY3R -9e2qdrGrUuX+okxf8Dcbo3NL2Xs+6VGodDDuQMgJp5og9LrdjLQFVOsU/ZEiemvu -Q7jTu4Qtkjm3rK6aZRl9uVy6P77xrtP6FCqbwIhK4wO1sd/pr62NoNZcA88E2pPu -SleYUOFdPLROcZfCRM9Ygfsz0Fqp+w== -=XaWd ------END PGP SIGNATURE----- diff --git a/kde-cli-tools-5.15.0.tar.xz b/kde-cli-tools-5.15.0.tar.xz new file mode 100644 index 0000000..2e98638 --- /dev/null +++ b/kde-cli-tools-5.15.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0a5c175b9a5908d765bd81fe21c345eeeb8d15473339bb3e4119afca2a5c9a0 +size 585700 diff --git a/kde-cli-tools-5.15.0.tar.xz.sig b/kde-cli-tools-5.15.0.tar.xz.sig new file mode 100644 index 0000000..2b79784 --- /dev/null +++ b/kde-cli-tools-5.15.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlxcFwEACgkQ7JTRj38F +mX7avgf/dltlwDJeJHr5VbCx6Xz7CZKXm/uppbhCtwSgZ9polAvMgDW4JxNSGdqA +nxSBKZ43jFwmEyceG/D93YLl17FD2m01h02hX4i6K31co37w1BlFFkXvEFDnEdZH +lLz9i8AlcOeZGe93XDS3zUs2wa5vZkhxO+h/qd3PhKGOMWFAwITPAHZuMeTHZFr2 +mjeltgVTXxMO7OxTZ8LGDqx34xGaIgroHZB22s745OL1MFs76jyHmmSnJVyTL734 +EVTgHZ9M2oMEmYztl11Bv7ROmMQYYXbJNI8izJudN2H8QDGB3N4XwnjAwOBNw6ne +r6K45fLxR3jdmZBJ7llndLOOo396CQ== +=Cp1W +-----END PGP SIGNATURE----- diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 3b677b0..d417261 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Feb 7 16:02:50 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.15.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.15.0.php +- Changes since 5.14.90: + * [KRun] Don’t follow redirection to speed up and avoid incorrect behavior + * Load Plasma QtQuick settings in KCMShell (kde#403314) + ------------------------------------------------------------------- Thu Jan 17 18:46:00 UTC 2019 - fabian@ritter-vogt.de diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 1f01943..e765b31 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -16,17 +16,18 @@ # +%define kf5_version 5.54.0 %bcond_without lang Name: kde-cli-tools5 -Version: 5.14.90 +Version: 5.15.0 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/unstable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz +Source: kde-cli-tools-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/plasma/%{version}/kde-cli-tools-%{version}.tar.xz.sig +Source1: kde-cli-tools-%{version}.tar.xz.sig Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 @@ -34,17 +35,18 @@ Patch0: kdesu-add-some-i18n-love.patch BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: kf5-filesystem BuildRequires: xz -BuildRequires: cmake(KF5Activities) >= 5.16.0 -BuildRequires: cmake(KF5Config) >= 5.16.0 -BuildRequires: cmake(KF5DocTools) >= 5.16.0 -BuildRequires: cmake(KF5I18n) >= 5.16.0 -BuildRequires: cmake(KF5IconThemes) >= 5.16.0 -BuildRequires: cmake(KF5Init) >= 5.16.0 -BuildRequires: cmake(KF5KCMUtils) >= 5.16.0 -BuildRequires: cmake(KF5KDELibs4Support) >= 5.16.0 -BuildRequires: cmake(KF5KIO) >= 5.16.0 -BuildRequires: cmake(KF5Su) >= 5.16.0 -BuildRequires: cmake(KF5WindowSystem) >= 5.16.0 +BuildRequires: cmake(KF5Activities) >= %{kf5_version} +BuildRequires: cmake(KF5Config) >= %{kf5_version} +BuildRequires: cmake(KF5Declarative) >= %{kf5_version} +BuildRequires: cmake(KF5DocTools) >= %{kf5_version} +BuildRequires: cmake(KF5I18n) >= %{kf5_version} +BuildRequires: cmake(KF5IconThemes) >= %{kf5_version} +BuildRequires: cmake(KF5Init) >= %{kf5_version} +BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version} +BuildRequires: cmake(KF5KDELibs4Support) >= %{kf5_version} +BuildRequires: cmake(KF5KIO) >= %{kf5_version} +BuildRequires: cmake(KF5Su) >= %{kf5_version} +BuildRequires: cmake(KF5WindowSystem) >= %{kf5_version} # Needs KWorkSpace::detectPlatform BuildRequires: cmake(LibKWorkspace) >= 5.12.4 BuildRequires: cmake(Qt5DBus) >= 5.4.0