archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-28 22:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/kdelibs to 4.13.2-3

Browse source
This commit is contained in:
Kevin Mihelich 2014-06-19 00:16:37 +00:00
parent bc747fdd1c
commit 1358019e3e
2 changed files with 62 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
extra/kdelibs/CVE-2014-3494.patch Normal file
View file

@ -0,0 +1,55 @@
From: David Faure <faure@kde.org>
Date: Wed, 18 Jun 2014 18:29:04 +0000
Subject: Don't require a job to handle messageboxes.
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
---
Don't require a job to handle messageboxes.
The POP3 ioslave doesn't have a job when it gets here.
---
--- a/kio/kio/usernotificationhandler.cpp
+++ b/kio/kio/usernotificationhandler.cpp
@@ -19,7 +19,7 @@
#include "usernotificationhandler_p.h"
#include "slave.h"
-#include "job_p.h"
+#include "jobuidelegate.h"
#include <kdebug.h>
@@ -76,19 +76,18 @@
if (m_cachedResults.contains(key)) {
result = *(m_cachedResults[key]);
- } else if (r->slave->job()) {
- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job());
- if (jobPrivate) {
- result = jobPrivate->requestMessageBox(r->type,
- r->data.value(MSG_TEXT).toString(),
- r->data.value(MSG_CAPTION).toString(),
- r->data.value(MSG_YES_BUTTON_TEXT).toString(),
- r->data.value(MSG_NO_BUTTON_TEXT).toString(),
- r->data.value(MSG_YES_BUTTON_ICON).toString(),
- r->data.value(MSG_NO_BUTTON_ICON).toString(),
- r->data.value(MSG_DONT_ASK_AGAIN).toString(),
- r->data.value(MSG_META_DATA).toMap());
- }
+ } else {
+ JobUiDelegate ui;
+ const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type);
+ result = ui.requestMessageBox(type,
+ r->data.value(MSG_TEXT).toString(),
+ r->data.value(MSG_CAPTION).toString(),
+ r->data.value(MSG_YES_BUTTON_TEXT).toString(),
+ r->data.value(MSG_NO_BUTTON_TEXT).toString(),
+ r->data.value(MSG_YES_BUTTON_ICON).toString(),
+ r->data.value(MSG_NO_BUTTON_ICON).toString(),
+ r->data.value(MSG_DONT_ASK_AGAIN).toString(),
+ r->data.value(MSG_META_DATA).toMap());
m_cachedResults.insert(key, new int(result));
}
} else {

11
extra/kdelibs/PKGBUILD
View file

@ -7,7 +7,7 @@
pkgname=kdelibs pkgname=kdelibs
pkgver=4.13.2 pkgver=4.13.2
pkgrel=2 pkgrel=3
pkgdesc="KDE Core Libraries" pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs' url='https://projects.kde.org/projects/kde/kdelibs'
@ -20,14 +20,17 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
install=${pkgname}.install install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
'arm-coronaoffscreen-input-fixes.diff') 'arm-coronaoffscreen-input-fixes.diff'
'CVE-2014-3494.patch')
sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec' sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7' '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67' '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
'ed1f57ee661e5c7440efcaba7e51d2554709701c' 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
'855150096763600c970aa307c8241b96da33b9ed') '855150096763600c970aa307c8241b96da33b9ed'
'c8b4010c68cee6352a68d97da3d5316f52207e83')
prepare() { prepare() {
mkdir build
cd ${pkgname}-${pkgver} cd ${pkgname}-${pkgver}
# avoid file conflict with gnome-menus # avoid file conflict with gnome-menus
patch -p1 -i "${srcdir}"/kde-applications-menu.patch patch -p1 -i "${srcdir}"/kde-applications-menu.patch
@ -39,10 +42,10 @@ prepare() {
patch -p1 -i "${srcdir}"/arm-coronaoffscreen-input-fixes.diff patch -p1 -i "${srcdir}"/arm-coronaoffscreen-input-fixes.diff
# fix build with giflib 5.1.0 # fix build with giflib 5.1.0
sed -i "/DGifCloseFile/s:file:&, NULL:g" khtml/imload/decoders/gifloader.cpp sed -i "/DGifCloseFile/s:file:&, NULL:g" khtml/imload/decoders/gifloader.cpp
patch -p1 -i "${srcdir}"/CVE-2014-3494.patch
} }
build() { build() {
mkdir build
cd build cd build
cmake ../${pkgname}-${pkgver} \ cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \