From 9584f253e109626f399be8716a665e6e096ad5e7 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Thu, 4 May 2023 15:23:18 +0200
Subject: [PATCH] Update to 1.8.1

- Remove m17n-lib-c99.patch (included upstream)
- Remove Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
  (included upstream)
---
 .gitignore                                    |  1 +
 ...7n-with-vi-telex-in-gedit-in-wayland.patch | 27 -------------------
 m17n-lib-c99.patch                            | 15 -----------
 m17n-lib.spec                                 | 12 ++++++---
 sources                                       |  2 +-
 5 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100644 Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
 delete mode 100644 m17n-lib-c99.patch

diff --git a/.gitignore b/.gitignore
index 742086d..675c07f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ m17n-lib-1.6.1.tar.gz
 /m17n-lib-1.7.0.tar.gz
 /m17n-lib-1.8.0RC.tar.gz
 /m17n-lib-1.8.0.tar.gz
+/m17n-lib-1.8.1.tar.gz
diff --git a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch b/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
deleted file mode 100644
index 3a25ea1..0000000
--- a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4d815754f9f32c54ec47f9e323940f6332a7cb5d Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Tue, 30 Apr 2019 10:32:13 +0200
-Subject: [PATCH] Fix segmentation fault when using ibus-m17n with vi-telex in
- gedit in Gnome Wayland
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1704156
----
- src/m17n-core.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/m17n-core.c b/src/m17n-core.c
-index fe5aa77..642dfee 100644
---- a/src/m17n-core.c
-+++ b/src/m17n-core.c
-@@ -930,6 +930,8 @@ m17n_object_unref (void *object)
-   M17NObjectRecord *record;
-   unsigned *count;
- 
-+  if (object == NULL)
-+      return -1;
-   if (! obj->ref_count_extended)
-     {
-       if (! --obj->ref_count)
--- 
-2.20.1
-
diff --git a/m17n-lib-c99.patch b/m17n-lib-c99.patch
deleted file mode 100644
index d8158c9..0000000
--- a/m17n-lib-c99.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Submitted upstream: <https://savannah.nongnu.org/bugs/index.php?64106>
-
-diff --git a/example/medit.c b/example/medit.c
-index e6a6dc8c108fe44f..f2b109db3e0e2b81 100644
---- a/example/medit.c
-+++ b/example/medit.c
-@@ -662,7 +662,7 @@ static void MenuHelpProc (Widget, XEvent *, String *, Cardinal *);
-    off the current input method, otherwide turn on the input method
-    input_method_table[$IDX].  */
- void
--select_input_method (idx)
-+select_input_method (int idx)
- {
-   int previous_input_method = current_input_method;
- 
diff --git a/m17n-lib.spec b/m17n-lib.spec
index d5d712a..edc65f6 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -6,16 +6,14 @@
 %endif
 
 Name:           m17n-lib
-Version:        1.8.0
-Release:        16%{?dist}
+Version:        1.8.1
+Release:        11%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
 URL:            http://www.nongnu.org/m17n/
 Source0:        http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz
 Patch0:         %{name}-1.8.0-multilib.patch
-Patch1:         Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
-Patch2: m17n-lib-c99.patch
 
 BuildRequires: make
 BuildRequires:  m17n-db-devel libthai-devel
@@ -128,6 +126,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Fri May 05 2023 Mike FABIAN <mfabian@redhat.com> - 1.8.1-1
+- Update to 1.8.1
+- Remove m17n-lib-c99.patch (included upstream)
+- Remove Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
+  (included upstream)
+
 * Tue Apr 25 2023 Florian Weimer <fweimer@redhat.com> - 1.8.0-16
 - Fix C99 compatibility issue in example code
 
diff --git a/sources b/sources
index 9fbb7b6..d99b92e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (m17n-lib-1.8.0.tar.gz) = 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
+SHA512 (m17n-lib-1.8.1.tar.gz) = d8b97c0145ac9056b962c4ef6204bd9f1766487393def8b31d984199003ba984eb1312b84e2c74261cafee493c370c1676e79dbd850a77bbfb3392f4cd9db437