From 724369dc21715f617963f4939b87a6594cded33d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 Jun 2014 16:55:33 -0300 Subject: kde packages: updating libre and nonprism packages to 4.13.2 version --- libre/kdebase-konqueror-libre/PKGBUILD | 6 ++-- libre/kdebase-runtime-libre/PKGBUILD | 8 +++--- libre/kdelibs-libre/PKGBUILD | 16 ++++------- libre/kdelibs-libre/fix-xfreepixmap-call.patch | 24 ---------------- libre/kdelibs-libre/security-fix.patch | 32 ---------------------- libre/kdenetwork-kopete-libre/PKGBUILD | 8 +++--- libre/kdeutils-ark-libre/PKGBUILD | 6 ++-- nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 8 +++--- nonprism/kdepim-runtime-nonprism/PKGBUILD | 6 ++-- 9 files changed, 27 insertions(+), 87 deletions(-) delete mode 100644 libre/kdelibs-libre/fix-xfreepixmap-call.patch delete mode 100644 libre/kdelibs-libre/security-fix.patch diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 8cf04237f..6f2ce3b32 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212468 2014-05-14 19:53:18Z svenstaro $ +# $Id: PKGBUILD 214443 2014-06-09 03:04:24Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz # Maintainer: Michał Masłowski @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -18,7 +18,7 @@ provides=("kdebase-konqueror=$pkgver") makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'konq-about-fsdg.diff') -sha1sums=('9b19ce18bd7e2beb9d43d33fc9a6c98b6452fc50' +sha1sums=('90b4fefcd307df8da6f6eab4da97d9e7be9f2f78' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 65f819c52..468f35da4 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 213013 2014-05-17 10:14:55Z andrea $ +# $Id: PKGBUILD 214415 2014-06-09 03:02:38Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz # Maintainer: André Silva _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('57b0cd485ec9f7d70b535c136516dd0d3c345311' +sha1sums=('3ee6b1d263b7c87a63951a0ebc4d77a93c92214a' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') 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 # Maintainer: André Silva _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 -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 -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) { diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 74e2d75fb..1a468243e 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214073 2014-06-03 09:46:26Z andrea $ +# $Id: PKGBUILD 214656 2014-06-09 03:17:39Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1') +sha1sums=('bf520ce1fd08eb0464753675405b0f362fef2606') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 57d2f0cc9..d97c67589 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 212732 2014-05-14 20:10:50Z svenstaro $ +# $Id: PKGBUILD 214706 2014-06-09 03:21:25Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ optdepends=('p7zip' 'zip' 'unzip' 'unar') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('e3c5dbe62caeb23a6a19e2313192f2d4e75f32e9' +sha1sums=('450aead29450fa1d17016e4bf8b8e5fdca30de05' 'a0a836950f185d9b2245204579f969203036fdec') prepare() { diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index 167f2a659..c8e3185f5 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214073 2014-06-03 09:46:26Z andrea $ +# $Id: PKGBUILD 214656 2014-06-09 03:17:39Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre-nonprism -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libre-nonprism.patch') -sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1' +sha1sums=('bf520ce1fd08eb0464753675405b0f362fef2606' 'ddde6ed0b6f281512dc12cb80f712f33c6932c92') prepare() { diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD index 339d9c25a..ae950389c 100644 --- a/nonprism/kdepim-runtime-nonprism/PKGBUILD +++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 212442 2014-05-14 19:51:52Z svenstaro $ +# $Id: PKGBUILD 214417 2014-06-09 03:02:46Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz # Maintainer: André Silva _pkgname=kdepim-runtime pkgname=kdepim-runtime-nonprism -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence') conflicts=(kdepim-runtime) provides=(kdepim-runtime=$pkgver) source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz") -sha1sums=('e02447616460760232f03124be8b688cd8407196') +sha1sums=('db31fa444f74478cddef1aa7c4ecf4e509f3407c') prepare() { mkdir build -- cgit v1.2.3