Merge lp:~attente/maliit/maliit-0.99.1 into lp:~ubuntu-core-dev/maliit/maliit-framework-ubuntu

[William Hua]

New upstream release 0.99.1.

New upstream release 0.99.1.

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-26 21:36:16 +0000
+++ debian/changelog	2015-11-20 19:51:03 +0000
@@ -1,3 +1,44 @@
+maliit-framework (0.99.1+git20151118+62bd54b-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.99.1:
+    - Introduced Qt5 input context, replacing the one provided by Qt. Can 
+      be enabled by CONFIG+=qt5-inputcontext
+    - Move maliit-glib from GTK+ input context package back into frameowrk
+    - Use GDBus in maliit-glib
+    - Allow plugin window reactive area and input method area reported to
+      application differ
+    - Fix window state to have transient hint and window type as with
+      Maliit 0.8x
+    - Made the dependency from xcb optional
+    - Added a CONFIG option to disable the hardware keyboard
+    - Clear preedit state on input context reset
+    - Reshow virtual keyboard when hardware keyboard disappears
+    - Fix bugs with Qt 5.3, Qt 5.4 and Qt 5.5
+  * debian/control:
+    - Update standards version
+    - Replace libdbus-glib-1-dev with libglib2.0-dev
+    - Fix description of libmaliit-plugins0
+    - Add libmaliit-glib0 and libmaliit-glib-dev
+    - Remove maliit-inputcontext-gtk2 and maliit-inputcontext-gtk3
+  * debian/libmaliit-glib0.install:
+  * debian/libmaliit-glib-dev.install:
+    - Added, mark files for installation
+  * debian/maliit-framework.sh:
+  * debian/xinput/maliit:
+    - Export GTK_IM_MODULE under Unity 8
+  * debian/patches/series:
+  * debian/patches/0008-qt5.3-fix.patch:
+    - Removed, fixed upstream
+  * debian/patches/0014-revert-6e2f8b4253f219688d31002aebf010eeabf0079b.patch:
+    - Added, install generated headers properly
+  * debian/rules:
+    - Don't qmake recursively
+    - Configure to build GLib bindings
+    - Disable warnings due to unused parameters, this is a bug that needs to
+      be fixed in GLib
+
+ -- William Hua <[e-mail]>  Wed, 18 Nov 2015 15:28:03 -0500
+
 maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu8) vivid; urgency=medium
 
   [ William Hua ]

=== modified file 'debian/control'
--- debian/control	2015-01-23 13:19:33 +0000
+++ debian/control	2015-11-20 19:51:03 +0000
@@ -6,7 +6,7 @@
 Uploaders: Michał Zając <[e-mail]>, Iain Lane <[e-mail]>
 Build-Depends: cdbs,
                debhelper (>= 9),
-               libdbus-glib-1-dev,
+               libglib2.0-dev,
                libmtdev-dev,
                libudev-dev,
                libxcb-composite0-dev,
@@ -21,7 +21,7 @@
 # Test depends
                xvfb,
                qtdeclarative5-qtquick2-plugin
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: https://wiki.maliit.org
 Vcs-Browser: https://code.launchpad.net/~ubuntu-core-dev/maliit/maliit-framework-ubuntu
 Vcs-Bzr: lp:~ubuntu-core-dev/maliit/maliit-framework-ubuntu
@@ -34,8 +34,6 @@
         libmaliit-glib0 (<< ${source:Version}),
         libmaliit0 (<< ${source:Version}),
         maliit-dbus-activation (<< ${source:Version}),
-        maliit-inputcontext-gtk2 (<< ${source:Version}),
-        maliit-inputcontext-gtk3 (<< ${source:Version}),
         maliit-inputcontext-qt4 (<< ${source:Version}),
 Description: Maliit Input Method Framework
  Maliit provides a flexible and cross-platform input method framework. It has a
@@ -50,7 +48,7 @@
 Replaces: maliit-framework (<< 0.99)
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Maliit Input Method Framework Plugin Library
+Description: Maliit Input Method Framework - Plugin Library
  Maliit provides a flexible and cross-platform input method framework. It has a
  plugin-based client-server architecture where applications act as clients and
  communicate with the Maliit server via input context plugins. The communication
@@ -93,11 +91,30 @@
  This is a transitional dummy package. It can safely be removed.
 
 Package: libmaliit-glib0
-Depends: maliit-framework, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: any
+Section: libs
+Description: Maliit Input Method Framework - GLib Bindings
+ Maliit provides a flexible and cross-platform input method framework. It has a
+ plugin-based client-server architecture where applications act as clients and
+ communicate with the Maliit server via input context plugins. The communication
+ link currently uses D-Bus. Maliit is an open source framework (LGPL 2) with
+ open source plugins (BSD).
+ .
+ This package provides GLib bindings for the Maliit framework.
+
+Package: libmaliit-glib-dev
+Depends: libmaliit-glib0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Architecture: any
+Section: libdevel
+Description: Maliit Input Method Framework - GLib Development Headers
+ Maliit provides a flexible and cross-platform input method framework. It has a
+ plugin-based client-server architecture where applications act as clients and
+ communicate with the Maliit server via input context plugins. The communication
+ link currently uses D-Bus. Maliit is an open source framework (LGPL 2) with
+ open source plugins (BSD).
+ .
+ This package provides GLib development headers for the Maliit framework.
 
 Package: libmaliit0
 Depends: maliit-framework, ${misc:Depends}
@@ -113,20 +130,6 @@
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
 
-Package: maliit-inputcontext-gtk2
-Depends: maliit-framework, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: maliit-inputcontext-gtk3
-Depends: maliit-framework, ${misc:Depends}
-Architecture: all
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
 Package: maliit-inputcontext-qt4
 Depends: maliit-framework, ${misc:Depends}
 Architecture: all

=== added file 'debian/libmaliit-glib-dev.install'
--- debian/libmaliit-glib-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libmaliit-glib-dev.install	2015-11-20 19:51:03 +0000
@@ -0,0 +1,3 @@
+usr/lib/libmaliit-glib.so
+usr/include/maliit/maliit-glib/*
+usr/lib/pkgconfig/maliit-glib.pc

=== added file 'debian/libmaliit-glib0.install'
--- debian/libmaliit-glib0.install	1970-01-01 00:00:00 +0000
+++ debian/libmaliit-glib0.install	2015-11-20 19:51:03 +0000
@@ -0,0 +1,1 @@
+usr/lib/libmaliit-glib.so.0*

=== modified file 'debian/maliit-framework.sh'
--- debian/maliit-framework.sh	2015-03-05 21:48:51 +0000
+++ debian/maliit-framework.sh	2015-11-20 19:51:03 +0000
@@ -1,7 +1,8 @@
-# Exports the QT_IM_MODULE from the maliit-framework package
+# Exports GTK_IM_MODULE and QT_IM_MODULE under Unity 8
 
 case $XDG_SESSION_DESKTOP in
   ubuntu-touch|unity8*)
+    export GTK_IM_MODULE=Maliit
     export QT_IM_MODULE=maliitphablet
     ;;
 esac

=== removed file 'debian/patches/0008-qt5.3-fix.patch'
--- debian/patches/0008-qt5.3-fix.patch	2014-08-18 15:36:22 +0000
+++ debian/patches/0008-qt5.3-fix.patch	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-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

=== added file 'debian/patches/0014-revert-6e2f8b4253f219688d31002aebf010eeabf0079b.patch'
--- debian/patches/0014-revert-6e2f8b4253f219688d31002aebf010eeabf0079b.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0014-revert-6e2f8b4253f219688d31002aebf010eeabf0079b.patch	2015-11-20 19:51:03 +0000
@@ -0,0 +1,82 @@
+From d5ba4860ba655bfb62b62c7010422de9c064a4bc Mon Sep 17 00:00:00 2001
+From: William Hua <[e-mail]>
+Date: Wed, 18 Nov 2015 16:56:12 -0500
+Subject: [PATCH] Revert "Move GDBus code generation to maliit-glib"
+
+This reverts commit 6e2f8b4253f219688d31002aebf010eeabf0079b.
+
+The previous commit caused a regression where the generated headers
+maliitserver.h and maliitcontext.h would no longer be installed on 'make
+install'. The problem is due to how QMake works: it processes the list
+of HEADERSINSTALL before generating them via the glib_server and
+glib_context targets.
+---
+ dbus_interfaces/dbus_interfaces.pro | 19 +++++++++++++++++++
+ maliit-glib/maliit-glib.pro         | 20 ++------------------
+ 2 files changed, 21 insertions(+), 18 deletions(-)
+
+diff --git a/dbus_interfaces/dbus_interfaces.pro b/dbus_interfaces/dbus_interfaces.pro
+index 87ee2f7..e494d04 100644
+--- a/dbus_interfaces/dbus_interfaces.pro
++++ b/dbus_interfaces/dbus_interfaces.pro
+@@ -9,3 +9,22 @@ TARGET = dummy
+ OTHER_FILES += \
+     minputmethodcontext1interface.xml \
+     minputmethodserver1interface.xml
++
++glib {
++    include($$TOP_DIR/dbus_interfaces/dbus_interfaces.pri)
++
++    PRE_TARGETDEPS += glib_server glib_context
++    QMAKE_EXTRA_TARGETS += glib_server glib_context
++
++    glib_server.commands = gdbus-codegen --interface-prefix com.meego \
++                                         --generate-c-code $$TOP_DIR/maliit-glib/maliitserver \
++                                         --c-namespace Maliit \
++                                         --annotate com.meego.inputmethod.uiserver1 org.gtk.GDBus.C.Name Server \
++                                         $$DBUS_SERVER_XML
++
++    glib_context.commands = gdbus-codegen --interface-prefix com.meego \
++                                          --generate-c-code $$TOP_DIR/maliit-glib/maliitcontext \
++                                          --c-namespace Maliit \
++                                          --annotate com.meego.inputmethod.inputcontext1 org.gtk.GDBus.C.Name Context \
++                                          $$DBUS_CONTEXT_XML
++}
+diff --git a/maliit-glib/maliit-glib.pro b/maliit-glib/maliit-glib.pro
+index c4667de..78cc5c9 100644
+--- a/maliit-glib/maliit-glib.pro
++++ b/maliit-glib/maliit-glib.pro
+@@ -11,6 +11,8 @@ PKGCONFIG += glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0
+ 
+ CONFIG -= qt
+ 
++include($$TOP_DIR/connection-glib/libmaliit-connection-glib.pri)
++
+ QMAKE_CXXFLAGS_DEBUG+=-Wno-error=deprecated-declarations
+ QMAKE_CFLAGS_DEBUG+=-Wno-error=deprecated-declarations
+ 
+@@ -98,21 +100,3 @@ glib_genmarshal_source.variable_out = SOURCES
+ glib_genmarshal_source.input = GLIB_GENMARSHAL_LIST
+ 
+ QMAKE_EXTRA_COMPILERS += glib_genmarshal_header glib_genmarshal_source
+-
+-include($$TOP_DIR/dbus_interfaces/dbus_interfaces.pri)
+-
+-PRE_TARGETDEPS += glib_server glib_context
+-QMAKE_EXTRA_TARGETS += glib_server glib_context
+-
+-glib_server.commands = gdbus-codegen --interface-prefix com.meego \
+-                                     --generate-c-code $$TOP_DIR/maliit-glib/maliitserver \
+-                                     --c-namespace Maliit \
+-                                     --annotate com.meego.inputmethod.uiserver1 org.gtk.GDBus.C.Name Server \
+-                                     $$DBUS_SERVER_XML
+-
+-glib_context.commands = gdbus-codegen --interface-prefix com.meego \
+-                                      --generate-c-code $$TOP_DIR/maliit-glib/maliitcontext \
+-                                      --c-namespace Maliit \
+-                                      --annotate com.meego.inputmethod.inputcontext1 org.gtk.GDBus.C.Name Context \
+-                                      $$DBUS_CONTEXT_XML
+-
+-- 
+2.6.2
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-01-23 13:19:33 +0000
+++ debian/patches/series	2015-11-20 19:51:03 +0000
@@ -4,9 +4,9 @@
 0005-testability.patch
 0006-fix_orientation_to_angle_mapping.patch
 0007-use_host_prefix_for_mkspecs.patch
-0008-qt5.3-fix.patch
 0009-update-input-region-when-hiding.patch
 0010-fix-building-with-g++-4.9.patch
 0011-fix-orientation-updates.patch
 0012-fix-focus-changes.patch
 0013-check-testability-environment-variable.patch
+0014-revert-6e2f8b4253f219688d31002aebf010eeabf0079b.patch

=== modified file 'debian/rules'
--- debian/rules	2014-08-18 15:44:45 +0000
+++ debian/rules	2015-11-20 19:51:03 +0000
@@ -19,8 +19,8 @@
 
 # Build options
 ENABLE_MULTITOUCH = false
-DEB_QMAKE_CONFIG_VAL = qt5-inputcontext debug nodoc
-DEB_QMAKE_ARGS = -r\
+DEB_QMAKE_CONFIG_VAL = qt5-inputcontext glib debug nodoc warn_off
+DEB_QMAKE_ARGS = \
 	M_IM_PREFIX=/usr \
 	MALIIT_SERVER_ARGUMENTS="-software -bypass-wm-hint" \
 	MALIIT_DEFAULT_PLUGIN=libmaliit-keyboard-plugin.so

=== modified file 'debian/xinput/maliit'
--- debian/xinput/maliit	2013-07-23 21:53:29 +0000
+++ debian/xinput/maliit	2015-11-20 19:51:03 +0000
@@ -2,6 +2,7 @@
 XIM_PROGRAM=/usr/bin/maliit-server
 XIM_ARGS=
 
+GTK_IM_MODULE=Maliit
 QT_IM_MODULE=MaliitPhablet
 
 DEPENDS="maliit-framework"