[imsettings] Update patches

Akira TAGOH tagoh at fedoraproject.org
Wed Apr 3 10:24:45 UTC 2013


commit 7f20ccb740be5f633e0deea3a4afbbb455235d90
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Apr 3 19:24:40 2013 +0900

    Update patches

 imsettings-constraint-of-language.patch |    8 ++++----
 imsettings-disable-xim.patch            |    8 ++++----
 imsettings-xinput-xcompose.patch        |   10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/imsettings-constraint-of-language.patch b/imsettings-constraint-of-language.patch
index e2ef8e3..8b17fe6 100644
--- a/imsettings-constraint-of-language.patch
+++ b/imsettings-constraint-of-language.patch
@@ -1,7 +1,7 @@
-diff -pruN imsettings-1.2.8.orig/data/xinput.sh.in.in imsettings-1.2.8/data/xinput.sh.in.in
---- imsettings-1.2.8.orig/data/xinput.sh.in.in	2012-02-10 11:25:18.000000000 +0900
-+++ imsettings-1.2.8/data/xinput.sh.in.in	2012-02-10 12:38:44.000000000 +0900
-@@ -266,8 +266,22 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
+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
+@@ -52,8 +52,22 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
  	SHORT_DESC="User Specific"
      fi
  elif [ -r "$SYS_XINPUTRC" ]; then
diff --git a/imsettings-disable-xim.patch b/imsettings-disable-xim.patch
index ce1b607..6dafcbf 100644
--- a/imsettings-disable-xim.patch
+++ b/imsettings-disable-xim.patch
@@ -1,7 +1,7 @@
-diff -pruN imsettings-1.2.2.orig/data/xinput.sh.in.in imsettings-1.2.2/data/xinput.sh.in.in
---- imsettings-1.2.2.orig/data/xinput.sh.in.in	2011-04-22 20:35:24.000000000 +0900
-+++ imsettings-1.2.2/data/xinput.sh.in.in	2011-04-26 16:41:19.165486325 +0900
-@@ -80,10 +80,11 @@ function is_qt_supported() {
+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() {
  }
  
  function is_xim_supported() {
diff --git a/imsettings-xinput-xcompose.patch b/imsettings-xinput-xcompose.patch
index ea1f452..d90a3df 100644
--- a/imsettings-xinput-xcompose.patch
+++ b/imsettings-xinput-xcompose.patch
@@ -1,7 +1,7 @@
-diff -pruN imsettings-1.2.8.orig/data/xinput.sh.in.in imsettings-1.2.8/data/xinput.sh.in.in
---- imsettings-1.2.8.orig/data/xinput.sh.in.in	2012-02-10 12:40:12.000000000 +0900
-+++ imsettings-1.2.8/data/xinput.sh.in.in	2012-02-10 12:43:43.000000000 +0900
-@@ -267,9 +267,10 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
+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 19:23:22.000000000 +0900
++++ 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
      # FIXME: This hardcoded list has to be gone in the future.
@@ -14,7 +14,7 @@ diff -pruN imsettings-1.2.8.orig/data/xinput.sh.in.in imsettings-1.2.8/data/xinp
          if echo $tmplang | grep -q -E "^$i"; then
              source "$SYS_XINPUTRC"
              READ_XINPUTRC=$SYS_XINPUTRC
-@@ -277,6 +278,19 @@ elif [ -r "$SYS_XINPUTRC" ]; then
+@@ -63,6 +64,19 @@ elif [ -r "$SYS_XINPUTRC" ]; then
              break
          fi
      done


More information about the scm-commits mailing list