Tue May 6 03:39:24 UTC 2014

10 files changed, 119 insertions, 37 deletions

diff --git a/extra/baloo/PKGBUILD b/extra/baloo/PKGBUILD
index 8561c2ada..45b3b9f10 100644
--- a/extra/baloo/PKGBUILD
+++ b/extra/baloo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211334 2014-04-18 18:01:21Z andrea $
+# $Id: PKGBUILD 212054 2014-05-05 17:50:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=baloo
 pkgver=4.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework for searching and managing metadata"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs/baloo'
@@ -11,18 +11,23 @@ license=('LGPL')
 depends=('kdepimlibs' 'xapian-core' 'kfilemetadata')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ace3a80d3c0e3bb444ebe7f30392db791eab7c61')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'krunner-crash.patch')
+sha1sums=('ace3a80d3c0e3bb444ebe7f30392db791eab7c61'
+          'fdb37257dca64531559fdc2ddf4730582b9a009c')
 
 prepare() {
   mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/krunner-crash.patch
 }
 
 build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
diff --git a/extra/baloo/krunner-crash.patch b/extra/baloo/krunner-crash.patch
new file mode 100644
index 000000000..733556d80
--- /dev/null
+++ b/extra/baloo/krunner-crash.patch
@@ -0,0 +1,35 @@
+commit 5bdb32928dc3eabf482676bb039104d1137cf1fb
+Author: Vishesh Handa <me@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);
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 5edf28227..6bcb3e7b8 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 210158 2014-04-10 14:28:28Z bpiotrowski $
+# $Id: PKGBUILD 212060 2014-05-05 19:27:06Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
@@ -19,16 +19,9 @@ depends=(
       'v4l-utils' 'x264' 'xvidcore' 'zlib' 'x265'
       )
 makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}
-        0001-libx265-Support-API-version-9.patch)
-md5sums=('b8a1ee4964c2638f46fcc803ed453818'
-         'SKIP'
-         '4cbf9b13dc013e96be36445b4a2bfdac')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../0001-libx265-Support-API-version-9.patch
-}
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('581affe5d820d89ce21fe3f0316ef2c3'
+         'SKIP')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 455d46c10..349158527 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211870 2014-04-28 15:12:01Z jgc $
+# $Id: PKGBUILD 212051 2014-05-05 16:34:04Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.12.1
-pkgrel=2
+pkgver=3.12.2
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,7 +16,7 @@ install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('639df1fb978c765009d574d0fb892abbf35f1e875ba71e801cb0dd555a15f23c')
+sha256sums=('e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index 68837699c..f94bf3632 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 211908 2014-04-29 12:38:45Z andyrtr $
+# $Id: PKGBUILD 212058 2014-05-05 19:13:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
-pkgver=1.4.1
+pkgver=1.5
 pkgrel=1
 pkgdesc="A portable middleware for email access"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.etpan.org/libetpan.html"
 license=("custom:etpan")
 depends=('libsasl' 'curl' 'expat')
 source=(https://github.com/dinhviethoa/${pkgname}/archive/${pkgver}.tar.gz)
-md5sums=('430a530a38d3bc6028b973a75d219891')
+md5sums=('f5a0ae8071937b31d0facc1f2d874ead')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
index a60163757..198df650d 100644
--- a/extra/libkscreen/PKGBUILD
+++ b/extra/libkscreen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 199946 2013-11-20 08:45:12Z andrea $
+# $Id: PKGBUILD 212048 2014-05-05 12:13:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=libkscreen
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 pkgdesc="KDE's screen management library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('kdelibs' 'qjson')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('39f5316ef4f9203dd7a42180edbab122')
+md5sums=('7048db071d669193f8dafc9a1319998b')
 
 prepare() {
   mkdir build
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index d27620468..2a31a43f2 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 209788 2014-04-04 08:57:39Z andyrtr $
+# $Id: PKGBUILD 212049 2014-05-05 12:26:57Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -8,7 +8,7 @@ _amalgamationver=3080403
 _docver=${_amalgamationver}
 #_docver=3080001
 pkgver=3.8.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom:Public Domain')
@@ -17,11 +17,19 @@ makedepends=('tcl' 'readline')
 source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
 	http://www.sqlite.org/2014/sqlite-autoconf-$_amalgamationver.tar.gz
 	http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip
-	license.txt)
+	license.txt
+	sqlite-nautilus.patch)
 options=('!emptydirs')
 sha1sums=('70f3b100fa22e5bfebfe1b0a2102612e3c6c53fb'
           'ce8615799a9da7fc9d2cbcd2774d77da4ba72417'
-          'f34f6daa4ab3073d74e774aad21d66878cf26853')
+          'f34f6daa4ab3073d74e774aad21d66878cf26853'
+          '4e9a4f80c91bbaf80f0f45b9b97fb1cbe3464bc7')
+
+prepare() {
+  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
+  # https://bugs.archlinux.org/task/39861
+  patch -Np1 -i ${srcdir}/sqlite-nautilus.patch
+}
 
 build() {
   export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
diff --git a/extra/sqlite/sqlite-nautilus.patch b/extra/sqlite/sqlite-nautilus.patch
new file mode 100644
index 000000000..046b1acfa
--- /dev/null
+++ b/extra/sqlite/sqlite-nautilus.patch
@@ -0,0 +1,41 @@
+Upstream fix for the issue that caused nautilus to crash.
+RHBZ: #1075889
+
+--- src/sqlite3.c
++++ src/sqlite3.c
+@@ -4855,18 +4855,10 @@
+   ** rowid appears in the ORDER BY clause, the corresponding WhereLoop is
+   ** automatically order-distinct.
+   */
+ 
+   assert( pOrderBy!=0 );
+-
+-  /* Sortability of virtual tables is determined by the xBestIndex method
+-  ** of the virtual table itself */
+-  if( pLast->wsFlags & WHERE_VIRTUALTABLE ){
+-    testcase( nLoop>0 );  /* True when outer loops are one-row and match 
+-                          ** no ORDER BY terms */
+-    return pLast->u.vtab.isOrdered;
+-  }
+   if( nLoop && OptimizationDisabled(db, SQLITE_OrderByIdxJoin) ) return 0;
+ 
+   nOrderBy = pOrderBy->nExpr;
+   testcase( nOrderBy==BMS-1 );
+   if( nOrderBy>BMS-1 ) return 0;  /* Cannot optimize overly large ORDER BYs */
+@@ -4875,11 +4867,14 @@
+   orderDistinctMask = 0;
+   ready = 0;
+   for(iLoop=0; isOrderDistinct && obSat<obDone && iLoop<=nLoop; iLoop++){
+     if( iLoop>0 ) ready |= pLoop->maskSelf;
+     pLoop = iLoop<nLoop ? pPath->aLoop[iLoop] : pLast;
+-    assert( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0 );
++    if( pLoop->wsFlags & WHERE_VIRTUALTABLE ){
++      if( pLoop->u.vtab.isOrdered ) obSat = obDone;
++      break;
++    }
+     iCur = pWInfo->pTabList->a[pLoop->iTab].iCursor;
+ 
+     /* Mark off any ORDER BY term X that is a column in the table of
+     ** the current loop for which there is term in the WHERE
+     ** clause of the form X IS NULL or X=? that reference only outer
+
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 64c79168c..85ad11050 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210536 2014-04-14 20:07:33Z jgc $
+# $Id: PKGBUILD 212056 2014-05-05 18:59:54Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem
-pkgver=3.12.0
+pkgver=3.12.1
 pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
@@ -28,7 +28,7 @@ conflicts=(totem-plugin)
 replaces=(totem-plugin)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         browser-plugins.ini bugreport.patch)
-sha256sums=('96762a1c2026f7bbc6ef8a431cf7626647e54ac2d195eb573a71d62dc3a2c430'
+sha256sums=('dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e'
             '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167')
 
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 2436be818..82c8de005 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.4
-_patchlevel=214
-__hgrev=d2ef98a43b5d
+_patchlevel=274
+__hgrev=075eea398fff
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -20,7 +20,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('5ec7d7f84955dacfef88e52ebc79b267'
+md5sums=('98bf9f8d57b95715d08fcc42beae8761'
          'SKIP'
          'b9d4dcb9d3ee2e151dc4be1e94934f6a'
          '10353a61aadc3f276692d0e17db1478e'