[arch-commits] Commit in baloo/trunk (PKGBUILD krunner-crash.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, May 14, 2014 @ 21:50:55
  Author: svenstaro
Revision: 212434

upgpkg: baloo 4.13.1-1

upstream release 4.13.1

Modified:
  baloo/trunk/PKGBUILD
Deleted:
  baloo/trunk/krunner-crash.patch

---------------------+
 PKGBUILD            |   13 ++++---------
 krunner-crash.patch |   35 -----------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-14 19:50:53 UTC (rev 212433)
+++ PKGBUILD	2014-05-14 19:50:55 UTC (rev 212434)
@@ -2,8 +2,8 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=baloo
-pkgver=4.13.0
-pkgrel=2
+pkgver=4.13.1
+pkgrel=1
 pkgdesc="A framework for searching and managing metadata"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs/baloo'
@@ -11,16 +11,11 @@
 depends=('kdepimlibs' 'xapian-core' 'kfilemetadata')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'krunner-crash.patch')
-sha1sums=('ace3a80d3c0e3bb444ebe7f30392db791eab7c61'
-          'fdb37257dca64531559fdc2ddf4730582b9a009c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('9ba97e33ad91da722f361d8fd4eb65d88e73956c')
 
 prepare() {
   mkdir build
-
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/krunner-crash.patch
 }
 
 build() {

Deleted: krunner-crash.patch
===================================================================
--- krunner-crash.patch	2014-05-14 19:50:53 UTC (rev 212433)
+++ krunner-crash.patch	2014-05-14 19:50:55 UTC (rev 212434)
@@ -1,35 +0,0 @@
-commit 5bdb32928dc3eabf482676bb039104d1137cf1fb
-Author: Vishesh Handa <me at vhanda.in>
-Date:   Mon May 5 16:28:17 2014 +0200
-
-    XapianSearchStore: Split the string based on + * / - =
-    
-    When we receive a search string, we typically split it up by spaces and
-    dots. Then each sub string is checked, if it is <= 3 characters, we use
-    our own expansion scheme (imperfect) otherwise xapians.
-    
-    We need to use our own completion scheme because xapian's consumes too
-    much memory in the case of very few characters. It basically expands the
-    string to every possible completion result it has in its db, this
-    results in loads and loads of memory being consumed.
-    
-    We now split based on some extra characters so that when searching for
-    '2*2=' will not consume all your RAM in the case when your DB has many
-    words starting with 2.
-    
-    BUG: 332253
-    FIXED-IN: 4.13.1
-
-diff --git a/src/xapian/xapiansearchstore.cpp b/src/xapian/xapiansearchstore.cpp
-index a0529ce..1a59e3e 100644
---- a/src/xapian/xapiansearchstore.cpp
-+++ b/src/xapian/xapiansearchstore.cpp
-@@ -174,7 +174,7 @@ namespace {
- Xapian::Query XapianSearchStore::constructSearchQuery(const QString& str)
- {
-     QVector<Xapian::Query> queries;
--    QRegExp splitRegex("[\\s.]");
-+    QRegExp splitRegex("[\\s.+*/\\-=]");
-     QStringList list = str.split(splitRegex, QString::SkipEmptyParts);
- 
-     QMutableListIterator<QString> iter(list);