git » frameworkintegration.git » commit c010b14

KDE Frameworks 5.10

author Antonio Rojas
2015-05-06 06:18:10 UTC
committer Antonio Rojas
2015-05-06 06:18:10 UTC
parent abff55f926ebc46ead5e45e13ee4a26df73856fc

KDE Frameworks 5.10

PKGBUILD +4 -8
fix_file_dialogs.patch +0 -25

diff --git a/PKGBUILD b/PKGBUILD
index 5a2b697..c035c8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=frameworkintegration
-pkgver=5.9.0
-pkgrel=3
+pkgver=5.10.0
+pkgrel=1
 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'
@@ -11,15 +11,11 @@ license=('LGPL')
 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'
-         '89351a4b31f610bad9962693a1bd2b7e')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('bc7b295d55fe1353ae498861b04d3b82')
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir"/fix_file_dialogs.patch
 }
 
 build() {
diff --git a/fix_file_dialogs.patch b/fix_file_dialogs.patch
deleted file mode 100644
index 58ecf33..0000000
--- a/fix_file_dialogs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
-+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
-@@ -272,6 +272,7 @@
- 
- void KDEPlatformFileDialogHelper::exec()
- {
-+    m_dialog->hide(); // ensure dialog is not shown (exec would block input)
-     m_dialog->winId(); // ensure there's a window created
-     KSharedConfig::Ptr conf = KSharedConfig::openConfig();
-     KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize"));
-@@ -296,11 +297,11 @@
- 
- bool KDEPlatformFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent)
- {
-+    Q_UNUSED(parent)
-     initializeDialog();
-     m_dialog->setWindowFlags(windowFlags);
-     m_dialog->setWindowModality(windowModality);
--    if (!parent || (parent && !parent->inherits("QWidgetWindow"))) // see #334963 and #344586 for details
--        m_dialog->show();
-+    m_dialog->show();
-     KSharedConfig::Ptr conf = KSharedConfig::openConfig();
-     KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize"));
-     return true;
-