[kdebase-runtime/f16] kde-open gives incorrect exit status (#760748, kde#288389)

Rex Dieter rdieter at fedoraproject.org
Wed Dec 14 15:08:37 UTC 2011


commit 6380018d1dbe255f1a2d3ecfee8107810c5c1231
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Dec 14 09:08:36 2011 -0600

    kde-open gives incorrect exit status (#760748,kde#288389)

 kde-runtime-kdebug288389.patch |   36 ++++++++++++++++++++++++++++++++++++
 kdebase-runtime.spec           |    9 ++++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/kde-runtime-kdebug288389.patch b/kde-runtime-kdebug288389.patch
new file mode 100644
index 0000000..bd40e58
--- /dev/null
+++ b/kde-runtime-kdebug288389.patch
@@ -0,0 +1,36 @@
+commit e6e6fb53419ec212ccae083162999d66e7d5663b
+Author: David Faure <faure at kde.org>
+Date:   Thu Dec 8 23:18:50 2011 +0100
+
+    Fix kde-open exit code
+    
+    FIXED-IN: 4.8
+    BUG: 288389
+
+diff --git a/kioclient/kioclient.cpp b/kioclient/kioclient.cpp
+index 6f5dd16..48adaa6 100644
+--- a/kioclient/kioclient.cpp
++++ b/kioclient/kioclient.cpp
+@@ -268,8 +268,7 @@ bool ClientApp::doIt()
+         kFatal(101) << "Session bus not found" ;
+ 
+ #ifdef KIOCLIENT_AS_KDEOPEN
+-    app.kde_open(args->url(0), QByteArray(), false);
+-    return true;
++    return app.kde_open(args->url(0), QByteArray(), false);
+ #elif defined(KIOCLIENT_AS_KDECP)
+     checkArgumentCount(argc, 2, 0);
+     return app.doCopy(0);
+@@ -303,9 +302,9 @@ bool ClientApp::doIt()
+     else if ( command == "exec" )
+     {
+         checkArgumentCount(argc, 2, 3);
+-        app.kde_open( args->url( 1 ),
+-                      argc == 3 ? args->arg( 2 ) : QString(),
+-                      true );
++        return app.kde_open( args->url( 1 ),
++                             argc == 3 ? args->arg( 2 ) : QString(),
++                             true );
+     }
+     else if ( command == "download" )
+     {
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index 35856b6..60349d5 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -11,7 +11,7 @@
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Version:       4.7.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -48,6 +48,9 @@ Patch10: kde-runtime-4.7.2-no_activitymanager.patch
 # based on patch from ftp://ftp.kde.org/pub/kde/stable/active/1.0/src/
 # includes only the piece wrt additional nepomuk ontologies
 Patch100: active-development-4.7-diff-1.patch
+# 4.8 backport
+# https://projects.kde.org/projects/kde/kde-runtime/repository/revisions/e6e6fb53419ec212ccae083162999d66e7d5663b
+Patch101: kde-runtime-kdebug288389.patch
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -150,6 +153,7 @@ BuildArch: noarch
 %patch9 -p1 -b .man-overrides
 %patch10 -p1 -b .no_activitymanager
 %patch100 -p1 -b .active-development-4.7
+%patch101 -p1 -b .kdebug288389
 
 
 %build
@@ -304,6 +308,9 @@ fi
 
 
 %changelog
+* Wed Dec 14 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-2
+- kde-open gives incorrect exit status (#760748,kde#288389)
+
 * Fri Dec 02 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.4-1
 - 4.7.4
 


More information about the scm-commits mailing list