[gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/

[Johannes Huber]

commit:     c231d35eaceec2ebc00d3282a26bc35819d8eda4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 19 17:22:09 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Sep 19 17:22:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c231d35e

[kde-base/kwin] Add upstream patch, fixes build with Qt 5.4

Spotted by Franz Fellner <alpine.art.de <AT> gmail.com>, bug #523194.

Package-Manager: portage-2.2.13

---
 kde-base/kwin/files/kwin-5.0.2-qt54.patch | 37 +++++++++++++++++++++++++++++++
 kde-base/kwin/kwin-5.0.2.ebuild           |  2 ++
 2 files changed, 39 insertions(+)

diff --git a/kde-base/kwin/files/kwin-5.0.2-qt54.patch 
b/kde-base/kwin/files/kwin-5.0.2-qt54.patch
new file mode 100644
index 0000000..e490a94
--- /dev/null
+++ b/kde-base/kwin/files/kwin-5.0.2-qt54.patch
@@ -0,0 +1,37 @@
+commit c00c67bf29c10862a973289486a535c8566d5110
+Author: Martin Gräßlin <mgraess...@kde.org>
+Date:   Wed Sep 3 09:47:21 2014 +0200
+
+    [scripting] Drop qmlRegisterType for QQuickWindow
+    
+    Not needed as one can just do:
+    import QtQuick.Window;
+    
+    This fixes a build problem with Qt 5.4.
+    
+    BUG: 338277
+
+diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp
+index 3bc4358..9dc7bad 100644
+--- a/scripting/scripting.cpp
++++ b/scripting/scripting.cpp
+@@ -620,7 +620,6 @@ void KWin::Scripting::init()
+     
qmlRegisterType<KWin::ScriptingClientModel::ClientModelByScreenAndDesktop>("org.kde.kwin",
 2, 0, "ClientModelByScreenAndDesktop");
+     
qmlRegisterType<KWin::ScriptingClientModel::ClientFilterModel>("org.kde.kwin", 
2, 0, "ClientFilterModel");
+     qmlRegisterType<KWin::Client>();
+-    qmlRegisterType<QQuickWindow>();
+     qmlRegisterType<QAbstractItemModel>();
+ 
+     
m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("workspace"), 
m_workspaceWrapper);
+diff --git a/scripts/desktopchangeosd/contents/ui/osd.qml 
b/scripts/desktopchangeosd/contents/ui/osd.qml
+index fbf7dd7..e2ff86c 100644
+--- a/scripts/desktopchangeosd/contents/ui/osd.qml
++++ b/scripts/desktopchangeosd/contents/ui/osd.qml
+@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public 
License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *********************************************************************/
+ import QtQuick 2.0;
++import QtQuick.Window 2.0;
+ import org.kde.plasma.core 2.0 as PlasmaCore;
+ import org.kde.plasma.components 2.0 as Plasma;
+ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons;

diff --git a/kde-base/kwin/kwin-5.0.2.ebuild b/kde-base/kwin/kwin-5.0.2.ebuild
index 0fd6e0b..5fbac2a 100644
--- a/kde-base/kwin/kwin-5.0.2.ebuild
+++ b/kde-base/kwin/kwin-5.0.2.ebuild
@@ -69,6 +69,8 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/xproto
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt54.patch" )
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package wayland)