[arch-commits] Commit in kwin/repos (10 files)
Date: Saturday, February 14, 2015 @ 22:13:17 Author: andyrtr Revision: 231397 archrelease: copy trunk to staging-i686, staging-x86_64 Added: kwin/repos/staging-i686/ kwin/repos/staging-i686/PKGBUILD (from rev 231396, kwin/trunk/PKGBUILD) kwin/repos/staging-i686/kdebug-341971.patch (from rev 231396, kwin/trunk/kdebug-341971.patch) kwin/repos/staging-i686/kwin.install (from rev 231396, kwin/trunk/kwin.install) kwin/repos/staging-i686/libinput.0.8.0.patch (from rev 231396, kwin/trunk/libinput.0.8.0.patch) kwin/repos/staging-x86_64/ kwin/repos/staging-x86_64/PKGBUILD (from rev 231396, kwin/trunk/PKGBUILD) kwin/repos/staging-x86_64/kdebug-341971.patch (from rev 231396, kwin/trunk/kdebug-341971.patch) kwin/repos/staging-x86_64/kwin.install (from rev 231396, kwin/trunk/kwin.install) kwin/repos/staging-x86_64/libinput.0.8.0.patch (from rev 231396, kwin/trunk/libinput.0.8.0.patch) -+ staging-i686/PKGBUILD | 50 staging-i686/kdebug-341971.patch| 190 ++ staging-i686/kwin.install | 11 + staging-i686/libinput.0.8.0.patch | 25 staging-x86_64/PKGBUILD | 50 staging-x86_64/kdebug-341971.patch | 190 ++ staging-x86_64/kwin.install | 11 + staging-x86_64/libinput.0.8.0.patch | 25 8 files changed, 552 insertions(+) Copied: kwin/repos/staging-i686/PKGBUILD (from rev 231396, kwin/trunk/PKGBUILD) === --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-02-14 21:13:17 UTC (rev 231397) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Andrea Scarpino and...@archlinux.org + +pkgname=kwin +pkgver=5.2.0.1 +_dir=5.2.0 +pkgrel=3 +pkgdesc='KDE Window manager' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/workspace/kwin' +license=('LGPL') +depends=('qt5-multimedia' 'plasma-framework' 'knewstuff' 'libxcursor' 'kinit' + 'hicolor-icon-theme' 'libepoxy' 'kwayland' 'libinput' 'kdecoration') +makedepends=('extra-cmake-modules' 'qt5-tools' 'kdoctools') +groups=('plasma') +install=${pkgname}.install +conflicts=('kdebase-workspace') +source=(http://download.kde.org/stable/plasma/${_dir}/${pkgname}-${pkgver}.tar.xz; +'kdebug-341971.patch' +'libinput.0.8.0.patch') +md5sums=('47b6ce31b45450fa702098c9f3f5ac95' + '037db2eab5f9e07c74122f1a5fd4fe31' + '0ccc6b0113e37bd994c65ffb6a4518ff') + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/kdebug-341971.patch + + #https://bugs.kde.org/show_bug.cgi?id=342893 + patch -Np1 -i ${srcdir}/libinput.0.8.0.patch +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ +-DCMAKE_BUILD_TYPE=Release \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DLIB_INSTALL_DIR=lib \ +-DLIBEXEC_INSTALL_DIR=lib \ +-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ +-DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR=${pkgdir} install +} Copied: kwin/repos/staging-i686/kdebug-341971.patch (from rev 231396, kwin/trunk/kdebug-341971.patch) === --- staging-i686/kdebug-341971.patch(rev 0) +++ staging-i686/kdebug-341971.patch2015-02-14 21:13:17 UTC (rev 231397) @@ -0,0 +1,190 @@ +From: Marco Martin notm...@gmail.com +Date: Wed, 28 Jan 2015 08:58:47 + +Subject: use xembed for the qml view of window decorations modul +X-Git-Url: http://quickgit.kde.org/?p=kwin.gita=commitdiffh=63885cc5b3f2922441dac0af96ed001b737e78ea +--- +use xembed for the qml view of window decorations modul + +the only way to ensure the view won't randomly become black +(probably QQuickwidget won't be fixed in qt anytime soon or +ever in 5.x lifetime due to how architecturally is) + +basically systemsettings has no control of what gets loaded in, +if one other kcm will call winId(), this one will break. + +BUG:341971 +--- + + +--- a/kcmkwin/kwindecoration/kcm.cpp b/kcmkwin/kwindecoration/kcm.cpp +@@ -36,6 +36,7 @@ + #include QQmlContext + #include QQmlEngine + #include QQuickItem ++#include QQuickView + #include QSortFilterProxyModel + #include QStandardPaths + #include QVBoxLayout +@@ -77,21 +78,26 @@ + m_proxyModel-setFilterCaseSensitivity(Qt::CaseInsensitive); + connect(m_ui-filter, QLineEdit::textChanged, m_proxyModel, QSortFilterProxyModel::setFilterFixedString); + ++m_quickView = new QQuickView(0); + KDeclarative::KDeclarative kdeclarative; +-kdeclarative.setDeclarativeEngine(m_ui-view-engine()); ++kdeclarative.setDeclarativeEngine(m_quickView-engine()); + kdeclarative.setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN)); + kdeclarative.setupBindings(); + + qmlRegisterTypeQAbstractItemModel(); +-
[arch-commits] Commit in kwin/repos (10 files)
Date: Wednesday, January 28, 2015 @ 19:03:13 Author: andrea Revision: 230218 archrelease: copy trunk to extra-i686, extra-x86_64 Added: kwin/repos/extra-i686/PKGBUILD (from rev 230217, kwin/trunk/PKGBUILD) kwin/repos/extra-i686/kdebug-341971.patch (from rev 230217, kwin/trunk/kdebug-341971.patch) kwin/repos/extra-i686/kwin.install (from rev 230217, kwin/trunk/kwin.install) kwin/repos/extra-x86_64/PKGBUILD (from rev 230217, kwin/trunk/PKGBUILD) kwin/repos/extra-x86_64/kdebug-341971.patch (from rev 230217, kwin/trunk/kdebug-341971.patch) kwin/repos/extra-x86_64/kwin.install (from rev 230217, kwin/trunk/kwin.install) Deleted: kwin/repos/extra-i686/PKGBUILD kwin/repos/extra-i686/kwin.install kwin/repos/extra-x86_64/PKGBUILD kwin/repos/extra-x86_64/kwin.install --+ /PKGBUILD| 90 + /kwin.install| 22 extra-i686/PKGBUILD | 40 --- extra-i686/kdebug-341971.patch | 190 + extra-i686/kwin.install | 11 -- extra-x86_64/PKGBUILD| 40 --- extra-x86_64/kdebug-341971.patch | 190 + extra-x86_64/kwin.install| 11 -- 8 files changed, 492 insertions(+), 102 deletions(-) Deleted: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2015-01-28 17:58:18 UTC (rev 230217) +++ extra-i686/PKGBUILD 2015-01-28 18:03:13 UTC (rev 230218) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino and...@archlinux.org - -pkgname=kwin -pkgver=5.2.0.1 -_dir=5.2.0 -pkgrel=1 -pkgdesc='KDE Window manager' -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/workspace/kwin' -license=('LGPL') -depends=('qt5-multimedia' 'plasma-framework' 'knewstuff' 'libxcursor' 'kinit' - 'hicolor-icon-theme' 'libepoxy' 'kwayland' 'libinput' 'kdecoration') -makedepends=('extra-cmake-modules' 'qt5-tools' 'kdoctools') -groups=('plasma') -install=${pkgname}.install -conflicts=('kdebase-workspace') -source=(http://download.kde.org/stable/plasma/${_dir}/${pkgname}-${pkgver}.tar.xz;) -md5sums=('47b6ce31b45450fa702098c9f3f5ac95') - -prepare() { - mkdir build -} - -build() { - cd build - cmake ../${pkgname}-${pkgver} \ --DCMAKE_BUILD_TYPE=Release \ --DCMAKE_INSTALL_PREFIX=/usr \ --DLIB_INSTALL_DIR=lib \ --DLIBEXEC_INSTALL_DIR=lib \ --DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ --DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR=${pkgdir} install -} Copied: kwin/repos/extra-i686/PKGBUILD (from rev 230217, kwin/trunk/PKGBUILD) === --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-01-28 18:03:13 UTC (rev 230218) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Andrea Scarpino and...@archlinux.org + +pkgname=kwin +pkgver=5.2.0.1 +_dir=5.2.0 +pkgrel=2 +pkgdesc='KDE Window manager' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/workspace/kwin' +license=('LGPL') +depends=('qt5-multimedia' 'plasma-framework' 'knewstuff' 'libxcursor' 'kinit' + 'hicolor-icon-theme' 'libepoxy' 'kwayland' 'libinput' 'kdecoration') +makedepends=('extra-cmake-modules' 'qt5-tools' 'kdoctools') +groups=('plasma') +install=${pkgname}.install +conflicts=('kdebase-workspace') +source=(http://download.kde.org/stable/plasma/${_dir}/${pkgname}-${pkgver}.tar.xz; +'kdebug-341971.patch') +md5sums=('47b6ce31b45450fa702098c9f3f5ac95' + '037db2eab5f9e07c74122f1a5fd4fe31') + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/kdebug-341971.patch +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ +-DCMAKE_BUILD_TYPE=Release \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DLIB_INSTALL_DIR=lib \ +-DLIBEXEC_INSTALL_DIR=lib \ +-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ +-DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR=${pkgdir} install +} Copied: kwin/repos/extra-i686/kdebug-341971.patch (from rev 230217, kwin/trunk/kdebug-341971.patch) === --- extra-i686/kdebug-341971.patch (rev 0) +++ extra-i686/kdebug-341971.patch 2015-01-28 18:03:13 UTC (rev 230218) @@ -0,0 +1,190 @@ +From: Marco Martin notm...@gmail.com +Date: Wed, 28 Jan 2015 08:58:47 + +Subject: use xembed for the qml view of window decorations modul +X-Git-Url: http://quickgit.kde.org/?p=kwin.gita=commitdiffh=63885cc5b3f2922441dac0af96ed001b737e78ea +--- +use xembed for the qml view of window decorations modul + +the only way to ensure the view won't randomly become black +(probably QQuickwidget won't be fixed in qt anytime soon or +ever in 5.x lifetime due to how architecturally is) + +basically systemsettings has no control of what gets loaded in,