diff --git a/Fix-can-not-input-chinese-in-en-environment.patch b/Fix-can-not-input-chinese-in-en-environment.patch
deleted file mode 100644
index 335eda3..0000000
--- a/Fix-can-not-input-chinese-in-en-environment.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4f871be3df2b9cd089aef78245d22d5ccce677b Mon Sep 17 00:00:00 2001
-From: yeqinglong <yeqinglong@uniontech.com>
-Date: Fri, 12 Mar 2021 13:53:30 +0800
-Subject: [PATCH] fix can't input chinese in en environment
-
----
- data/xinput.sh.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/xinput.sh.in.in b/data/xinput.sh.in.in
-index 379ca99..d918787 100755
---- a/data/xinput.sh.in.in
-+++ b/data/xinput.sh.in.in
-@@ -54,7 +54,7 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
- elif [ -r "$SYS_XINPUTRC" ]; then
-     # FIXME: This hardcoded list has to be gone in the future.
-     # Locales that normally use input-method for native input
--    _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
-+    _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh en"
-     _sourced_xinputrc=0
-     for i in $_im_language_list; do
-         if echo $tmplang | grep -q -E "^$i"; then
--- 
-2.27.0
-
diff --git a/fix-changed_lang_in_dcc_not_affecting_fcitx.patch b/fix-changed_lang_in_dcc_not_affecting_fcitx.patch
deleted file mode 100644
index aa7eff3..0000000
--- a/fix-changed_lang_in_dcc_not_affecting_fcitx.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 94e4b6dde1c1a4921d099f18ba23787c74ca3774 Mon Sep 17 00:00:00 2001
-From: He Rengui <herengui@uniontech.com>
-Date: Tue, 27 Jul 2021 19:33:29 +0800
-Subject: [PATCH] fix issue that changed language in dde-control-center but not
- affecting fcitx process
-
-Signed-off-by: He Rengui <herengui@uniontech.com>
----
- imsettings-daemon/imsettings-proc.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c
-index b78fcff..b29fcd1 100644
---- a/imsettings-daemon/imsettings-proc.c
-+++ b/imsettings-daemon/imsettings-proc.c
-@@ -319,6 +320,8 @@ _start_process(IMSettingsProc     *proc,
- 			"QT_IM_MODULE",
- 			"XMODIFIERS",
- 			"XDG_CURRENT_DESKTOP",
-+			"LANGUAGE",
-+			"LANG",
- 			NULL
- 		};
- 		gsize len, i, j, k;
-@@ -348,6 +351,7 @@ _start_process(IMSettingsProc     *proc,
- 		}
- 		if (lang) {
- 			envp[j++] = g_strdup_printf("LC_CTYPE=%s", lang);
-+			envp[j++] = g_strdup_printf("LANG=%s", lang);
- 		}
- 		/* set environment variables explicitly to ensure
- 		 * any processes being brought up from the IM process
--- 
-2.20.1
-
diff --git a/fix-journal_missing_chinese.patch b/fix-journal_missing_chinese.patch
deleted file mode 100644
index ba598c0..0000000
--- a/fix-journal_missing_chinese.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/imsettings-daemon/main.c b/imsettings-daemon/main.c
-index f72b822..254e683 100644
---- a/imsettings-daemon/main.c
-+++ b/imsettings-daemon/main.c
-@@ -175,7 +175,8 @@ main(int argc, char **argv)
- 		     NULL);
- 	loop_in_object = g_quark_from_static_string("imsettings-daemon-loop");
- 	g_object_set_qdata(G_OBJECT (server), loop_in_object, loop);
--
-+	// Set language
-+	setlocale(LC_ALL, "");
- 	imsettings_server_start(server, arg_replace);
- 	g_main_loop_run(loop);
- 
diff --git a/imsetting-fix-compile-error-sinal-multi-defined.patch b/imsetting-fix-compile-error-sinal-multi-defined.patch
deleted file mode 100644
index a9d28e8..0000000
--- a/imsetting-fix-compile-error-sinal-multi-defined.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2afb5e7516406d6147f5469e7f3482d61b6bb3df Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Fri, 20 Aug 2021 14:43:12 +0800
-Subject: [PATCH] fix compile error sinal multi defined
-
----
- imsettings-daemon/imsettings-proc.c   | 2 +-
- imsettings-daemon/imsettings-server.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c
-index b78fcff..25c461a 100644
---- a/imsettings-daemon/imsettings-proc.c
-+++ b/imsettings-daemon/imsettings-proc.c
-@@ -86,7 +86,7 @@ static gboolean _stop_process                (IMSettingsProc     *proc,
- 
- G_DEFINE_TYPE (IMSettingsProc, imsettings_proc, G_TYPE_OBJECT);
- 
--guint signals[LAST_SIGNAL] = { 0 };
-+static guint signals[LAST_SIGNAL] = { 0 };
- 
- /*< private >*/
- static gboolean
-diff --git a/imsettings-daemon/imsettings-server.c b/imsettings-daemon/imsettings-server.c
-index 1b97548..db9df37 100644
---- a/imsettings-daemon/imsettings-server.c
-+++ b/imsettings-daemon/imsettings-server.c
-@@ -93,7 +93,7 @@ GDBusInterfaceVTable __iface_vtable = {
- 	NULL,
- 	NULL,
- };
--guint signals[LAST_SIGNAL];
-+static guint signals[LAST_SIGNAL];
- 
- G_DEFINE_TYPE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT);
- G_LOCK_DEFINE_STATIC (logger);
--- 
-2.27.0
-
diff --git a/imsettings-1.8.4.tar.bz2 b/imsettings-1.8.4.tar.bz2
new file mode 100644
index 0000000..249660b
Binary files /dev/null and b/imsettings-1.8.4.tar.bz2 differ
diff --git a/imsettings-constraint-of-language.patch b/imsettings-constraint-of-language.patch
index 8b17fe6..ce45146 100644
--- a/imsettings-constraint-of-language.patch
+++ b/imsettings-constraint-of-language.patch
@@ -1,10 +1,10 @@
-diff -pruN imsettings-1.6.1.orig/data/xinput.sh.in.in imsettings-1.6.1/data/xinput.sh.in.in
---- imsettings-1.6.1.orig/data/xinput.sh.in.in	2013-04-03 16:26:39.000000000 +0900
-+++ imsettings-1.6.1/data/xinput.sh.in.in	2013-04-03 19:22:31.000000000 +0900
+diff -pruN imsettings-1.8.0.orig/data/xinput.sh.in.in imsettings-1.8.0/data/xinput.sh.in.in
+--- imsettings-1.8.0.orig/data/xinput.sh.in.in	2018-09-17 10:02:39.000000000 +0000
++++ imsettings-1.8.0/data/xinput.sh.in.in	2019-02-18 09:11:10.723119743 +0000
 @@ -52,8 +52,22 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
  	SHORT_DESC="User Specific"
      fi
- elif [ -r "$SYS_XINPUTRC" ]; then
+ elif [ -r "$SYS_XINPUTRC" -a "x$IMSETTINGS_DISABLE_SYS_XINPUTRC" = "xno" ]; then
 -    source "$SYS_XINPUTRC"
 -    READ_XINPUTRC=$SYS_XINPUTRC
 +    # FIXME: This hardcoded list has to be gone in the future.
@@ -25,4 +25,4 @@ diff -pruN imsettings-1.6.1.orig/data/xinput.sh.in.in imsettings-1.6.1/data/xinp
 +    fi
  fi
  
- [ -z "$IMSETTINGS_INTEGRATE_DESKTOP" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes
+ [ -z "${IMSETTINGS_INTEGRATE_DESKTOP-}" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes
diff --git a/imsettings-disable-xim.patch b/imsettings-disable-xim.patch
index 6dafcbf..2180321 100644
--- a/imsettings-disable-xim.patch
+++ b/imsettings-disable-xim.patch
@@ -1,19 +1,19 @@
-diff -pruN imsettings-1.6.1.orig/data/imsettings-functions.in imsettings-1.6.1/data/imsettings-functions.in
---- imsettings-1.6.1.orig/data/imsettings-functions.in	2013-04-03 16:26:45.000000000 +0900
-+++ imsettings-1.6.1/data/imsettings-functions.in	2013-04-03 19:20:35.000000000 +0900
-@@ -160,10 +160,11 @@ function is_qt_supported() {
+diff -pruN imsettings-1.8.4.orig/data/imsettings-functions.in imsettings-1.8.4/data/imsettings-functions.in
+--- imsettings-1.8.4.orig/data/imsettings-functions.in	2023-08-21 18:18:38.000000000 +0900
++++ imsettings-1.8.4/data/imsettings-functions.in	2023-08-22 12:45:23.717932630 +0900
+@@ -177,10 +177,11 @@ function is_qt_supported() {
  }
  
  function is_xim_supported() {
--    [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
--    if check_imsettings_capability xim; then
--	return 0
--    fi
-+# XXX: Disable XIM support so far
-+#    [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
-+#    if check_imsettings_capability xim; then
-+#	return 0
-+#    fi
+-  [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
+-  if check_imsettings_capability xim; then
+-    return 0
+-  fi
++## Disable XIM support
++#  [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
++#  if check_imsettings_capability xim; then
++#    return 0
++#  fi
  
-     return 1
+   return 1
  }
diff --git a/imsettings-fix-unbound-var.patch b/imsettings-fix-unbound-var.patch
deleted file mode 100644
index 96b56ab..0000000
--- a/imsettings-fix-unbound-var.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e8dab09d0f47c6030878c89e6db7168af9f7e009 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Wed, 10 Jan 2018 21:29:26 +0900
-Subject: [PATCH] Fix unbound variable issue
-
----
- data/xinput.sh.in.in  | 2 +-
- data/xinputinfo.sh.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/xinput.sh.in.in b/data/xinput.sh.in.in
-index e8e99ee..f56e57a 100755
---- a/data/xinput.sh.in.in
-+++ b/data/xinput.sh.in.in
-@@ -38,7 +38,7 @@ tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
- # unset env vars to be safe
- unset AUXILIARY_PROGRAM AUXILIARY_ARGS GTK_IM_MODULE ICON IMSETTINGS_IGNORE_ME LONG_DESC NOT_RUN PREFERENCE_PROGRAM PREFERENCE_ARGS QT_IM_MODULE SHORT_DESC XIM XIM_PROGRAM XIM_ARGS XMODIFIERS
- 
--[ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
-+[ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
- 
- # migrate old configuration file
- [ ! -d $CONFIGDIR ] && mkdir -p $CONFIGDIR || :
-diff --git a/data/xinputinfo.sh.in b/data/xinputinfo.sh.in
-index 9802392..2ce5b20 100755
---- a/data/xinputinfo.sh.in
-+++ b/data/xinputinfo.sh.in
-@@ -56,7 +56,7 @@ if [ $# -gt 0 ]; then
-     source $1
-     IMSETTINGS_FILENAME=$1
- else
--    [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
-+    [ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
- 
-     if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
- 	source "$USER_XINPUTRC"
--- 
-2.14.3
-
diff --git a/imsettings-force-enable-for-cinnamon.patch b/imsettings-force-enable-for-cinnamon.patch
index 74dfdc1..98bef94 100644
--- a/imsettings-force-enable-for-cinnamon.patch
+++ b/imsettings-force-enable-for-cinnamon.patch
@@ -1,9 +1,9 @@
-diff -pruN imsettings-1.6.6.orig/data/imsettings-target-checker.sh.in imsettings-1.6.6/data/imsettings-target-checker.sh.in
---- imsettings-1.6.6.orig/data/imsettings-target-checker.sh.in	2013-10-10 20:15:29.000000000 +0900
-+++ imsettings-1.6.6/data/imsettings-target-checker.sh.in	2013-10-10 20:44:39.000000000 +0900
-@@ -89,19 +89,6 @@ case $(get_desktop) in
- 	    exit 1
- 	fi
+diff -pruN imsettings-1.8.3.orig/data/imsettings-target-checker.sh.in imsettings-1.8.3/data/imsettings-target-checker.sh.in
+--- imsettings-1.8.3.orig/data/imsettings-target-checker.sh.in	2022-10-03 20:17:48.034832740 +0900
++++ imsettings-1.8.3/data/imsettings-target-checker.sh.in	2022-10-03 20:18:29.157906544 +0900
+@@ -81,19 +81,6 @@ case $(get_desktop|tr '[A-Z]' '[a-z]') i
+         log "** GNOME isn't supported at all"
+         exit 0
  	;;
 -    cinnamon*)
 -	dbus_send 'org.Cinnamon' '/' 'org.freedesktop.DBus.Peer.Ping'
diff --git a/imsettings-xinput-xcompose.patch b/imsettings-xinput-xcompose.patch
index d90a3df..1f76070 100644
--- a/imsettings-xinput-xcompose.patch
+++ b/imsettings-xinput-xcompose.patch
@@ -3,7 +3,7 @@ diff -pruN imsettings-1.6.1.orig/data/xinput.sh.in.in imsettings-1.6.1/data/xinp
 +++ imsettings-1.6.1/data/xinput.sh.in.in	2013-04-03 19:23:50.000000000 +0900
 @@ -53,9 +53,10 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
      fi
- elif [ -r "$SYS_XINPUTRC" ]; then
+ elif [ -r "$SYS_XINPUTRC" -a "x$IMSETTINGS_DISABLE_SYS_XINPUTRC" = "xno" ]; then
      # FIXME: This hardcoded list has to be gone in the future.
 -    _language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
 +    # Locales that normally use input-method for native input
diff --git a/imsettings.spec b/imsettings.spec
index f5cf501..935f552 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,21 +1,20 @@
 Name:             imsettings
-Version:          1.7.3
-Release:          11
+Version:          1.8.4
+Release:          1
 License:          LGPLv2.1
 Summary:          Delivery framework for general Input Method configuration
-URL:              https://bitbucket.org/tagoh/imsettings/src/master/
-Source0:          https://bitbucket.org/tagoh/imsettings/downloads/imsettings-%{version}.tar.bz2
+URL:              https://gitlab.com/tagoh/%{name}/
+Source0:          https://gitlab.com/tagoh/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
+
 Patch0000:        imsettings-constraint-of-language.patch
 Patch0001:        imsettings-disable-xim.patch
 Patch0002:        imsettings-xinput-xcompose.patch
 Patch0003:        imsettings-force-enable-for-cinnamon.patch
-Patch0004:        imsettings-fix-unbound-var.patch
-Patch0005:        Fix-can-not-input-chinese-in-en-environment.patch
-Patch0006:        imsetting-fix-compile-error-sinal-multi-defined.patch
-Patch0007:        fix-journal_missing_chinese.patch
-Patch0008:        fix-changed_lang_in_dcc_not_affecting_fcitx.patch
+
 BuildRequires:    desktop-file-utils intltool gettext libtool automake autoconf glib2 >= 2.32.0 gobject-introspection-devel
 BuildRequires:    libnotify-devel libX11-devel libgxim-devel >= 0.5.0 gtk3-devel >= 3.3.3
+BuildRequires:    gtk-doc autoconf-archive  gettext-devel docbook2X
+
 Requires:         xorg-x11-xinit >= 1.0.2-22
 Requires:         imsettings-desktop-module = %{version}-%{release}
 Requires(post):   systemd %{_sbindir}/alternatives
@@ -71,9 +70,9 @@ A module to get this working on Qt applications.
 
 %prep
 %autosetup -p1
+autoreconf -i
 
 %build
-autoreconf -f
 %configure --with-xinputsh=50-xinput.sh --disable-static --disable-schemas-install
 %make_build
 
@@ -127,12 +126,13 @@ fi
 %files  devel
 %{_includedir}/imsettings
 %{_libdir}/libimsettings.so
+%{_libdir}/imsettings/libimsettings-systemd-gtk.so
 %{_libdir}/pkgconfig/imsettings.pc
 %{_libdir}/girepository-*/IMSettings-*.typelib
 %{_datadir}/g*
 
 %files help
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %{_mandir}/man1/imsettings-*.1*
 
 %files  xim
@@ -144,6 +144,7 @@ fi
 
 %files  qt
 %{_libdir}/imsettings/libimsettings-qt.so
+%{_libdir}/imsettings/libimsettings-systemd-qt.so
 
 %changelog
 
diff --git a/imsettings.yaml b/imsettings.yaml
new file mode 100644
index 0000000..8823480
--- /dev/null
+++ b/imsettings.yaml
@@ -0,0 +1,4 @@
+version_control: gitlab
+src_repo: imsettings
+tag_prefix: ''
+separator: .