diff --git a/.cvsignore b/.cvsignore index 4695eab..bf234d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,3 +15,4 @@ imsettings-0.106.1.tar.bz2 imsettings-0.106.2.tar.bz2 imsettings-0.107.0.tar.bz2 imsettings-0.107.1.tar.bz2 +imsettings-0.107.2.tar.bz2 diff --git a/imsettings-log.patch b/imsettings-log.patch deleted file mode 100644 index 740203d..0000000 --- a/imsettings-log.patch +++ /dev/null @@ -1,156 +0,0 @@ -Index: data/xinput.sh.in.in -=================================================================== ---- data/xinput.sh.in.in (リビジョン 315) -+++ data/xinput.sh.in.in (作業コピー) -@@ -10,6 +10,17 @@ - # - # X Input method setup script - -+function log_init() { -+ if [ ! -n "$DRY_RUN" ]; then -+ rm -rf $HOME/.imsettings.log -+ touch $HOME/.imsettings.log -+ fi -+} -+ -+function log() { -+ echo $* >> $HOME/.imsettings.log -+} -+ - function is_dbus_enabled() { - [ -n "$DBUS_SESSION_BUS_ADDRESS" ] - } -@@ -73,7 +84,7 @@ - function run_imsettings() { - print_info - if [ -n "$DRY_RUN" ]; then -- echo "*** DRY RUN MODE: running IM through imsettings" -+ log "*** DRY RUN MODE: running IM through imsettings" - else - if [ -n "$IMSETTINGS_INTEGRATE_DESKTOP" -a "x$IMSETTINGS_INTEGRATE_DESKTOP" = "xno" ]; then - which imsettings-start > /dev/null 2>&1 && LANG="$tmplang" imsettings-start -n "$IMSETTINGS_MODULE" || : -@@ -88,56 +99,48 @@ - function run_xim() { - print_info - if [ -n "$DRY_RUN" ]; then -- echo "*** DRY RUN MODE: running IM without imsettings" -+ log "*** DRY RUN MODE: running IM without imsettings" - else - DISABLE_IMSETTINGS=true - export DISABLE_IMSETTINGS - - # execute XIM_PROGRAM -- [ -n "$XIM_PROGRAM" ] && which "$XIM_PROGRAM" > /dev/null 2>&1 && LANG="$tmplang" "$XIM_PROGRAM" $XIM_ARGS & -+ [ -n "$XIM_PROGRAM" ] && which "$XIM_PROGRAM" > /dev/null 2>&1 && LANG="$tmplang" "$XIM_PROGRAM" $XIM_ARGS > $HOME/.imsettings.log 2>&1 & - fi - } - - function print_result() { - $1 - if [ $? -eq 0 ]; then -- echo yes -+ log yes - else -- echo no -+ log no - fi - } - - function print_info() { -- echo "imsettings information" -- echo "==========================" -- echo -n "Is DBus enabled: " -+ log "imsettings information" -+ log "==========================" -+ log -n "Is DBus enabled: " - print_result is_dbus_enabled -- echo -n "Is imsettings enabled: " -+ log -n "Is imsettings enabled: " - print_result is_imsettings_enabled -- echo -n "Is GTK+ supported: " -+ log -n "Is GTK+ supported: " - print_result is_gtk_supported -- echo -n "Is Qt supported: " -+ log -n "Is Qt supported: " - print_result is_qt_supported -- echo "DESKTOP_SESSION: $DESKTOP_SESSION" -- echo "DISABLE_IMSETTINGS: $DISABLE_IMSETTINGS" -- echo "IMSETTINGS_DISABLE_DESKTOP_CHECK: $IMSETTINGS_DISABLE_DESKTOP_CHECK" -- echo "DBUS_SESSION_BUS_ADDRESS: $DBUS_SESSION_BUS_ADDRESS" -- echo "GTK_IM_MODULE: $GTK_IM_MODULE" -- echo "QT_IM_MODULE: $QT_IM_MODULE" -- echo "XMODIFIERS: $XMODIFIERS" -- echo "IMSETTINGS_MODULE: $IMSETTINGS_MODULE" -- echo "IMSETTINGS_INTEGRATE_DESKTOP: $IMSETTINGS_INTEGRATE_DESKTOP" -- echo "" -+ log "DESKTOP_SESSION: $DESKTOP_SESSION" -+ log "DISABLE_IMSETTINGS: $DISABLE_IMSETTINGS" -+ log "IMSETTINGS_DISABLE_DESKTOP_CHECK: $IMSETTINGS_DISABLE_DESKTOP_CHECK" -+ log "DBUS_SESSION_BUS_ADDRESS: $DBUS_SESSION_BUS_ADDRESS" -+ log "GTK_IM_MODULE: $GTK_IM_MODULE" -+ log "QT_IM_MODULE: $QT_IM_MODULE" -+ log "XMODIFIERS: $XMODIFIERS" -+ log "IMSETTINGS_MODULE: $IMSETTINGS_MODULE" -+ log "IMSETTINGS_INTEGRATE_DESKTOP: $IMSETTINGS_INTEGRATE_DESKTOP" -+ log "" - } - --function output() { -- OPTS="" -- if [ -n "$DRY_RUN" ]; then -- OPTS="-a" -- fi -- tee $OPTS $HOME/.imsettings.log --} -- - USER_XINPUTRC="$HOME/.xinputrc" - SYS_XINPUTRC="@XINPUTRC_PATH@/xinputrc" - -@@ -179,35 +182,26 @@ - [ -z "$IMSETTINGS_MODULE" ] && IMSETTINGS_MODULE="none" - export IMSETTINGS_MODULE - -+## -+log_init -+setup_gtk_immodule -+setup_qt_immodule -+setup_xim -+ - # NOTE: Please make sure the session bus is established before running this script. --( - if ! is_dbus_enabled; then -- echo "***" -- echo "*** No DBus session hasn't been established yet. giving up to deal with Input Method with imsettings." -- echo "***" -+ log "***" -+ log "*** No DBus session hasn't been established yet. giving up to deal with Input Method with imsettings." -+ log "***" - -- setup_gtk_immodule -- setup_qt_immodule -- setup_xim -- - run_xim - elif ! is_imsettings_enabled; then -- echo "***" -- echo "*** imsettings is explicitly disabled." -- echo "***" -+ log "***" -+ log "*** imsettings is explicitly disabled." -+ log "***" - -- setup_gtk_immodule -- setup_qt_immodule -- setup_xim -- - run_xim - else - # Yes, we are in the dbus session -- setup_gtk_immodule -- setup_qt_immodule -- setup_xim -- - run_imsettings - fi --# redirect the output to $HOME/.imsettings.log too --)|output diff --git a/imsettings.spec b/imsettings.spec index f3cf3d7..b21691f 100644 --- a/imsettings.spec +++ b/imsettings.spec @@ -1,6 +1,6 @@ Name: imsettings -Version: 0.107.1 -Release: 2%{?dist} +Version: 0.107.2 +Release: 1%{?dist} License: LGPLv2+ URL: http://code.google.com/p/imsettings/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,7 +16,6 @@ Source0: http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: imsettings-kde.sh Patch0: imsettings-constraint-of-language.patch Patch1: imsettings-disable-xim.patch -Patch2: imsettings-log.patch Summary: Delivery framework for general Input Method configuration Group: Applications/System @@ -83,7 +82,6 @@ This package contains a plugin to get this working on Xfce. %setup -q %patch0 -p1 -b .0-lang %patch1 -p1 -b .1-xim -%patch2 -p0 -b .2-log %build %configure \ @@ -203,6 +201,11 @@ fi %changelog +* Thu Aug 27 2009 Akira TAGOH - 0.107.2-1 +- New upstream release. + - Stop IM process properly with the DBus disconnect signal. (#518970) + - Update the translation. (#517679) + * Fri Aug 14 2009 Akira TAGOH - 0.107.1-2 - export the certain environment variables. diff --git a/sources b/sources index 17fb99b..8e6d783 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa1ac21b4a8cb8a73933d9c5a8e4f256 imsettings-0.107.1.tar.bz2 +3451c2bc4f82e63afb7c827e4a2f8dbf imsettings-0.107.2.tar.bz2