diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes index 2d89124..17b2bf8 100644 --- a/kde-cli-tools5.changes +++ b/kde-cli-tools5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 21 18:42:23 UTC 2014 - hrvoje.senjan@gmail.com + +- Forward port kdesu-add-some-i18n-love.patch from kdebase4-runtime, + boo#852256 + ------------------------------------------------------------------- Thu Nov 6 20:14:11 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec index 74a1fd0..35ecab4 100644 --- a/kde-cli-tools5.spec +++ b/kde-cli-tools5.spec @@ -25,6 +25,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: kde-cli-tools-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256 +Patch0: kdesu-add-some-i18n-love.patch BuildRequires: kcmutils-devel BuildRequires: kconfig-devel BuildRequires: kdelibs4support-devel @@ -53,6 +55,7 @@ Additional CLI tools for KDE applications and workspaces. %lang_package %prep %setup -q -n kde-cli-tools-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 diff --git a/kdesu-add-some-i18n-love.patch b/kdesu-add-some-i18n-love.patch new file mode 100644 index 0000000..d5dfd48 --- /dev/null +++ b/kdesu-add-some-i18n-love.patch @@ -0,0 +1,74 @@ +From abee9c239f74f60a77c0931be23ad1d8670feda6 Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan +Date: Tue, 3 Dec 2013 19:31:13 +0100 +Subject: [PATCH 1/1] kdesu Add some love + +From/toUTF8 in practice covers more ground than 8bit. +Furthermore, make the kdesu 'command' translatable, it's used +in openSUSE with dolphin and konsole 'Start as root' +BUG: boo#852256 +--- + kdesu/kdesu.cpp | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +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[]) + + 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))); + } + + return result; +@@ -175,7 +175,7 @@ static int startApp(QCommandLineParser& p) + prompt = false; + + // Get target uid +- QByteArray user = p.value("u").toLocal8Bit(); ++ QByteArray user = p.value("u").toUtf8(); + QByteArray auth_user = user; + struct passwd *pw = getpwnam(user); + if (pw == 0L) +@@ -235,7 +235,7 @@ static int startApp(QCommandLineParser& p) + // Get command + if (p.isSet("c")) + { +- command = p.value("c").toLocal8Bit(); ++ command = p.value("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 +@@ -323,7 +323,7 @@ static int startApp(QCommandLineParser& p) + // } + + KUser u; +- env << (QByteArray) ("KDESU_USER=" + u.loginName().toLocal8Bit()); ++ env << (QByteArray) ("KDESU_USER=" + u.loginName().toUtf8()); + + if (keep && !terminal && !just_started) + { +@@ -429,7 +429,7 @@ static int startApp(QCommandLineParser& p) + } + else if (keep && have_daemon) + { +- client.setPass(password.toLocal8Bit(), timeout); ++ client.setPass(password.toUtf8(), timeout); + client.setPriority(priority); + client.setScheduler(scheduler); + int result = client.exec(command, user, options, env); +@@ -448,7 +448,7 @@ static int startApp(QCommandLineParser& p) + proc.setPriority(priority); + proc.setScheduler(scheduler); + proc.setCommand(command); +- int result = proc.exec(password.toLocal8Bit()); ++ int result = proc.exec(password.toUtf8()); + return result; + } + return -1; +-- +1.8.4.4 +