pool/kde-cli-tools5
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 432363 from KDE:Frameworks5:LTS

Browse Source 
Do NOT accept! Plasma 5.8 pre-final for 42.2 only!

OBS-URL: https://build.opensuse.org/request/show/432363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kde-cli-tools5?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2016-10-04 13:48:16 +00:00 committed by Git OBS Bridge
commit 9c3024a9df
6 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kde-cli-tools-5.7.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:978c64bc0c5450528888467fb4e6aee1f3d2c3aefb1714da611a7fd131fa4d60
size 486136

3
kde-cli-tools-5.8.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8561295ef8892d947a91b25cb4cddbb6c5cc40b39657a6cfc6fe4cfd98e728a6
size 485448

31
kde-cli-tools5.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.8.0
* New LTS feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.8.0.php
-------------------------------------------------------------------
Mon Sep 26 08:22:42 UTC 2016 - fabian@ritter-vogt.de
- Remove unnecessary kde-cli-tools5-rpmlintrc
-------------------------------------------------------------------
Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.7.95 (Plasma 5.8 Beta)
* New LTS feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.95.php
- Removed patch kdesu-Do-not-change-minimum-size.patch
-------------------------------------------------------------------
Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.7.5
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.5.php
- Refresh kdesu-add-some-i18n-love.patch and add new change
-------------------------------------------------------------------
Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de

5
kde-cli-tools5.spec
View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: kde-cli-tools5
Version: 5.7.4
Version: 5.8.0
Release: 0
Summary: Additional CLI tools for KDE applications
License: GPL-2.0+
@ -27,8 +27,6 @@ Url: http://www.kde.org
Source: kde-cli-tools-%{version}.tar.xz
# PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256
Patch0: kdesu-add-some-i18n-love.patch
# PATCH-FIX-UPSTREAM kdesu-Do-not-change-minimum-size.patch boo#958785 -- prevent the displayed command line text running into the password field
Patch1: kdesu-Do-not-change-minimum-size.patch
BuildRequires: extra-cmake-modules >= 1.3.0
BuildRequires: kf5-filesystem
BuildRequires: xz
@ -65,7 +63,6 @@ Additional CLI tools for KDE applications and workspaces.
%prep
%setup -q -n kde-cli-tools-%{version}
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}

23
kdesu-Do-not-change-minimum-size.patch
View File

@ -1,23 +0,0 @@
From: Christoph Feck <cfeck@kde.org>
Date: Thu, 21 Jul 2016 21:34:02 +0000
Subject: Do not change minimumSize()
X-Git-Url: http://quickgit.kde.org/?p=kde-cli-tools.git&a=commitdiff&h=dc023ba3cbd6e6fcbe8a6b13e1796a2c0744a5a2
---
Do not change minimumSize()
KPasswordDialog knows better.
---
--- a/kdesu/sudlg.cpp
+++ b/kdesu/sudlg.cpp
@@ -59,8 +59,6 @@
if( withIgnoreButton ) {
connect(buttonBox()->button(QDialogButtonBox::Ignore), SIGNAL(clicked()), SLOT(slotUser1()));
}
-
- setMinimumSize(minimumSizeHint());
}

20
kdesu-add-some-i18n-love.patch
View File

@ -15,16 +15,21 @@ diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp
index 9e7f173..f553422 100644
--- a/kdesu/kdesu.cpp
+++ b/kdesu/kdesu.cpp
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
@@ -160,11 +160,11 @@
if (result == 127)
{
- KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command)));
+ KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromUtf8(command)));
}
if (result == -2)
{
- KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command)));
+ KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromUtf8(command)));
}
return result;
@@ -175,7 +175,7 @@ static int startApp(QCommandLineParser& p)
@@ -199,7 +199,7 @@
prompt = false;
// Get target uid
@ -33,7 +38,7 @@ index 9e7f173..f553422 100644
QByteArray auth_user = user;
struct passwd *pw = getpwnam(user);
if (pw == 0L)
@@ -235,7 +235,7 @@ static int startApp(QCommandLineParser& p)
@@ -259,7 +259,7 @@
// Get command
if (p.isSet("c"))
{
@ -42,7 +47,7 @@ index 9e7f173..f553422 100644
// 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
@@ -323,7 +323,7 @@ static int startApp(QCommandLineParser& p)
@@ -347,7 +347,7 @@
// }
KUser u;
@ -51,7 +56,7 @@ index 9e7f173..f553422 100644
if (keep && !terminal && !just_started)
{
@@ -429,7 +429,7 @@ static int startApp(QCommandLineParser& p)
@@ -459,7 +459,7 @@
}
else if (keep && have_daemon)
{
@ -60,7 +65,7 @@ index 9e7f173..f553422 100644
client.setPriority(priority);
client.setScheduler(scheduler);
int result = client.exec(command, user, options, env);
@@ -448,7 +448,7 @@ static int startApp(QCommandLineParser& p)
@@ -478,7 +478,7 @@
proc.setPriority(priority);
proc.setScheduler(scheduler);
proc.setCommand(command);
@ -69,6 +74,3 @@ index 9e7f173..f553422 100644
return result;
}
return -1;
--
1.8.4.4