[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.11.5-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-runtime.git;a=commitdiff;h=2e53bab

The following commit has been merged in the master branch:
commit 2e53babf86d4611d086334db10938362645390f9
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jan 22 14:00:59 2014 -0300

    New patch: kshorturifilter_qgetenv_calling_error.diff
---
 debian/changelog                                       |  3 +++
 .../patches/kshorturifilter_qgetenv_calling_error.diff | 18 ++++++++++++++++++
 debian/patches/series                                  |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3d1e9e1..b1c4e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ kde-runtime (4:4.11.5-1) UNRELEASED; urgency=low
     test (use_always_present_path_to_test.patch).
   * Add XS-Testsuite: autopkgtest, this package can be now tested.
 
+  [ Maximiliano Curia ]
+  * New patch: kshorturifilter_qgetenv_calling_error.diff
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 15 Dec 2013 22:19:33 +0100
 
 kde-runtime (4:4.11.3-1) unstable; urgency=low
diff --git a/debian/patches/kshorturifilter_qgetenv_calling_error.diff b/debian/patches/kshorturifilter_qgetenv_calling_error.diff
new file mode 100644
index 0000000..6278dcf
--- /dev/null
+++ b/debian/patches/kshorturifilter_qgetenv_calling_error.diff
@@ -0,0 +1,18 @@
+Index: kde-runtime/kurifilter-plugins/shorturi/kshorturifilter.cpp
+===================================================================
+--- kde-runtime.orig/kurifilter-plugins/shorturi/kshorturifilter.cpp	2014-01-21 17:18:45.895102067 -0300
++++ kde-runtime/kurifilter-plugins/shorturi/kshorturifilter.cpp	2014-01-22 14:00:20.347354650 -0300
+@@ -279,10 +279,10 @@
+     // Environment variable expansion.
+     if ( sEnvVarExp.indexIn( path ) == 0 )
+     {
+-      const char* exp = qgetenv( path.mid( 1, sEnvVarExp.matchedLength() - 1 ).toLocal8Bit().data() );
+-      if(exp)
++      QByteArray exp = qgetenv( path.mid( 1, sEnvVarExp.matchedLength() - 1 ).toLocal8Bit().data() );
++      if(! exp.isNull())
+       {
+-        path.replace( 0, sEnvVarExp.matchedLength(), QString::fromLocal8Bit(exp) );
++        path.replace( 0, sEnvVarExp.matchedLength(), QString::fromLocal8Bit(exp.constData()) );
+         expanded = true;
+       }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 26d0f99..be16b43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
 use_the_correct_locale.patch
 use_always_present_path_to_test.patch
+kshorturifilter_qgetenv_calling_error.diff

-- 
KDE Base Runtime module packaging