[SCM] baloo packaging branch, kubuntu_wily_archive, updated. ubuntu/5.14.0-0ubuntu1-3-g90bd0d0

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/baloo.git;a=commitdiff;h=90bd0d0

The following commit has been merged in the kubuntu_wily_archive branch:
commit 90bd0d01adab9fb188c82967b178521d904db42d
Author: Philip Muškovac <yofel at gmx.net>
Date:   Sat Sep 26 17:42:26 2015 +0200

    refresh patch to remove fuzz
---
 ...checking_in_various_bits_so_that_baloo_doesnt_crash.diff | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/patches/upstream_add_error_checking_in_various_bits_so_that_baloo_doesnt_crash.diff b/debian/patches/upstream_add_error_checking_in_various_bits_so_that_baloo_doesnt_crash.diff
index c30b4da..07f0445 100644
--- a/debian/patches/upstream_add_error_checking_in_various_bits_so_that_baloo_doesnt_crash.diff
+++ b/debian/patches/upstream_add_error_checking_in_various_bits_so_that_baloo_doesnt_crash.diff
@@ -11,8 +11,8 @@ BUG: 352454
  src/lib/searchstore.cpp |  2 +-
  2 files changed, 14 insertions(+), 4 deletions(-)
 
-diff --git a/src/engine/database.cpp b/src/engine/database.cpp
-index b2b9f47..4f0579f 100644
+Index: b/src/engine/database.cpp
+===================================================================
 --- a/src/engine/database.cpp
 +++ b/src/engine/database.cpp
 @@ -72,14 +72,24 @@ bool Database::open(OpenMode mode)
@@ -43,19 +43,16 @@ index b2b9f47..4f0579f 100644
      Q_ASSERT_X(rc == 0, "Database::open reader_check", mdb_strerror(rc));
  
      //
-diff --git a/src/lib/searchstore.cpp b/src/lib/searchstore.cpp
-index d4abf50..806ea5f 100644
+Index: b/src/lib/searchstore.cpp
+===================================================================
 --- a/src/lib/searchstore.cpp
 +++ b/src/lib/searchstore.cpp
 @@ -66,7 +66,7 @@ SearchStore::~SearchStore()
  
- QStringList SearchStore::exec(const Term& term, int offset, int limit, bool sortResults)
+ QStringList SearchStore::exec(const Term& term, int limit, bool sortResults)
  {
 -    if (!m_db) {
 +    if (!m_db || !m_db->isOpen()) {
          return QStringList();
      }
  
--- 
-2.5.0
-

-- 
baloo packaging