Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2013-12-11 14:32:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2013-12-02 12:31:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2013-12-11 14:32:40.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Dec 9 22:27:30 UTC 2013 - [email protected] + +- Small cleanup: + * Drop Suppressed-Redundant-MouseEventListener-Signals.patch, + kde#316546 has been resolved upstream with + 4.11.4/4.11.95 releases + * Be more explicit about (Build)Requires + * Drop ancient Obsoletes and Provides + +------------------------------------------------------------------- +Tue Dec 3 18:35:42 UTC 2013 - [email protected] + +- Added kdesu-add-some-i18n-love.patch: make kdesu 'command' (aka + desktop files) translatable (bnc#852256) +- Rebase old kdesu patches to git format + +------------------------------------------------------------------- +Fri Nov 29 07:00:41 UTC 2013 - [email protected] + +- Update to 4.11.97 + * KDE 4.12 RC 1 release + * See http://www.kde.org/announcements/announce-4.12-rc.php + +------------------------------------------------------------------- +Sat Nov 23 22:15:16 UTC 2013 - [email protected] + +- Update to 4.11.95 + * KDE 4.12 Beta 3 release + * See http://www.kde.org/announcements/announce-4.12-beta3.php + +------------------------------------------------------------------- Old: ---- Suppressed-Redundant-MouseEventListener-Signals.patch kde-runtime-4.11.90.tar.xz New: ---- kde-runtime-4.11.97.tar.xz kdesu-add-some-i18n-love.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.vl3D9e/_old 2013-12-11 14:32:41.000000000 +0100 +++ /var/tmp/diff_new_pack.vl3D9e/_new 2013-12-11 14:32:41.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebase4-runtime -Version: 4.11.90 +Version: 4.11.97 Release: 0 Summary: The KDE Runtime Components License: GPL-2.0+ @@ -35,11 +35,13 @@ Patch5: kdesu-symbol-lookup-workaround.diff # PATCH-FIX-OPENSUSE Remove-volume-control-from-KNotify.patch -- kde#324975 Patch6: Remove-volume-control-from-KNotify.patch -# PATCH-FIX-UPSTREAM Suppressed-Redundant-MouseEventListener-Signals.patch -- MouseEventListener item emitts multiple wheelMoved() signals for the same -# wheel event (once for every child item), this patch suppresses redundant mouse signals (kde#316546, bnc#835309) -Patch100: Suppressed-Redundant-MouseEventListener-Signals.patch +# PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- bnc#852256 +Patch7: kdesu-add-some-i18n-love.patch BuildRequires: NetworkManager-devel +BuildRequires: alsa-devel +BuildRequires: automoc4 BuildRequires: fdupes +BuildRequires: libattica-devel >= 0.1.4 BuildRequires: libcanberra-devel BuildRequires: libexiv2-devel BuildRequires: libgpgme-devel @@ -53,18 +55,22 @@ BuildRequires: libpulse-devel BuildRequires: libqca2-devel BuildRequires: libsmbclient-devel -BuildRequires: libssh-devel +BuildRequires: libssh-devel >= 0.4.0 BuildRequires: lzma-devel BuildRequires: nepomuk-core-devel +BuildRequires: openexr-devel BuildRequires: openslp-devel +BuildRequires: phonon-devel >= 4.3.80 +BuildRequires: strigi-devel >= 0.5.9 BuildRequires: xz +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libwebp) PreReq: permissions Requires: dbus-1-x11 Requires: kdelibs4 >= %{version} +Requires: libphonon4 Requires: nepomuk-core >= %{version} Requires: oxygen-icon-theme >= 4.6.40 -Requires: phonon Recommends: enscript #htdig is needed by khelpcenter for indexing help files Recommends: htdig @@ -72,21 +78,12 @@ Recommends: kdialog Recommends: icoutils Suggests: cagibi -Provides: kdebase4-runtime-xine = %{version} Provides: suse_help_viewer -Obsoletes: kdebase4-runtime-xine <= %{version} %define debug_package_requires %{name} = %{version}-%{release} kdelibs4-debuginfo BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): shared-mime-info Requires(postun): shared-mime-info Requires: %{name}-branding = %{_kde_branding_version} -Provides: plasma-theme-air = 4.2.90 -Obsoletes: plasma-theme-air < 4.2.90 -# packages older than 4.4.x had too strict kdebase4-runtime requirement -Provides: kdebase4-runtime = 4.0.10 -Provides: kdebase4-runtime = 4.1.10 -Provides: kdebase4-runtime = 4.2.10 -Provides: kdebase4-runtime = 4.3.10 %kde4_runtime_requires %description @@ -122,23 +119,22 @@ %prep %setup -q -n kde-runtime-%{version} cp %{SOURCE4} $RPM_BUILD_DIR/kde-runtime-%{version}/knotify/sounds/ -%patch1 +%patch1 -p1 %patch2 %patch3 %patch4 -p1 -%patch5 +%patch5 -p1 %if %suse_version >= 1310 %patch6 -p1 %endif -%patch100 -p1 +%patch7 -p1 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FPIE=1 %make_jobs %install - cd build - %kde4_makeinstall + %kde4_makeinstall -C build rm -rf %{buildroot}%{_kde4_datadir}/wallpapers rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen @@ -170,9 +166,6 @@ %verify_permissions -e %{_kde4_bindir}/kdesud %verify_permissions -e %{_kde4_libexecdir}/kdesud -%clean -rm -rf %{buildroot} - %files branding-upstream %defattr(-,root,root) %doc COPYING ++++++ kde-runtime-4.11.90.tar.xz -> kde-runtime-4.11.97.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-runtime/kde-runtime-4.11.90.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kde-runtime-4.11.97.tar.xz differ: char 27, line 1 ++++++ kdesu-add-some-i18n-love.patch ++++++ >From abee9c239f74f60a77c0931be23ad1d8670feda6 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> 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: bnc#852256 --- kdesu/kdesu/kdesu.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp index 2c181df..e871a1c 100644 --- a/kdesu/kdesu/kdesu.cpp +++ b/kdesu/kdesu/kdesu.cpp @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) if (result == 127 && !commandWasOk) { - KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command))); + KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromUtf8(command))); } return result; @@ -177,7 +177,7 @@ static int startApp() prompt = false; // Get target uid - QByteArray user = args->getOption("u").toLocal8Bit(); + QByteArray user = args->getOption("u").toUtf8(); QByteArray auth_user = user; struct passwd *pw = getpwnam(user); if (pw == 0L) @@ -238,7 +238,7 @@ static int startApp() // Get command if (args->isSet("c")) { - command = args->getOption("c").toLocal8Bit(); + command = args->getOption("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 @@ -257,7 +257,7 @@ static int startApp() command += ' '; command += QFile::encodeName(KShell::quoteArg(args->arg(i))); } - QStringList commandItems = QString::fromLocal8Bit( command ).split( ' ' ); + QStringList commandItems = QString::fromUtf8( command ).split( ' ' ); commandWasOk = ( !commandItems.isEmpty() && !KStandardDirs::findExe( commandItems.first()).isEmpty()); // Don't change uid if we're don't need to. @@ -327,7 +327,7 @@ static int startApp() } KUser u; - env << (QByteArray) ("KDESU_USER=" + u.loginName().toLocal8Bit()); + env << (QByteArray) ("KDESU_USER=" + u.loginName().toUtf8()); if (keep && !terminal && !just_started) { @@ -387,7 +387,7 @@ static int startApp() #endif KDEsuDialog dlg(user, auth_user, keep && !terminal, icon, withIgnoreButton); if (prompt) - dlg.addCommentLine(i18n("Command:"), command); + dlg.addCommentLine(i18n("Command:"), QString::fromUtf8(command)); dlg.setKeepPassword(keepByDefault); if ((priority != 50) || (scheduler != SuProcess::SchedNormal)) @@ -436,7 +436,7 @@ static int startApp() } 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); @@ -455,7 +455,7 @@ static int startApp() 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 ++++++ kdesu-remember-keep-password.diff ++++++ --- /var/tmp/diff_new_pack.vl3D9e/_old 2013-12-11 14:32:41.000000000 +0100 +++ /var/tmp/diff_new_pack.vl3D9e/_new 2013-12-11 14:32:41.000000000 +0100 @@ -4,11 +4,15 @@ Patch-upstream: no Relates: kdebase3/kdesu-remember-keep-password.diff, kdelibs4/kdesu-settings.diff -Index: kdesu/kdesu/kdesu.cpp -=================================================================== ---- kdesu/kdesu/kdesu.cpp.orig -+++ kdesu/kdesu/kdesu.cpp -@@ -351,6 +351,9 @@ static int startApp() +--- + kdesu/kdesu/kdesu.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp +index cfd37ec..3640545 100644 +--- a/kdesu/kdesu/kdesu.cpp ++++ b/kdesu/kdesu/kdesu.cpp +@@ -350,6 +350,9 @@ static int startApp() // Read configuration KConfigGroup config(KGlobal::config(), "Passwords"); int timeout = config.readEntry("Timeout", defTimeout); @@ -18,7 +22,7 @@ // Check if we need a password SuProcess proc; -@@ -382,8 +385,7 @@ static int startApp() +@@ -381,8 +384,7 @@ static int startApp() KDEsuDialog dlg(user, auth_user, keep && !terminal, icon, withIgnoreButton); if (prompt) dlg.addCommentLine(i18n("Command:"), command); @@ -28,7 +32,7 @@ if ((priority != 50) || (scheduler != SuProcess::SchedNormal)) { -@@ -412,6 +414,7 @@ static int startApp() +@@ -411,6 +413,7 @@ static int startApp() change_uid = false; password = dlg.password(); keep = dlg.keepPassword(); @@ -36,3 +40,6 @@ #ifdef Q_WS_X11 data.setSilent( KStartupInfoData::No ); KStartupInfo::sendChange( id, data ); +-- +1.8.4.4 + ++++++ kdesu-symbol-lookup-workaround.diff ++++++ --- /var/tmp/diff_new_pack.vl3D9e/_old 2013-12-11 14:32:41.000000000 +0100 +++ /var/tmp/diff_new_pack.vl3D9e/_new 2013-12-11 14:32:41.000000000 +0100 @@ -7,9 +7,15 @@ during its exit, which leads to its exit code being 127, i.e. not found. Add ugly hack to hide this case. ---- kdesu/kdesu/kdesu.cpp.sav 2010-03-16 10:33:25.000000000 +0100 -+++ kdesu/kdesu/kdesu.cpp 2010-05-28 16:41:00.000000000 +0200 -@@ -72,6 +72,8 @@ +--- + kdesu/kdesu/kdesu.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp +index 3640545..2c181df 100644 +--- a/kdesu/kdesu/kdesu.cpp ++++ b/kdesu/kdesu/kdesu.cpp +@@ -71,6 +71,8 @@ QByteArray dcopNetworkId() static int startApp(); @@ -18,7 +24,7 @@ int main(int argc, char *argv[]) { // FIXME: this can be considered a poor man's solution, as it's not -@@ -138,7 +140,7 @@ +@@ -137,7 +139,7 @@ int main(int argc, char *argv[]) int result = startApp(); @@ -27,7 +33,7 @@ { KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command))); } -@@ -256,6 +258,8 @@ +@@ -255,6 +257,8 @@ static int startApp() command += ' '; command += QFile::encodeName(KShell::quoteArg(args->arg(i))); } @@ -36,3 +42,6 @@ // Don't change uid if we're don't need to. if (!change_uid) +-- +1.8.4.4 + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
