Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

3 files changed, 6 insertions, 66 deletions

diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 696ab790d..60f17de47 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 213594 2014-05-26 08:53:32Z andrea $
+# $Id: PKGBUILD 214788 2014-06-10 17:50:05Z andyrtr $
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.13.1
-pkgrel=3
+pkgver=4.13.2
+pkgrel=1
 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -21,12 +21,10 @@ depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt'
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kde-applications-menu.patch' 'qt4.patch'
-        'fix-cifs-mount.patch' 'khtml-fsdg.diff')
-sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec'
+        'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff')
+sha1sums=('c540edeb7da23f5a8feacb4d775bce43f2060a96'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-          '26bbebeaf3f882d84030fd9b39b7b4c9debbbeec'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 prepare() {
@@ -35,9 +33,7 @@ prepare() {
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # qmake refers to Qt5
        patch -p1 -i "${srcdir}"/qt4.patch
-
-       patch -p1 -i "${srcdir}"/fix-cifs-mount.patch
-       # Don't ask the user to download a plugin, it's probably nonfree.
+       # don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 }
 
diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch
deleted file mode 100644
index 5f5354633..000000000
--- a/libre/kdelibs-libre/fix-xfreepixmap-call.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 9323adac35d40da69e3cb18504340e984c4afd05
-Author: Anne-Marie Mahfouf <annma@kde.org>
-Date:   Fri May 10 17:12:33 2013 +0200
-
-    Fix crash when quitting apps
-    
-    Backport to 4.10 branch
-    
-    CCBUG: 319137
-
-diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp
-index b54fb1a..1925670 100644
---- a/plasma/private/dialogshadows.cpp
-+++ b/plasma/private/dialogshadows.cpp
-@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps()
- {
- #ifdef Q_WS_X11
-     foreach (const QPixmap &pixmap, m_shadowPixmaps) {
-+        if (!QX11Info::display()) {
-+            return;
-+        }
-         if (!pixmap.isNull()) {
-             XFreePixmap(QX11Info::display(), pixmap.handle());
-         }
diff --git a/libre/kdelibs-libre/security-fix.patch b/libre/kdelibs-libre/security-fix.patch
deleted file mode 100644
index 3d98a47ae..000000000
--- a/libre/kdelibs-libre/security-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 65d736dab592bced4410ccfa4699de89f78c96ca
-Author: Grégory Oestreicher <greg@kamago.net>
-Date:   Wed May 8 23:16:00 2013 +0200
-
-    Don't show passwords contained in HTTP URLs in error messages
-    BUG: 319428
-
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 2d139a9..129fc7b 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -3056,7 +3056,7 @@ try_again:
-             ; // Ignore error
-         } else {
-             if (!sendErrorPageNotification()) {
--                error(ERR_INTERNAL_SERVER, m_request.url.url());
-+                error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl());
-                 return false;
-             }
-         }
-@@ -3072,9 +3072,9 @@ try_again:
-         // Tell that we will only get an error page here.
-         if (!sendErrorPageNotification()) {
-             if (m_request.responseCode == 403)
--                error(ERR_ACCESS_DENIED, m_request.url.url());
-+                error(ERR_ACCESS_DENIED, m_request.url.prettyUrl());
-             else
--                error(ERR_DOES_NOT_EXIST, m_request.url.url());
-+                error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl());
-             return false;
-         }
-     } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) {