Hello community, here is the log from the commit of package ibus-rime for openSUSE:Factory checked in at 2014-08-20 10:51:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-rime (Old) and /work/SRC/openSUSE:Factory/.ibus-rime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-rime" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-rime/ibus-rime.changes 2014-03-18 14:14:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-rime.new/ibus-rime.changes 2014-08-20 10:51:30.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Aug 10 09:30:10 UTC 2014 - i...@marguerite.su + +- update version 1.2 + * rime_engine.c: add status bar icons; update status bar + only when there is a change in IME status, to fix issues + on Ubuntu Trusty. + * rime_config.h: define macros for version and file paths. + * Makefile: fix file permissions in install target. + +------------------------------------------------------------------- Old: ---- ibus-rime-1.1git20140316.tar.gz New: ---- ibus-rime-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-rime.spec ++++++ --- /var/tmp/diff_new_pack.GUt8y5/_old 2014-08-20 10:51:31.000000000 +0200 +++ /var/tmp/diff_new_pack.GUt8y5/_new 2014-08-20 10:51:31.000000000 +0200 @@ -17,12 +17,12 @@ Name: ibus-rime -Version: 1.1git20140316 +Version: 1.2 Release: 0 Summary: IBus rime License: GPL-3.0 Group: System/I18n/Chinese -Url: http://code.google.com/p/rimeime/ +Url: https://github.com/lotem/ibus-rime Source: %{name}-%{version}.tar.gz BuildRequires: boost-devel BuildRequires: brise @@ -32,13 +32,13 @@ BuildRequires: libkyotocabinet-devel BuildRequires: libnotify-devel BuildRequires: librime-devel >= 1.0 +BuildRequires: opencc +BuildRequires: opencc-devel %if 0%{?suse_version} > 1230 BuildRequires: libyaml-cpp0_5 %else BuildRequires: libyaml-cpp0_3 %endif -BuildRequires: opencc -BuildRequires: opencc-devel %description Rime Input Method Engine - riming with your keystrokes. @@ -50,12 +50,12 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install %{?_smp_mflags} %files -%defattr(-,root,root,-) +%defattr(-,root,root) %doc README -%{_datadir}/ibus/ +%{_ibus_componentdir}/rime.xml %{_datadir}/ibus-rime/ %{_libexecdir}/ibus-rime/ ++++++ ibus-rime-1.1git20140316.tar.gz -> ibus-rime-1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/HEAD new/ibus-rime-1.2/.git/HEAD --- old/ibus-rime-1.1git20140316/.git/HEAD 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/config new/ibus-rime-1.2/.git/config --- old/ibus-rime-1.1git20140316/.git/config 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = https://github.com/lotem/ibus-rime - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/description new/ibus-rime-1.2/.git/description --- old/ibus-rime-1.1git20140316/.git/description 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/description 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/applypatch-msg.sample new/ibus-rime-1.2/.git/hooks/applypatch-msg.sample --- old/ibus-rime-1.1git20140316/.git/hooks/applypatch-msg.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/commit-msg.sample new/ibus-rime-1.2/.git/hooks/commit-msg.sample --- old/ibus-rime-1.1git20140316/.git/hooks/commit-msg.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/post-update.sample new/ibus-rime-1.2/.git/hooks/post-update.sample --- old/ibus-rime-1.1git20140316/.git/hooks/post-update.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/pre-applypatch.sample new/ibus-rime-1.2/.git/hooks/pre-applypatch.sample --- old/ibus-rime-1.1git20140316/.git/hooks/pre-applypatch.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/pre-commit.sample new/ibus-rime-1.2/.git/hooks/pre-commit.sample --- old/ibus-rime-1.1git20140316/.git/hooks/pre-commit.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/pre-push.sample new/ibus-rime-1.2/.git/hooks/pre-push.sample --- old/ibus-rime-1.1git20140316/.git/hooks/pre-push.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# <local ref> <local sha1> <remote ref> <remote sha1> -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -IFS=' ' -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/pre-rebase.sample new/ibus-rime-1.2/.git/hooks/pre-rebase.sample --- old/ibus-rime-1.1git20140316/.git/hooks/pre-rebase.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up-to-date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -exit 0 - -################################################################ - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/prepare-commit-msg.sample new/ibus-rime-1.2/.git/hooks/prepare-commit-msg.sample --- old/ibus-rime-1.1git20140316/.git/hooks/prepare-commit-msg.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; - - *) ;; -esac - -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/hooks/update.sample new/ibus-rime-1.2/.git/hooks/update.sample --- old/ibus-rime-1.1git20140316/.git/hooks/update.sample 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 <ref> <oldrev> <newrev>)" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 <ref> <oldrev> <newrev>" >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 Files old/ibus-rime-1.1git20140316/.git/index and new/ibus-rime-1.2/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/info/exclude new/ibus-rime-1.2/.git/info/exclude --- old/ibus-rime-1.1git20140316/.git/info/exclude 2014-03-16 00:49:30.000000000 +0100 +++ new/ibus-rime-1.2/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/logs/HEAD new/ibus-rime-1.2/.git/logs/HEAD --- old/ibus-rime-1.1git20140316/.git/logs/HEAD 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 882c6c0cf66dac31e15a8b8363134e7f09280b2b marguerite <i...@marguerite.su> 1394927378 +0800 clone: from https://github.com/lotem/ibus-rime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/logs/refs/heads/master new/ibus-rime-1.2/.git/logs/refs/heads/master --- old/ibus-rime-1.1git20140316/.git/logs/refs/heads/master 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 882c6c0cf66dac31e15a8b8363134e7f09280b2b marguerite <i...@marguerite.su> 1394927378 +0800 clone: from https://github.com/lotem/ibus-rime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/logs/refs/remotes/origin/HEAD new/ibus-rime-1.2/.git/logs/refs/remotes/origin/HEAD --- old/ibus-rime-1.1git20140316/.git/logs/refs/remotes/origin/HEAD 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 882c6c0cf66dac31e15a8b8363134e7f09280b2b marguerite <i...@marguerite.su> 1394927378 +0800 clone: from https://github.com/lotem/ibus-rime Files old/ibus-rime-1.1git20140316/.git/objects/pack/pack-b2a401e47f3ae4ebff3f2d58ff8da124b3c570c4.idx and new/ibus-rime-1.2/.git/objects/pack/pack-b2a401e47f3ae4ebff3f2d58ff8da124b3c570c4.idx differ Files old/ibus-rime-1.1git20140316/.git/objects/pack/pack-b2a401e47f3ae4ebff3f2d58ff8da124b3c570c4.pack and new/ibus-rime-1.2/.git/objects/pack/pack-b2a401e47f3ae4ebff3f2d58ff8da124b3c570c4.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/packed-refs new/ibus-rime-1.2/.git/packed-refs --- old/ibus-rime-1.1git20140316/.git/packed-refs 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# pack-refs with: peeled fully-peeled -882c6c0cf66dac31e15a8b8363134e7f09280b2b refs/remotes/origin/master -5d29bbb22c32c5a96b22c3b20a6645999e7fa6fd refs/tags/rime-0.9.1 -^4fe9b0767c0f8502ed006701a61686a5513115c5 -dc850f6a3425602e09e0108e42bfe5781987e245 refs/tags/rime-0.9.2 -^f705126fcb9ce04a5d9a82b035d367e9c0bf402d -5a04a8218724700aa8a4dd07b1542caf32af5d32 refs/tags/rime-0.9.3 -^2947f52cc54c5f3b531ce03dbbeebfffec534c6b -faa7ec2b7743a3eb00c6a4f0c8c946f837317394 refs/tags/rime-0.9.4 -^ad1182a216a5b5651873f15a45948619dc9d762b -ad3f712618def2dd6fd89c0e57099073b40c4b4a refs/tags/rime-0.9.6 -^ff38c6729b5dff8302022c562e33e5781c9b6a9b -27e0db2967e6c2f8d184fa56bde323327a10f5ef refs/tags/rime-0.9.7 -^55d11a0dcb135f2ce1b148f8ba755570496a19e8 -22aada1f5c9f220814c1905049596f27c2dfea17 refs/tags/rime-0.9.8 -^077f0da0b2aa96186252f655da748425524022f3 -7eff63862b5da2c95aee7cba7bff129ed6505efa refs/tags/rime-0.9.9 -^bb9c25d514b506c64fb3e88cce11c149bda1d6e3 -fba1e9883052162bbb3616b487ffc0d9e134801b refs/tags/rime-1.0 -^f65741b85d694813a21453095b94c2896f6252df -fa2c82f36f604a8d8bec29f6d4cff4f06b79cf31 refs/tags/rime-1.1 -^37f59f8f4ed4814aa237a98b5c49d213d5bb900e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/refs/heads/master new/ibus-rime-1.2/.git/refs/heads/master --- old/ibus-rime-1.1git20140316/.git/refs/heads/master 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -882c6c0cf66dac31e15a8b8363134e7f09280b2b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/.git/refs/remotes/origin/HEAD new/ibus-rime-1.2/.git/refs/remotes/origin/HEAD --- old/ibus-rime-1.1git20140316/.git/refs/remotes/origin/HEAD 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/CMakeLists.txt new/ibus-rime-1.2/CMakeLists.txt --- old/ibus-rime-1.1git20140316/CMakeLists.txt 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/CMakeLists.txt 2014-07-19 11:56:11.000000000 +0200 @@ -35,7 +35,7 @@ if(BUILD_STATIC) link_directories(${PROJECT_SOURCE_DIR}/lib) set(RIME_DEPS ${RIME_DEPS} m stdc++ pthread z - libboost_filesystem-mt.a libboost_regex-mt.a libboost_signals-mt.a libboost_system-mt.a libboost_thread-mt.a + libboost_filesystem.a libboost_regex.a libboost_signals.a libboost_system.a libboost_thread.a libglog.a libkyotocabinet.a libopencc.a libyaml-cpp.a) endif(BUILD_STATIC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/ChangeLog new/ibus-rime-1.2/ChangeLog --- old/ibus-rime-1.1git20140316/ChangeLog 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/ChangeLog 2014-07-19 11:56:11.000000000 +0200 @@ -1,3 +1,12 @@ +2013-07-19 GONG Chen <chen....@gmail.com> + + * rime_engine.c: add status bar icons; update status bar only when there is + a change in IME status, to fix issues on Ubuntu Trusty. + * rime_config.h: define macros for version and file paths. + * Makefile: fix file permissions in install target. + + - ibus-rime 1.2 release. + 2013-12-26 GONG Chen <chen....@gmail.com> * rime.xml: add symbolic icon for GNOME Shell. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/Makefile new/ibus-rime-1.2/Makefile --- old/ibus-rime-1.1git20140316/Makefile 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/Makefile 2014-07-19 11:56:11.000000000 +0200 @@ -17,13 +17,13 @@ @echo ':)' install: - mkdir -p $(sharedir)/ibus/component - cp rime.xml $(sharedir)/ibus/component/ - mkdir -p $(libexecdir)/ibus-rime - cp -f build/ibus-engine-rime $(libexecdir)/ibus-rime/ - mkdir -p $(sharedir)/ibus-rime - mkdir -p $(sharedir)/ibus-rime/icons - cp -f rime.png $(sharedir)/ibus-rime/icons/ + install -m 755 -d $(sharedir)/ibus/component + install -m 644 -t $(sharedir)/ibus/component/ rime.xml + install -m 755 -d $(libexecdir)/ibus-rime + install -m 755 -t $(libexecdir)/ibus-rime/ build/ibus-engine-rime + install -m 755 -d $(sharedir)/ibus-rime + install -m 755 -d $(sharedir)/ibus-rime/icons + install -m 644 -t $(sharedir)/ibus-rime/icons/ icons/*.png uninstall: rm $(sharedir)/ibus/component/rime.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/icons/LICENSE-Freecns.txt new/ibus-rime-1.2/icons/LICENSE-Freecns.txt --- old/ibus-rime-1.1git20140316/icons/LICENSE-Freecns.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime-1.2/icons/LICENSE-Freecns.txt 2014-07-19 11:56:11.000000000 +0200 @@ -0,0 +1,6 @@ +Freecns Cumulus + +Created by Yannick Lung, 2013 + +LICENSE +You are free to use Freecns for commercial and personal purposes without attribution, however a credit for the work would be appreciated. You may not sell or redistribute the icons themselves as icons. Do not claim creative credit. Files old/ibus-rime-1.1git20140316/icons/abc.png and new/ibus-rime-1.2/icons/abc.png differ Files old/ibus-rime-1.1git20140316/icons/disabled.png and new/ibus-rime-1.2/icons/disabled.png differ Files old/ibus-rime-1.1git20140316/icons/keyboard.png and new/ibus-rime-1.2/icons/keyboard.png differ Files old/ibus-rime-1.1git20140316/icons/pen.png and new/ibus-rime-1.2/icons/pen.png differ Files old/ibus-rime-1.1git20140316/icons/reload.png and new/ibus-rime-1.2/icons/reload.png differ Files old/ibus-rime-1.1git20140316/icons/rime.png and new/ibus-rime-1.2/icons/rime.png differ Files old/ibus-rime-1.1git20140316/icons/sync.png and new/ibus-rime-1.2/icons/sync.png differ Files old/ibus-rime-1.1git20140316/icons/zh.png and new/ibus-rime-1.2/icons/zh.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/install-static.sh new/ibus-rime-1.2/install-static.sh --- old/ibus-rime-1.1git20140316/install-static.sh 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/install-static.sh 2014-07-19 11:56:11.000000000 +0200 @@ -1,3 +1,5 @@ +#!/bin/bash + if [ ! -e librime -a -e ../librime ]; then ln -s ../librime; fi if [ ! -e brise -a -e ../brise ]; then ln -s ../brise; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/install.sh new/ibus-rime-1.2/install.sh --- old/ibus-rime-1.1git20140316/install.sh 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/install.sh 2014-07-19 11:56:11.000000000 +0200 @@ -1,3 +1,5 @@ +#!/bin/bash + if [ ! -e librime -a -e ../librime ]; then ln -s ../librime; fi if [ ! -e brise -a -e ../brise ]; then ln -s ../brise; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/package/make-package new/ibus-rime-1.2/package/make-package --- old/ibus-rime-1.1git20140316/package/make-package 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/package/make-package 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -#!/bin/bash - -basedir=$(dirname $(realpath $0)) - -src=$1 -ver=$2 -if [[ -z "$src" || -z "$ver" ]]; then - echo "usage: `basename $0` path version" - exit 1 -fi - -pkg=$(basename $(realpath "$src")) -echo "pkg=$pkg" - -if [[ "$pkg" =~ .*rime ]]; then - tag=rime-${ver} -else - tag=$pkg-${ver} -fi -echo "tag=$tag" - -(cd $src ; git archive --format=tar.gz --prefix=$pkg/ $tag > $basedir/${pkg}-${ver}.tar.gz) || exit 1 - -echo 'built:' -ls $basedir/${pkg}-${ver}.tar.gz Files old/ibus-rime-1.1git20140316/rime.png and new/ibus-rime-1.2/rime.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/rime_config.h new/ibus-rime-1.2/rime_config.h --- old/ibus-rime-1.1git20140316/rime_config.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime-1.2/rime_config.h 2014-07-19 11:56:11.000000000 +0200 @@ -0,0 +1,10 @@ +#ifndef RIME_CONFIG_H_ +#define RIME_CONFIG_H_ + +#define RIME_VERSION "1.2" + +#define IBUS_RIME_INSTALL_PREFIX "/usr" +#define IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX "/share/rime-data" +#define IBUS_RIME_ICONS_DIR IBUS_RIME_INSTALL_PREFIX "/share/ibus-rime/icons" + +#endif // RIME_CONFIG_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/rime_engine.c new/ibus-rime-1.2/rime_engine.c --- old/ibus-rime-1.1git20140316/rime_engine.c 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/rime_engine.c 2014-07-19 11:56:11.000000000 +0200 @@ -1,3 +1,4 @@ +#include "rime_config.h" #include <string.h> #include <rime_api.h> #include "rime_engine.h" @@ -14,6 +15,7 @@ /* members */ RimeSessionId session_id; + RimeStatus status; IBusLookupTable* table; IBusPropList* props; }; @@ -92,6 +94,9 @@ //rime->session_id = RimeCreateSession(); ibus_rime_create_session(rime); + RIME_STRUCT_INIT(RimeStatus, rime->status); + RIME_STRUCT_CLEAR(rime->status); + rime->table = ibus_lookup_table_new(9, 0, TRUE, FALSE); g_object_ref_sink(rime->table); @@ -99,38 +104,38 @@ g_object_ref_sink(rime->props); IBusProperty* prop; - IBusText* text; + IBusText* label; IBusText* tips; - text = ibus_text_new_from_static_string("中"); + label = ibus_text_new_from_static_string("中文"); tips = ibus_text_new_from_static_string("中 ↔ A"); prop = ibus_property_new("mode.chinese", PROP_TYPE_NORMAL, - text, - NULL, + label, + IBUS_RIME_ICONS_DIR "/zh.png", tips, TRUE, TRUE, PROP_STATE_UNCHECKED, NULL); ibus_prop_list_append(rime->props, prop); - text = ibus_text_new_from_static_string("⟲"); + label = ibus_text_new_from_static_string("部署"); tips = ibus_text_new_from_static_string(_("Deploy")); prop = ibus_property_new("deploy", PROP_TYPE_NORMAL, - text, - NULL, + label, + IBUS_RIME_ICONS_DIR "/reload.png", tips, TRUE, TRUE, PROP_STATE_UNCHECKED, NULL); ibus_prop_list_append(rime->props, prop); - text = ibus_text_new_from_static_string("⇅"); + label = ibus_text_new_from_static_string("同步"); tips = ibus_text_new_from_static_string(_("Sync data")); prop = ibus_property_new("sync", PROP_TYPE_NORMAL, - text, - NULL, + label, + IBUS_RIME_ICONS_DIR "/sync.png", tips, TRUE, TRUE, @@ -147,6 +152,14 @@ rime->session_id = 0; } + if (rime->status.schema_id) { + g_free(rime->status.schema_id); + } + if (rime->status.schema_name) { + g_free(rime->status.schema_name); + } + RIME_STRUCT_CLEAR(rime->status); + if (rime->table) { g_object_unref(rime->table); rime->table = NULL; @@ -200,29 +213,48 @@ static void ibus_rime_update_status(IBusRimeEngine *rime, RimeStatus *status) { + if (status && + rime->status.is_disabled == status->is_disabled && + rime->status.is_ascii_mode == status->is_ascii_mode && + rime->status.schema_id && status->schema_id && + !strcmp(rime->status.schema_id, status->schema_id)) { + return; // no updates + } + + rime->status.is_disabled = status ? status->is_disabled : False; + rime->status.is_ascii_mode = status ? status->is_ascii_mode : False; + if (rime->status.schema_id) { + g_free(rime->status.schema_id); + } + rime->status.schema_id = + status && status->schema_id ? g_strdup(status->schema_id) : NULL; + IBusProperty* prop = ibus_prop_list_get(rime->props, 0); + const gchar* icon; + IBusText* label; if (prop) { - IBusText* text; if (!status || status->is_disabled) { - text = ibus_text_new_from_static_string("⌛"); + icon = IBUS_RIME_ICONS_DIR "/disabled.png"; + label = ibus_text_new_from_static_string("維護"); } else if (status->is_ascii_mode) { - text = ibus_text_new_from_static_string("A"); + icon = IBUS_RIME_ICONS_DIR "/abc.png"; + label = ibus_text_new_from_static_string("Abc"); } else { + icon = IBUS_RIME_ICONS_DIR "/zh.png"; /* schema_name is ".default" in switcher */ - if (status->schema_name && - status->schema_name[0] != '.') { - text = ibus_text_new_from_string(status->schema_name); + if (status->schema_name && status->schema_name[0] != '.') { + label = ibus_text_new_from_string(status->schema_name); } else { - text = ibus_text_new_from_static_string("中"); + label = ibus_text_new_from_static_string("中文"); } } - ibus_property_set_label(prop, text); + ibus_property_set_icon(prop, icon); + ibus_property_set_label(prop, label); ibus_engine_update_property((IBusEngine *)rime, prop); } - } static void ibus_rime_engine_update(IBusRimeEngine *rime) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/rime_main.c new/ibus-rime-1.2/rime_main.c --- old/ibus-rime-1.1git20140316/rime_main.c 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/rime_main.c 2014-07-19 11:56:11.000000000 +0200 @@ -1,5 +1,6 @@ // ibus-rime program entry +#include "rime_config.h" #include <stdlib.h> #include <string.h> #include <signal.h> @@ -10,7 +11,6 @@ #include <rime_api.h> #include "rime_engine.h" #include "rime_settings.h" -#include "rime_version.h" // TODO: #define _(x) (x) @@ -19,9 +19,6 @@ #define DISTRIBUTION_CODE_NAME "ibus-rime" #define DISTRIBUTION_VERSION RIME_VERSION -#define IBUS_RIME_INSTALL_PREFIX "/usr" -#define IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX "/share/rime-data" - static const char* get_ibus_rime_user_data_dir(char *path) { const char* home = getenv("HOME"); strcpy(path, home); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/rime_settings.c new/ibus-rime-1.2/rime_settings.c --- old/ibus-rime-1.1git20140316/rime_settings.c 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/rime_settings.c 2014-07-19 11:56:11.000000000 +0200 @@ -1,3 +1,4 @@ +#include "rime_config.h" #include <ibus.h> #include "rime_settings.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.1git20140316/rime_version.h new/ibus-rime-1.2/rime_version.h --- old/ibus-rime-1.1git20140316/rime_version.h 2014-03-16 00:49:38.000000000 +0100 +++ new/ibus-rime-1.2/rime_version.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -#ifndef RIME_VERSION_H_ -#define RIME_VERSION_H_ - -#define RIME_VERSION "1.1" - -#endif // RIME_VERSION_H_ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
