- updated to 1.8.3

diff --git a/imsettings-no-bash.patch b/imsettings-no-bash.patch
index 605eb24df2bd6ed4ed742dcfab9c964209ef0096..f86d3399ce27b201bad19232785becbddb265923 100644 (file)
--- a/imsettings-no-bash.patch
+++ b/imsettings-no-bash.patch
@@ -1,5 +1,5 @@
---- imsettings-1.8.1/data/imsettings-functions.in.orig 2019-02-20 05:57:23.000000000 +0100
-+++ imsettings-1.8.1/data/imsettings-functions.in      2019-05-20 20:46:25.377483510 +0200
+--- imsettings-1.8.3/data/imsettings-functions.in.orig 2021-11-19 11:25:33.000000000 +0100
++++ imsettings-1.8.3/data/imsettings-functions.in      2023-09-08 16:33:30.090230112 +0200
 @@ -23,7 +23,7 @@
  LOGDIR="${XDG_CACHE_HOME:-$HOME/.cache}/imsettings"
  LOGFILE="$LOGDIR/log"
@@ -9,7 +9,7 @@
      if [ ! -n "$DRY_RUN" ]; then
        if [ -f $HOME/.imsettings.log ]; then
            mv $HOME/.imsettings.log $LOGFILE.bak
-@@ -33,20 +33,20 @@
+@@ -33,20 +33,20 @@ function log_init() {
      fi
  }
  
@@ -34,7 +34,7 @@
      mod=$1
      @libexecdir[@]/imsettings-check --check-modules >/dev/null
      ret=$?
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ function check_imsettings_capability() {
      return $ret
  }
  
@@ -43,7 +43,7 @@
      ret=$(cat $1)
      case $ret in
        cinnamon*)
-@@ -84,7 +84,7 @@
+@@ -84,7 +84,7 @@ function lookup_desktop() {
      esac
  }
  
@@ -51,8 +51,8 @@
 +get_desktop() {
      if [ -n "$XDG_CURRENT_DESKTOP" ]; then
        GUESS_DESKTOP="\$XDG_CURRENT_DESKTOP"
-       echo "$XDG_CURRENT_DESKTOP"
-@@ -117,7 +117,7 @@
+       echo -n "$XDG_CURRENT_DESKTOP"
+@@ -123,7 +123,7 @@ function get_desktop() {
      fi
  }
  
@@ -60,8 +60,8 @@
 +is_gtk_supported() {
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
      case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
-       cinnamon*)
-@@ -152,7 +152,7 @@
+       *wayland)
+@@ -163,7 +163,7 @@ function is_gtk_supported() {
      return 1
  }
  
@@ -69,8 +69,8 @@
 +is_qt_supported() {
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
      case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
-       *)
-@@ -165,7 +165,7 @@
+       *wayland)
+@@ -181,7 +181,7 @@ function is_qt_supported() {
      return 1
  }
  
@@ -79,7 +79,7 @@
      [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
      if check_imsettings_capability xim; then
        return 0
-@@ -174,12 +174,12 @@
+@@ -190,12 +190,12 @@ function is_xim_supported() {
      return 1
  }
  
@@ -94,7 +94,7 @@
      if is_imsettings_enabled && is_gtk_supported; then
        # Ensure GTK_IM_MODULE is empty. otherwise GTK+ doesn't pick up immodule through XSETTINGS
        unset GTK_IM_MODULE
-@@ -189,7 +189,7 @@
+@@ -205,7 +205,7 @@ function setup_gtk_immodule() {
      fi
  }
  
@@ -103,7 +103,7 @@
      if is_imsettings_enabled && is_qt_supported; then
        # FIXME: Qt doesn't support XSETTINGS for immodule yet.
        #        We still need to go with the older way.
-@@ -199,7 +199,7 @@
+@@ -215,7 +215,7 @@ function setup_qt_immodule() {
      fi
  }
  
@@ -112,7 +112,7 @@
      if is_imsettings_enabled && is_xim_supported; then
        # setup XMODIFIERS
        XMODIFIERS="@im=imsettings"
-@@ -210,7 +210,7 @@
+@@ -226,7 +226,7 @@ function setup_xim() {
      fi
  }
  
@@ -121,7 +121,7 @@
      print_info
      if [ -n "$DRY_RUN" ]; then
        log "*** DRY RUN MODE: running IM through imsettings"
-@@ -225,7 +225,7 @@
+@@ -241,7 +241,7 @@ function run_imsettings() {
      fi
  }
  
@@ -130,7 +130,7 @@
      print_info
      if [ -n "$DRY_RUN" ]; then
        log "*** DRY RUN MODE: running IM without imsettings"
-@@ -238,7 +238,7 @@
+@@ -254,7 +254,7 @@ function run_xim() {
      fi
  }
  
@@ -139,7 +139,7 @@
      $1
      if [ $? -eq 0 ]; then
        log yes
-@@ -247,7 +247,7 @@
+@@ -263,7 +263,7 @@ function print_result() {
      fi
  }
  

diff --git a/imsettings.spec b/imsettings.spec
index 038af0a7f21b0884e296a50c3b259641fe8c6b27..0ac76d61ae61e7aa04601293f7a921aa908990f9 100644 (file)
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -8,12 +8,12 @@
 Summary:       Delivery framework for general Input Method configuration
 Summary(pl.UTF-8):     Szkielet do ogólnej konfiguracji method wprowadzania znaków
 Name:          imsettings
-Version:       1.8.2
+Version:       1.8.3
 Release:       1
 License:       LGPL v2+
 Group:         Applications/System
 Source0:       https://bitbucket.org/tagoh/imsettings/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 43be3604274543f9646fb163d63b0bee
+# Source0-md5: 29f041aa9d02a244474336b5766b9de9
 Patch0:                %{name}-constraint-of-language.patch
 Patch1:                %{name}-no-bash.patch
 URL:           https://tagoh.bitbucket.org/imsettings/
@@ -363,6 +363,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/imsettings-switch
 
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libimsettings-systemd-gtk.so
+%attr(755,root,root) %{_libdir}/%{name}/libimsettings-systemd-qt.so
 
 %{_libexecdir}/imsettings-functions
 %attr(755,root,root) %{_libexecdir}/imsettings-check