update version to 2.3.1

0001-Enable-anthy-unicode-build.patch

@@ -1,64 +0,0 @@
-From 2078913c2735cfb8322af5430511ec1d6d43d3dd Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Thu, 10 Feb 2022 19:38:49 +0900
-Subject: [PATCH] Enable anthy-unicode build
-
-anthy is no longer maintained currently and anthy-unicode is generated
-to convert internal EUC data to UTF-8 and maintained.
-If anthy-unicode package is found, it can be used instead of anthy.
----
- CMakeLists.txt               |  9 ++++++++-
- cmake/FindAnthyUnicode.cmake | 14 ++++++++++++++
- 2 files changed, 22 insertions(+), 1 deletion(-)
- create mode 100644 cmake/FindAnthyUnicode.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2233e11b..869458b1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,6 +35,7 @@ find_package(Qt5Multimedia)
- find_package(Qt5Feedback)
- find_package(Intl REQUIRED)
- 
-+find_package(AnthyUnicode)
- find_package(Anthy)
- find_package(Pinyin)
- find_package(Chewing)
-@@ -353,7 +354,13 @@ abstract_language_plugin(en@dv englishdvorak
- abstract_language_plugin(fr-ch french LIBRARIES westernsupport)
- abstract_language_plugin(th thai DIRECTORY qml/keys)
- 
--if(Anthy_FOUND)
-+if(AnthyUnicode_FOUND)
-+    abstract_language_plugin(ja japanese ABSTRACT_LANGUAGE_PLUGIN
-+            SOURCES anthyadapter.cpp anthyadapter.h
-+            LIBRARIES ${AnthyUnicode_LIBRARIES}
-+            INCLUDE_DIRS ${AnthyUnicode_INCLUDE_DIRS}
-+            DIRECTORY qml/keys)
-+elseif(Anthy_FOUND)
-     abstract_language_plugin(ja japanese ABSTRACT_LANGUAGE_PLUGIN
-             SOURCES anthyadapter.cpp anthyadapter.h
-             LIBRARIES ${Anthy_LIBRARIES}
-diff --git a/cmake/FindAnthyUnicode.cmake b/cmake/FindAnthyUnicode.cmake
-new file mode 100644
-index 00000000..6c13a222
---- /dev/null
-+++ b/cmake/FindAnthyUnicode.cmake
-@@ -0,0 +1,14 @@
-+include(FeatureSummary)
-+set_package_properties(anthyunicode PROPERTIES
-+        URL "https://github.com/fujiwarat/anthy-unicode"
-+        DESCRIPTION "Anthy provides the library to input Japanese on the applications.")
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PC_AnthyUnicode QUIET anthy-unicode)
-+
-+find_library(AnthyUnicode_LIBRARIES NAMES anthy-unicode ${PC_AnthyUnicode_LIBRARIES} HINTS ${PC_AnthyUnicode_LIBRARY_DIRS})
-+find_path(AnthyUnicode_INCLUDE_DIRS anthy/anthy.h HINTS ${PC_AnthyUnicode_INCLUDE_DIRS})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(AnthyUnicode DEFAULT_MSG AnthyUnicode_LIBRARIES AnthyUnicode_INCLUDE_DIRS)
-+mark_as_advanced(AnthyUnicode_INCLUDE_DIRS AnthyUnicode_LIBRARIES)
--- 
-2.33.1
-

fix_qml_typos.patch

@@ -1,50 +0,0 @@
-From 1aba6e338ce2d4662f6374e59e195761d44901eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9s=20B=2ES?= <andresbs@opensuse.org>
-Date: Tue, 15 Feb 2022 17:23:30 -0600
-Subject: [PATCH] Fix 3 QML import typos in some languages.
-
----
- plugins/fr-ch/qml/Keyboard_fr-ch_url.qml        | 2 +-
- plugins/fr-ch/qml/Keyboard_fr-ch_url_search.qml | 2 +-
- plugins/tr/qml/Keyboard_tr_url.qml              | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/fr-ch/qml/Keyboard_fr-ch_url.qml b/plugins/fr-ch/qml/Keyboard_fr-ch_url.qml
-index 1874c932..b7905bc6 100644
---- a/plugins/fr-ch/qml/Keyboard_fr-ch_url.qml
-+++ b/plugins/fr-ch/qml/Keyboard_fr-ch_url.qml
-@@ -16,7 +16,7 @@
- 
- import QtQuick 2.4
- 
--import MaliitKeyobard 2.0
-+import MaliitKeyboard 2.0
- 
- import keys 1.0
- 
-diff --git a/plugins/fr-ch/qml/Keyboard_fr-ch_url_search.qml b/plugins/fr-ch/qml/Keyboard_fr-ch_url_search.qml
-index c5469141..38b5e716 100644
---- a/plugins/fr-ch/qml/Keyboard_fr-ch_url_search.qml
-+++ b/plugins/fr-ch/qml/Keyboard_fr-ch_url_search.qml
-@@ -16,7 +16,7 @@
- 
- import QtQuick 2.4
- 
--import MaliitKeyobard 2.0
-+import MaliitKeyboard 2.0
- 
- import keys 1.0
- 
-diff --git a/plugins/tr/qml/Keyboard_tr_url.qml b/plugins/tr/qml/Keyboard_tr_url.qml
-index 60b3b75d..726d0126 100644
---- a/plugins/tr/qml/Keyboard_tr_url.qml
-+++ b/plugins/tr/qml/Keyboard_tr_url.qml
-@@ -16,7 +16,7 @@
- 
- import QtQuick 2.4
- 
--import MaliitKeyobard 2.0
-+import MaliitKeyboard 2.0
- 
- import keys 1.0
- 

make-sure-PressArea-gets-reset-when-the-keyboard-hides.patch

@@ -0,0 +1,91 @@
+From dd793f17f6536fc0e977684f6f528881169cca4b Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Thu, 9 Mar 2023 04:27:55 +0100
+Subject: [PATCH] Make sure PressArea gets reset when the keyboard hides
+
+When the keyboard hides, pressed would remain true and hover events
+would still trigger as if the drag session never finished.
+
+This makes sure that the press area gets disabled and the swipe works on
+consecutive Panel sessions.
+---
+ qml/keys/PressArea.qml     | 2 ++
+ src/plugin/inputmethod.cpp | 7 +++++++
+ src/plugin/inputmethod.h   | 4 ++++
+ src/plugin/inputmethod_p.h | 3 +++
+ 4 files changed, 16 insertions(+)
+
+diff --git a/qml/keys/PressArea.qml b/qml/keys/PressArea.qml
+index 46f7104f..e889ae54 100644
+--- a/qml/keys/PressArea.qml
++++ b/qml/keys/PressArea.qml
+@@ -53,6 +53,8 @@ MultiPointTouchArea {
+         holdTimer.stop();
+     }
+ 
++    enabled: Keyboard.shown
++
+     touchPoints: [
+         TouchPoint { 
+             id: point
+diff --git a/src/plugin/inputmethod.cpp b/src/plugin/inputmethod.cpp
+index 23cacca6..6e01d318 100644
+--- a/src/plugin/inputmethod.cpp
++++ b/src/plugin/inputmethod.cpp
+@@ -173,6 +173,13 @@ void InputMethod::hide()
+     d->m_geometry->setShown(false);
+ }
+ 
++bool InputMethod::shown() const
++{
++    Q_D(const InputMethod);
++    return d->m_geometry->shown();
++}
++
++
+ //! \brief InputMethod::close
+ //! Closes the keyboard instantly (typically only called by QML after the
+ //! hiding animation has finished, under normal circumstances hide() should
+diff --git a/src/plugin/inputmethod.h b/src/plugin/inputmethod.h
+index f29ae7eb..f1f28294 100644
+--- a/src/plugin/inputmethod.h
++++ b/src/plugin/inputmethod.h
+@@ -64,6 +64,7 @@ class InputMethod
+     Q_PROPERTY(QString surroundingLeft READ surroundingLeft)
+     Q_PROPERTY(QString surroundingRight READ surroundingRight)
+     Q_PROPERTY(bool animationEnabled READ isAnimationEnabled NOTIFY animationEnabledChanged)
++    Q_PROPERTY(bool shown READ shown NOTIFY shownChanged)
+ 
+ public:
+     /// Same as Maliit::TextContentType but usable in QML
+@@ -80,6 +81,8 @@ class InputMethod
+     explicit InputMethod(MAbstractInputMethodHost *host);
+     ~InputMethod() override;
+ 
++    bool shown() const;
++
+     //! \reimp
+     void show() override;
+     Q_SLOT void hide() override;
+@@ -174,6 +177,7 @@ class InputMethod
+     void cursorPositionChanged(int cursor_position);
+     void opacityChanged(double opacity);
+     void animationEnabledChanged();
++    void shownChanged();
+ 
+ private:
+     Q_SLOT void onAutoCorrectSettingChanged();
+diff --git a/src/plugin/inputmethod_p.h b/src/plugin/inputmethod_p.h
+index 749ff3da..db19cf54 100644
+--- a/src/plugin/inputmethod_p.h
++++ b/src/plugin/inputmethod_p.h
+@@ -168,6 +168,9 @@ class InputMethodPrivate
+         QObject::connect(editor.wordEngine(), &MaliitKeyboard::Logic::AbstractWordEngine::commitTextRequested,
+                          &editor, &MaliitKeyboard::AbstractTextEditor::replaceAndCommitPreedit);
+ 
++        QObject::connect(m_geometry, &KeyboardGeometry::shownChanged,
++                         q, &InputMethod::shownChanged);
++
+ 
+         view->setWindowState(Qt::WindowNoState);
+ 

maliit-keyboard.spec

@@ -1,20 +1,18 @@
 Name:           maliit-keyboard
-Version:        2.2.0
+Version:        2.3.1
 Release:        1
 Summary:        Maliit Keyboard 2
 
 License:        LGPLv3 and BSD and CC-BY-3.0
 URL:            https://maliit.github.io/
-Source0:        https://github.com/maliit/keyboard/archive/refs/tags/keyboard-%{version}.tar.gz
+Source0:        https://github.com/maliit/keyboard/archive/%{version}/%{name}-%{version}.tar.gz 
-
-Patch0:         fix_qml_typos.patch
-Patch1:         0001-Enable-anthy-unicode-build.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
-BuildRequires:  maliit-framework-devel >= %{version}
+BuildRequires:  maliit-framework-devel >= 2.3.0
 BuildRequires:  glib2-devel
 BuildRequires:  hunspell-devel
+BuildRequires:  gettext
 BuildRequires:  anthy-unicode-devel
 BuildRequires:  libpinyin-devel
 BuildRequires:  libchewing-devel
@@ -22,8 +20,13 @@ BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
 BuildRequires:  qt5-qtmultimedia-devel
 BuildRequires:  qt5-qtfeedback-devel
+BuildRequires:  qt5-qtquickcontrols2-devel
 
 
+# Upstream patches
+# https://github.com/maliit/keyboard/pull/187
+Patch1: make-sure-PressArea-gets-reset-when-the-keyboard-hides.patch
+
 %description
 Based on Ubuntu Keyboard. Ubuntu Keyboard was a QML and C++ based Keyboard
 Plugin for Maliit, based on the Maliit Reference plugin, taking into account the
@@ -45,7 +48,7 @@ rm -rf %{buildroot}%{_datadir}/doc/maliit-keyboard
 %find_lang %{name}
 
 %files -f %{name}.lang
-%license COPYING.BSD COPYING.CC-BY COPYING
+%license COPYING.BSD COPYING.LGPL COPYING
 %doc README.md
 %{_bindir}/maliit-keyboard
 %dir %{_libdir}/maliit/
@@ -59,5 +62,8 @@ rm -rf %{buildroot}%{_datadir}/doc/maliit-keyboard
 
 
 %changelog
+* Tue Jan 09 2024 peijiankang <peijiankang@kylinos.cn> - 2.3.1-1
+- update verison to 2.3.1
+
 * Wed Jul 20 2022 misaka00251 <misaka00251@misakanet.cn> - 2.2.0-1
 - Init package