Patchwork [meta-qt5,PATCHv2,10/10] maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files

login
register
mail settings
Submitter Martin Jansa
Date June 5, 2014, 10:08 p.m.
Message ID <1402006139-27614-10-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/73343/
State New, archived
Headers show

Comments

Martin Jansa - June 5, 2014, 10:08 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...LUGIN_PATH-to-allow-openembedded-to-build.patch | 34 -----------------
 ...k-to-libmaliit-1-0-in-inputcontext-plugin.patch | 23 ------------
 .../maliit/maliit-framework-qt5/qt5.3-fix.patch    | 43 ++++++++++++++++++++++
 recipes-qt/maliit/maliit-framework-qt5_git.bb      |  1 +
 4 files changed, 44 insertions(+), 57 deletions(-)
 delete mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
 delete mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
 create mode 100644 recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch

Patch

diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
deleted file mode 100644
index 830e6de..0000000
--- a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From fb6acbd2af9ed288c1c4f4200fc73d8d9955486a Mon Sep 17 00:00:00 2001
-From: Samuel Stirtzel <s.stirtzel@googlemail.com>
-Date: Wed, 1 Aug 2012 13:33:10 +0200
-Subject: [PATCH] Fix QT_IM_PLUGIN_PATH to allow openembedded to build Maliit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
----
- input-context/input-context.pri |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/input-context/input-context.pri b/input-context/input-context.pri
-index d94e6a3..d460e70 100644
---- a/input-context/input-context.pri
-+++ b/input-context/input-context.pri
-@@ -25,8 +25,10 @@ for(OPTION,$$list($$lower($$COV_OPTION))){
- 
- QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda
- 
--QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
--QT_PREFIX = $$[QT_INSTALL_PREFIX]
--local-install {
--    QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
-+isEmpty(QT_IM_PLUGIN_PATH) {
-+    QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
-+    QT_PREFIX = $$[QT_INSTALL_PREFIX]
-+    local-install {
-+        QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
-+    }
- }
--- 
-1.7.9.5
-
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
deleted file mode 100644
index c2291c6..0000000
--- a/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
+++ /dev/null
@@ -1,23 +0,0 @@ 
-From cc33efdedbec9e9a55e9a0c6756516fd84d42e53 Mon Sep 17 00:00:00 2001
-From: Samuel Stirtzel <s.stirtzel@googlemail.com>
-Date: Fri, 1 Mar 2013 11:31:41 +0100
-Subject: [PATCH] Link to libmaliit-1,0 in inputcontext plugin
-
-Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
----
- .../input-context-plugin/input-context-plugin.pro  |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/input-context/input-context-plugin/input-context-plugin.pro b/input-context/input-context-plugin/input-context-plugin.pro
-index eefbe93..296e2fa 100644
---- a/input-context/input-context-plugin/input-context-plugin.pro
-+++ b/input-context/input-context-plugin/input-context-plugin.pro
-@@ -15,3 +15,5 @@ CONFIG += plugin
-
- INSTALLS    += target
- target.path += $$QT_IM_PLUGIN_PATH
-+
-+LIBS += -L../../lib -l"maliit-1.0"
---
-1.7.9.5
-
diff --git a/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch b/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch
new file mode 100644
index 0000000..4f8890f
--- /dev/null
+++ b/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch
@@ -0,0 +1,43 @@ 
+Fix compatibility with qt-5.3
+
+https://bugs.launchpad.net/ubuntu/+source/maliit-framework/+bug/1323962
+
+Upstream-Status: Pending
+
+diff --git a/src/maliit/plugins/updateevent.cpp b/src/maliit/plugins/updateevent.cpp
+index 06a5228..85b7166 100644
+--- a/src/maliit/plugins/updateevent.cpp
++++ b/src/maliit/plugins/updateevent.cpp
+@@ -38,7 +38,7 @@ bool MImUpdateEventPrivate::isFlagSet(Qt::InputMethodHint hint,
+     bool result = false;
+ 
+     if (update.contains(Maliit::Internal::inputMethodHints)) {
+-        const Qt::InputMethodHints hints(static_cast<Qt::InputMethodHints>(
++        const Qt::InputMethodHints hints(static_cast<int>(
+                                              update.value(Maliit::Internal::inputMethodHints).toLongLong()));
+ 
+         result = (hints & hint);
+@@ -89,8 +89,8 @@ QStringList MImUpdateEvent::propertiesChanged() const
+ Qt::InputMethodHints MImUpdateEvent::hints(bool *changed) const
+ {
+     Q_D(const MImUpdateEvent);
+-    return static_cast<Qt::InputMethodHints>(
+-        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong());
++    return Qt::InputMethodHints(static_cast<int>(
++        d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong()));
+ }
+ 
+ bool MImUpdateEvent::westernNumericInputEnforced(bool *changed) const
+diff --git a/src/mimpluginmanager.cpp b/src/mimpluginmanager.cpp
+index 02788a4..3c5c99a 100644
+--- a/src/mimpluginmanager.cpp
++++ b/src/mimpluginmanager.cpp
+@@ -1493,7 +1493,7 @@ void MIMPluginManager::handleWidgetStateChanged(unsigned int clientId,
+         }
+     }
+ 
+-    const Qt::InputMethodHints lastHints = static_cast<Qt::InputMethodHints>(newState.value(Maliit::Internal::inputMethodHints).toLongLong());
++    const Qt::InputMethodHints lastHints(static_cast<int>(newState.value(Maliit::Internal::inputMethodHints).toLongLong()));
+     MImUpdateEvent ev(newState, changedProperties, lastHints);
+ 
+     // general notification last
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
index 633bf6e..3ef56ec 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -9,6 +9,7 @@  inherit qmake5
 SRC_URI = "git://github.com/maliit/framework.git;branch=master \
     file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
     file://maliit-server.desktop \
+    file://qt5.3-fix.patch \
 "
 
 SRCREV = "dbc0403f329d7f6ce2f5a09e6ff5adbd2548a8c9"