[arch-commits] Commit in frameworkintegration/repos (6 files)
Felix Yan
fyan at archlinux.org
Mon Apr 20 15:46:51 UTC 2015
Date: Monday, April 20, 2015 @ 17:46:51
Author: fyan
Revision: 237789
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
frameworkintegration/repos/extra-i686/PKGBUILD
(from rev 237788, frameworkintegration/trunk/PKGBUILD)
frameworkintegration/repos/extra-i686/fix_file_dialogs.patch
(from rev 237788, frameworkintegration/trunk/fix_file_dialogs.patch)
frameworkintegration/repos/extra-x86_64/PKGBUILD
(from rev 237788, frameworkintegration/trunk/PKGBUILD)
frameworkintegration/repos/extra-x86_64/fix_file_dialogs.patch
(from rev 237788, frameworkintegration/trunk/fix_file_dialogs.patch)
Deleted:
frameworkintegration/repos/extra-i686/PKGBUILD
frameworkintegration/repos/extra-x86_64/PKGBUILD
-------------------------------------+
/PKGBUILD | 80 ++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 41 -----------------
extra-i686/fix_file_dialogs.patch | 25 ++++++++++
extra-x86_64/PKGBUILD | 41 -----------------
extra-x86_64/fix_file_dialogs.patch | 25 ++++++++++
5 files changed, 130 insertions(+), 82 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-20 14:23:04 UTC (rev 237788)
+++ extra-i686/PKGBUILD 2015-04-20 15:46:51 UTC (rev 237789)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=frameworkintegration
-pkgver=5.9.0
-pkgrel=2
-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'
-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'
- 'b37ac613e304bbfb984e659bc160bccb')
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/fix_file_dialogs.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: frameworkintegration/repos/extra-i686/PKGBUILD (from rev 237788, frameworkintegration/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-20 15:46:51 UTC (rev 237789)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=frameworkintegration
+pkgver=5.9.0
+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'
+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')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/fix_file_dialogs.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: frameworkintegration/repos/extra-i686/fix_file_dialogs.patch (from rev 237788, frameworkintegration/trunk/fix_file_dialogs.patch)
===================================================================
--- extra-i686/fix_file_dialogs.patch (rev 0)
+++ extra-i686/fix_file_dialogs.patch 2015-04-20 15:46:51 UTC (rev 237789)
@@ -0,0 +1,25 @@
+--- 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;
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-20 14:23:04 UTC (rev 237788)
+++ extra-x86_64/PKGBUILD 2015-04-20 15:46:51 UTC (rev 237789)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=frameworkintegration
-pkgver=5.9.0
-pkgrel=2
-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'
-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'
- 'b37ac613e304bbfb984e659bc160bccb')
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/fix_file_dialogs.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: frameworkintegration/repos/extra-x86_64/PKGBUILD (from rev 237788, frameworkintegration/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-20 15:46:51 UTC (rev 237789)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=frameworkintegration
+pkgver=5.9.0
+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'
+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')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/fix_file_dialogs.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: frameworkintegration/repos/extra-x86_64/fix_file_dialogs.patch (from rev 237788, frameworkintegration/trunk/fix_file_dialogs.patch)
===================================================================
--- extra-x86_64/fix_file_dialogs.patch (rev 0)
+++ extra-x86_64/fix_file_dialogs.patch 2015-04-20 15:46:51 UTC (rev 237789)
@@ -0,0 +1,25 @@
+--- 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;
+
More information about the arch-commits
mailing list