packages: imsettings/imsettings-constraint-of-language.patch, imsettings/im...
qboosh
qboosh at pld-linux.org
Sat Feb 18 07:40:03 CET 2012
Author: qboosh Date: Sat Feb 18 06:40:03 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.2.8
- updated constraint-of-language,no-bash patches
---- Files affected:
packages/imsettings:
imsettings-constraint-of-language.patch (1.1 -> 1.2) , imsettings-no-bash.patch (1.2 -> 1.3) , imsettings.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/imsettings/imsettings-constraint-of-language.patch
diff -u packages/imsettings/imsettings-constraint-of-language.patch:1.1 packages/imsettings/imsettings-constraint-of-language.patch:1.2
--- packages/imsettings/imsettings-constraint-of-language.patch:1.1 Sun Jul 17 21:08:45 2011
+++ packages/imsettings/imsettings-constraint-of-language.patch Sat Feb 18 07:39:57 2012
@@ -1,11 +1,11 @@
-diff -pruN imsettings-0.106.0.1.orig/data/xinput.sh.in.in imsettings-0.106.0.1/data/xinput.sh.in.in
---- imsettings-0.106.0.1.orig/data/xinput.sh.in.in 2009-03-04 12:18:10.000000000 +0900
-+++ imsettings-0.106.0.1/data/xinput.sh.in.in 2009-03-04 17:44:14.000000000 +0900
-@@ -158,7 +158,33 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
+--- imsettings-1.2.8/data/xinput.sh.in.in.orig 2012-02-10 03:25:18.000000000 +0100
++++ imsettings-1.2.8/data/xinput.sh.in.in 2012-02-17 21:14:57.666422719 +0100
+@@ -266,8 +266,34 @@
SHORT_DESC="User Specific"
fi
elif [ -r "$SYS_XINPUTRC" ]; then
- source "$SYS_XINPUTRC"
+- READ_XINPUTRC=$SYS_XINPUTRC
+ # 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"
@@ -13,6 +13,7 @@
+ for i in $_im_language_list; do
+ if echo $tmplang | grep -q -E "^$i"; then
+ source "$SYS_XINPUTRC"
++ READ_XINPUTRC=$SYS_XINPUTRC
+ _sourced_xinputrc=1
+ break
+ fi
================================================================
Index: packages/imsettings/imsettings-no-bash.patch
diff -u packages/imsettings/imsettings-no-bash.patch:1.2 packages/imsettings/imsettings-no-bash.patch:1.3
--- packages/imsettings/imsettings-no-bash.patch:1.2 Fri Jan 20 19:57:04 2012
+++ packages/imsettings/imsettings-no-bash.patch Sat Feb 18 07:39:57 2012
@@ -1,5 +1,5 @@
---- imsettings-1.2.7/data/xinput.sh.in.in.orig 2012-01-20 19:30:14.868541977 +0100
-+++ imsettings-1.2.7/data/xinput.sh.in.in 2012-01-20 19:46:38.011908229 +0100
+--- imsettings-1.2.8/data/xinput.sh.in.in.orig 2012-02-17 21:15:19.743090124 +0100
++++ imsettings-1.2.8/data/xinput.sh.in.in 2012-02-18 07:28:16.724321553 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
@@ -146,8 +146,8 @@
+print_info() {
log "imsettings information"
log "=========================="
- log -n "Is DBus enabled: "
-@@ -237,13 +237,13 @@
+ log "XINPUTRC: $READ_XINPUTRC"
+@@ -242,13 +242,13 @@
unset TERM
if [ -r /etc/profile.d/lang.sh ]; then
# for Fedora etc
@@ -164,25 +164,25 @@
fi
[ -n "$oldterm" ] && export TERM=$oldterm
-@@ -255,7 +255,7 @@
+@@ -260,7 +260,7 @@
[ -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"
+ . "$USER_XINPUTRC"
+ READ_XINPUTRC=$USER_XINPUTRC
if [ ! -h "$USER_XINPUTRC" ]; then
SHORT_DESC="User Specific"
- fi
-@@ -266,7 +266,7 @@
+@@ -272,7 +272,7 @@
_sourced_xinputrc=0
for i in $_im_language_list; do
if echo $tmplang | grep -q -E "^$i"; then
- source "$SYS_XINPUTRC"
+ . "$SYS_XINPUTRC"
+ READ_XINPUTRC=$SYS_XINPUTRC
_sourced_xinputrc=1
break
- fi
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
_xcompose_language_list="am_ET el_GR fi_FI pt_BR ru_RU"
for i in $_xcompose_language_list; do
if echo $tmplang | grep -q -E "^$i"; then
@@ -191,7 +191,7 @@
_sourced_xinputrc=1
break
fi
-@@ -285,7 +285,7 @@
+@@ -292,7 +292,7 @@
fi
if [ $_sourced_xinputrc -eq 0 ]; then
# Read none.conf to set up properly for locales not listed the above.
================================================================
Index: packages/imsettings/imsettings.spec
diff -u packages/imsettings/imsettings.spec:1.7 packages/imsettings/imsettings.spec:1.8
--- packages/imsettings/imsettings.spec:1.7 Wed Jan 25 19:09:05 2012
+++ packages/imsettings/imsettings.spec Sat Feb 18 07:39:57 2012
@@ -6,13 +6,13 @@
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.2.7.1
+Version: 1.2.8
Release: 1
License: LGPL v2+
Group: Applications/System
#Source0Download: http://code.google.com/p/imsettings/downloads/list
Source0: http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 8d6c4cd54b0eedbd7bc7f0343d9e9e68
+# Source0-md5: 3450a647f5742fd9f60fc1487c72a3f2
Patch0: %{name}-constraint-of-language.patch
Patch1: %{name}-no-bash.patch
URL: http://code.google.com/p/imsettings/
@@ -23,6 +23,8 @@
BuildRequires: glib2-devel >= 1:2.26.0
BuildRequires: gobject-introspection-devel >= 1.30.0
BuildRequires: gtk+2-devel >= 2:2.12.0
+# "fallback support in GTK+"
+#BuildRequires: gtk+3-devel >= 3.3.3
BuildRequires: gtk-doc >= 1.0
BuildRequires: libgxim-devel >= 0.3.1
BuildRequires: libnotify-devel >= 0.7.0
@@ -333,6 +335,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2012/02/18 06:39:57 qboosh
+- updated to 1.2.8
+- updated constraint-of-language,no-bash patches
+
Revision 1.7 2012/01/25 18:09:05 qboosh
- updated to 1.2.7.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imsettings/imsettings-constraint-of-language.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imsettings/imsettings-no-bash.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/imsettings/imsettings.spec?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list