author | Antonio Rojas
<arojas@archlinux.org> 2015-04-20 14:14:00 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2015-04-20 14:14:00 UTC |
parent | ac2604c79c9836c297ec1b32ea2d62d9f14c6272 |
PKGBUILD | +2 | -3 |
fix_file_dialogs.patch | +2 | -30 |
diff --git a/PKGBUILD b/PKGBUILD index c0fcd0c..5a2b697 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=frameworkintegration pkgver=5.9.0 -pkgrel=2 +pkgrel=3 pkgdesc='Framework providing components to allow applications to integrate with a KDE Workspace' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/frameworks/frameworkintegration' @@ -12,9 +12,8 @@ depends=('kio' 'ttf-oxygen' 'libxcursor') makedepends=('extra-cmake-modules') groups=('kf5') source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" 'fix_file_dialogs.patch') - md5sums=('5a40c112b997e3a30848374bf2a1ae6f' - 'b37ac613e304bbfb984e659bc160bccb') + '89351a4b31f610bad9962693a1bd2b7e') prepare() { mkdir -p build diff --git a/fix_file_dialogs.patch b/fix_file_dialogs.patch index 9b8db34..58ecf33 100644 --- a/fix_file_dialogs.patch +++ b/fix_file_dialogs.patch @@ -1,34 +1,6 @@ -From: David Rosca <nowrep@gmail.com> -Date: Fri, 17 Apr 2015 07:35:24 +0000 -Subject: Fix native file dialogs from widgets QFileDialog -X-Git-Url: http://quickgit.kde.org/?p=frameworkintegration.git&a=commitdiff&h=26406a9aa01d6f4f01a3f084b51451de8385c8fc ---- -Fix native file dialogs from widgets QFileDialog - -There were two issues: -* File dialogs opened with exec() and without parent were -opened, but any user-interaction was blocked in a way that -no file could be selected nor the dialog closed. - -* File dialogs opened with open() or show() with parent were -not opened at all. - -The first issue was caused by first calling show() and then exec() -on the native dialog. -The second one simply because in the case of dialogs with parent -show() wasn't called. - -This fixes it that the show() is always called and hide() is called -before exec(). - -This also adds unittests for file dialogs. - -REVIEW: 123335 ---- - - --- a/src/platformtheme/kdeplatformfiledialoghelper.cpp -+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp@@ -272,6 +272,7 @@ ++++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp +@@ -272,6 +272,7 @@ void KDEPlatformFileDialogHelper::exec() {