Hello community, here is the log from the commit of package ibus-rime for openSUSE:Factory checked in at 2012-10-23 21:24:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-rime (Old) and /work/SRC/openSUSE:Factory/.ibus-rime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-rime", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-rime/ibus-rime.changes 2012-09-06 08:46:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-rime.new/ibus-rime.changes 2012-10-23 21:24:52.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Oct 15 20:19:23 CST 2012 - [email protected] + +- Update to 0.9.4 + * user dictionary for table input method. + * automatically build schema dependencies. + * logging with google-glog. + * install data files from a separate package: brise. + * new API: accessing schema list. + * new API: enabling/disabling soft cursor in preedit string. + +------------------------------------------------------------------- Old: ---- ibus-rime-0.9.2.tar.gz New: ---- ibus-rime-0.9.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-rime.spec ++++++ --- /var/tmp/diff_new_pack.XMWRcA/_old 2012-10-23 21:24:56.000000000 +0200 +++ /var/tmp/diff_new_pack.XMWRcA/_new 2012-10-23 21:24:56.000000000 +0200 @@ -15,23 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ibus-rime -Version: 0.9.2 -Release: 1 +Version: 0.9.4 +Release: 0 Summary: IBus rime License: GPL-3.0 Group: System/I18n/Chinese -URL: http://code.google.com/p/rimeime/ +Url: http://code.google.com/p/rimeime/ Source: http://rimeime.googlecode.com/files/%{name}-%{version}.tar.gz -BuildRequires: ibus-devel -BuildRequires: librime-devel -BuildRequires: libnotify-devel BuildRequires: boost-devel +BuildRequires: brise BuildRequires: cmake -BuildRequires: opencc opencc-devel -BuildRequires: libyaml-cpp0_3 -BuildRequires: libkyotocabinet-devel BuildRequires: gcc-c++ +BuildRequires: ibus-devel +BuildRequires: libkyotocabinet-devel +BuildRequires: libnotify-devel +BuildRequires: librime-devel +BuildRequires: libyaml-cpp0_3 +BuildRequires: opencc +BuildRequires: opencc-devel %description Rime Input Method Engine - riming with your keystrokes. @@ -46,7 +49,6 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=%{buildroot} install - %files %defattr(-,root,root,-) %doc README @@ -54,5 +56,4 @@ %{_datadir}/ibus-rime/ /usr/lib/ibus-rime/ - %changelog ++++++ ibus-rime-0.9.2.tar.gz -> ibus-rime-0.9.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/.gitignore new/ibus-rime/.gitignore --- old/ibus-rime/.gitignore 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/.gitignore 2012-09-26 07:03:25.000000000 +0200 @@ -1,5 +1,4 @@ build -cmake data package *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/CMakeLists.txt new/ibus-rime/CMakeLists.txt --- old/ibus-rime/CMakeLists.txt 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/CMakeLists.txt 2012-09-26 07:03:25.000000000 +0200 @@ -21,6 +21,13 @@ include_directories(${Rime_INCLUDE_DIR}) endif(Rime_FOUND) +if(NOT DEFINED RIME_DATA_DIR) + find_package(Brise REQUIRED) + set(RIME_DATA_DIR ${BRISE_DIR}) +endif(NOT DEFINED RIME_DATA_DIR) +message(STATUS "Precompiler macro RIME_DATA_DIR is set to \"${RIME_DATA_DIR}\"") +add_definitions(-DRIME_DATA_DIR="${RIME_DATA_DIR}") + aux_source_directory(. IBUS_RIME_SRC) add_executable(ibus-engine-rime ${IBUS_RIME_SRC}) target_link_libraries(ibus-engine-rime ${IBus_LIBRARIES} ${LIBNOTIFY_LIBRARIES} ${Rime_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/Makefile new/ibus-rime/Makefile --- old/ibus-rime/Makefile 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/Makefile 2012-09-26 07:03:25.000000000 +0200 @@ -1,12 +1,14 @@ -sharedir = $(DESTDIR)/usr/share -libexecdir = $(DESTDIR)/usr/lib +ifeq (${PREFIX},) + PREFIX=/usr +endif +sharedir = $(DESTDIR)$(PREFIX)/share +libexecdir = $(DESTDIR)$(PREFIX)/lib all: ibus-engine-rime ibus-engine-rime: - #if [ ! -e cmake ]; then ln -s ../librime/cmake; fi mkdir -p build - (cd build; cmake .. && make) + (cd build; cmake -DCMAKE_BUILD_TYPE=Release .. && make) @echo ':)' install: @@ -15,7 +17,6 @@ mkdir -p $(libexecdir)/ibus-rime cp -f build/ibus-engine-rime $(libexecdir)/ibus-rime/ mkdir -p $(sharedir)/ibus-rime - #cp -rf data/* $(sharedir)/ibus-rime/ mkdir -p $(sharedir)/ibus-rime/icons cp -f zhung.svg $(sharedir)/ibus-rime/icons/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/README new/ibus-rime/README --- old/ibus-rime/README 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/README 2012-09-26 07:03:25.000000000 +0200 @@ -22,17 +22,14 @@ You need both librime and ibus-rime packages. ``` -tar xzvf librime-*.tar.gz -cd librime -make -sudo make install - -tar xzvf ibus-rime-*.tar.gz +tar xzf librime-*.tar.gz +tar xzf ibus-rime-*.tar.gz cd ibus-rime -make -sudo make install +# do this as normal user +./install.sh ``` + Configure IBus -------------- * restart IBus @@ -42,12 +39,7 @@ -------------- http://code.google.com/p/rimeime/wiki/CustomizationGuide -You will work with config files a lot. -After making some changes, issue the commands in a terminal: -``` -rm ~/.ibus/rime/default.yaml -ibus-daemon -drx -``` +After making some changes, click the ⟲ (Deploy) button on the language panel. It may take some time to rebuild dictionaries, depending on what has been changed. Rime will come back to work as soon as the deployment is finished. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/cmake/FindBrise.cmake new/ibus-rime/cmake/FindBrise.cmake --- old/ibus-rime/cmake/FindBrise.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime/cmake/FindBrise.cmake 2012-09-26 07:03:25.000000000 +0200 @@ -0,0 +1,25 @@ +# Author: Marguerite Su <[email protected]> +# License: GPL +# Description: find Rime schema collection package (brise). +# BRISE_FOUND - System has brise package +# BRISE_DIR - Brise absolute path + +set(BRISE_FIND_DIR "${CMAKE_INSTALL_PREFIX}/share/brise" + "${CMAKE_INSTALL_PREFIX}/share/rime-data" + "${CMAKE_INSTALL_PREFIX}/share/rime/data" + "/usr/share/brise" + "/usr/share/rime-data" + "/usr/share/rime/data") + +set(BRISE_FOUND FALSE) + +foreach(_BRISE_DIR ${BRISE_FIND_DIR}) + if (IS_DIRECTORY ${_BRISE_DIR}) + set(BRISE_FOUND True) + set(BRISE_DIR ${_BRISE_DIR}) + endif (IS_DIRECTORY ${_BRISE_DIR}) +endforeach(_BRISE_DIR) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Brise DEFAULT_MSG BRISE_DIR) +mark_as_advanced(BRISE_DIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/install.sh new/ibus-rime/install.sh --- old/ibus-rime/install.sh 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/install.sh 2012-09-26 07:03:25.000000000 +0200 @@ -1,2 +1,3 @@ (cd ../librime; make && sudo make install) || exit 1 +(cd ../brise; make && sudo make install) || exit 1 make clean && make && sudo make install && ibus-daemon -drx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/brise/ChangeLog new/ibus-rime/package/archlinux/brise/ChangeLog --- old/ibus-rime/package/archlinux/brise/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime/package/archlinux/brise/ChangeLog 2012-09-26 07:03:25.000000000 +0200 @@ -0,0 +1,10 @@ +2012-09-25 GONG Chen <[email protected]> + + * 0.13-1 : + Brise 0.13 release. + + * install data files from a separate package. + * update: luna_pinyin, terra_pinyin, jyutping tables. + * update: essay database. + * new schema: emoji. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/brise/PKGBUILD new/ibus-rime/package/archlinux/brise/PKGBUILD --- old/ibus-rime/package/archlinux/brise/PKGBUILD 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime/package/archlinux/brise/PKGBUILD 2012-09-26 07:03:25.000000000 +0200 @@ -0,0 +1,25 @@ +# Maintainer: GONG Chen <chen dot sst at gmail dot com> +pkgname=brise +pkgver=0.13 +pkgrel=1 +pkgdesc="Rime schema repository" +arch=('any') +url="http://code.google.com/p/rimeime/"; +license=('GPL3') +depends=() +makedepends=('cmake' 'librime>=0.9.3') +provides=('librime-data') +conflicts=('librime<0.9.3' 'ibus-rime<0.9.3') +changelog=ChangeLog +source=(http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz) + +build() { + cd "${srcdir}/$pkgname" + make +} + +package() { + cd "${srcdir}/$pkgname" + make DESTDIR="$pkgdir" install +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/ibus-rime/ChangeLog new/ibus-rime/package/archlinux/ibus-rime/ChangeLog --- old/ibus-rime/package/archlinux/ibus-rime/ChangeLog 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/package/archlinux/ibus-rime/ChangeLog 2012-09-26 07:03:25.000000000 +0200 @@ -1,15 +1,30 @@ -2012-07-08 GONG Chen <[email protected]> +2012-09-26 GONG Chen <[email protected]> + + * 0.9.4-1 : + Rime 0.9.4 release. + + * update PKGBUILD. + +2012-09-25 GONG Chen <[email protected]> + + * 0.9.3-1 : + Rime 0.9.3 release. + + * new dependency: brise. + * logging with google-glog. + +2012-07-08 GONG Chen <[email protected]> * 0.9.2-1 : Rime 0.9.2 release. * UI: new Rime logo. - * UI: Add Chinese/ascii mode indicator, and Deploy button to status bar. - * UI: Show notification when deploying Rime. + * UI: add Chinese/ascii mode indicator, and Deploy button to status bar. + * UI: show notification when deploying Rime. * package: use the shared copy of rime-data distributed with librime package. -2012-05-06 GONG Chen <[email protected]> +2012-05-06 GONG Chen <[email protected]> * 0.9.1-1 : Revised Rime 0.9 API. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/ibus-rime/PKGBUILD new/ibus-rime/package/archlinux/ibus-rime/PKGBUILD --- old/ibus-rime/package/archlinux/ibus-rime/PKGBUILD 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/package/archlinux/ibus-rime/PKGBUILD 2012-09-26 07:03:25.000000000 +0200 @@ -1,14 +1,15 @@ # Maintainer: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=0.9.2 +pkgver=0.9.4 pkgrel=1 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/"; license=('GPL3') -depends=('ibus' 'libnotify' 'librime>=0.9.2') +depends=('ibus' 'libnotify' 'librime>=0.9.3' 'brise') makedepends=('cmake') +install=ibus-rime.install changelog=ChangeLog source=(http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/ibus-rime/ibus-rime.install new/ibus-rime/package/archlinux/ibus-rime/ibus-rime.install --- old/ibus-rime/package/archlinux/ibus-rime/ibus-rime.install 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime/package/archlinux/ibus-rime/ibus-rime.install 2012-09-26 07:03:25.000000000 +0200 @@ -0,0 +1,3 @@ +pre_upgrade() { + rm /usr/share/ibus-rime/*.bin || true +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/librime/ChangeLog new/ibus-rime/package/archlinux/librime/ChangeLog --- old/ibus-rime/package/archlinux/librime/ChangeLog 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/package/archlinux/librime/ChangeLog 2012-09-26 07:03:25.000000000 +0200 @@ -1,4 +1,24 @@ -2012-07-08 GONG Chen <[email protected]> +2012-09-26 GONG Chen <[email protected]> + + * 0.9.4-1 : + Rime 0.9.4 release. + + * document new dependency 'google-glog'. + * fix x64 build. + +2012-09-25 GONG Chen <[email protected]> + + * 0.9.3-1 : + Rime 0.9.3 release. + + * user dictionary for table input method. + * automatically build schema dependencies. + * logging with google-glog. + * install data files from a separate package: brise. + * new API: accessing schema list. + * new API: enabling/disabling soft cursor in preedit string. + +2012-07-08 GONG Chen <[email protected]> * 0.9.2-1 : Rime 0.9.2 release. @@ -18,7 +38,7 @@ * new schema: IPA input method in X-SAMPA. -2012-05-06 GONG Chen <[email protected]> +2012-05-06 GONG Chen <[email protected]> * 0.9.1-1 : Revised Rime 0.9 API. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/librime/PKGBUILD new/ibus-rime/package/archlinux/librime/PKGBUILD --- old/ibus-rime/package/archlinux/librime/PKGBUILD 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/package/archlinux/librime/PKGBUILD 2012-09-26 07:03:25.000000000 +0200 @@ -1,15 +1,15 @@ # Maintainer: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=librime -pkgver=0.9.2 -pkgrel=1 +pkgver=0.9.4 +pkgrel=2 pkgdesc="Rime input method engine" arch=('i686' 'x86_64') url="http://code.google.com/p/rimeime/"; license=('GPL3') -depends=('boost>=1.46' 'kyotocabinet' 'opencc' 'yaml-cpp') +depends=('boost>=1.46' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp') +optdepends=('brise: Rime schema repository') makedepends=('cmake') -install=librime.install changelog=ChangeLog source=(http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz) @@ -20,6 +20,6 @@ package() { cd "${srcdir}/$pkgname" - make DESTDIR="$pkgdir" install-librime + make DESTDIR="$pkgdir" install } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/archlinux/librime/librime.install new/ibus-rime/package/archlinux/librime/librime.install --- old/ibus-rime/package/archlinux/librime/librime.install 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/package/archlinux/librime/librime.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -post_install() { - echo 'precompiling Rime schemas, patience...' - /usr/bin/rime_deployer --build /usr/share/rime-data - if [ -e /usr/share/rime-data/rime.log ]; then rm /usr/share/rime-data/rime.log; fi -} - -post_upgrade() { - echo 'precompiling Rime schemas, patience...' - /usr/bin/rime_deployer --build /usr/share/rime-data - if [ -e /usr/share/rime-data/rime.log ]; then rm /usr/share/rime-data/rime.log; fi -} - -pre_remove() { - echo 'cleaning up precompiled Rime schema files.' - rm /usr/share/rime-data/*.bin || true -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/package/package.sh new/ibus-rime/package/package.sh --- old/ibus-rime/package/package.sh 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/package/package.sh 2012-09-26 07:03:25.000000000 +0200 @@ -1,19 +1,21 @@ #!/bin/bash -if [ -z "$1" ]; then - echo "usage: `basename $0` {version}" +if [ -z "$1" -o -z "$2" ]; then + echo "usage: `basename $0` {rime-version} {brise-version}" exit 1 fi -version=$1 +rime_version=$1 +brise_version=$2 mkdir -p temp cd temp for x in brise librime ibus-rime; do if [ -d $x ]; then rm -Rf $x; fi git clone ../../../$x && rm -Rf $x/.git done -tar czvf ../librime-$version.tar.gz brise/ librime/ -tar czvf ../ibus-rime-$version.tar.gz ibus-rime/ +tar czvf ../brise-$brise_version.tar.gz brise/ +tar czvf ../librime-$rime_version.tar.gz librime/ +tar czvf ../ibus-rime-$rime_version.tar.gz ibus-rime/ cd .. rm -Rf temp echo echo 'built:' -ls *-$version.tar.gz +ls *-$brise_version.tar.gz *-$rime_version.tar.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/rime_engine.c new/ibus-rime/rime_engine.c --- old/ibus-rime/rime_engine.c 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/rime_engine.c 2012-09-26 07:03:25.000000000 +0200 @@ -77,9 +77,17 @@ } static void -ibus_rime_engine_init (IBusRimeEngine *rime) +ibus_rime_create_session (IBusRimeEngine *rime) { rime->session_id = RimeCreateSession(); + RimeSetOption(rime->session_id, "soft_cursor", True); +} + +static void +ibus_rime_engine_init (IBusRimeEngine *rime) +{ + //rime->session_id = RimeCreateSession(); + ibus_rime_create_session(rime); rime->table = ibus_lookup_table_new(9, 0, TRUE, FALSE); g_object_ref_sink(rime->table); @@ -143,7 +151,8 @@ IBusRimeEngine *rime = (IBusRimeEngine *)engine; ibus_engine_register_properties((IBusEngine *)rime, rime->props); if (!rime->session_id) { - rime->session_id = RimeCreateSession(); + //rime->session_id = RimeCreateSession(); + ibus_rime_create_session(rime); } ibus_rime_engine_update(rime); } @@ -339,7 +348,8 @@ modifiers &= (IBUS_RELEASE_MASK | IBUS_CONTROL_MASK | IBUS_MOD1_MASK); if (!RimeFindSession(rime->session_id)) { - rime->session_id = RimeCreateSession(); + //rime->session_id = RimeCreateSession(); + ibus_rime_create_session(rime); } if (!rime->session_id) { // service disabled ibus_rime_engine_update(rime); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime/rime_main.c new/ibus-rime/rime_main.c --- old/ibus-rime/rime_main.c 2012-07-08 17:17:29.000000000 +0200 +++ new/ibus-rime/rime_main.c 2012-09-26 07:03:25.000000000 +0200 @@ -16,7 +16,7 @@ #define DISTRIBUTION_NAME _("Rime") #define DISTRIBUTION_CODE_NAME "ibus-rime" -#define DISTRIBUTION_VERSION "0.9.2" +#define DISTRIBUTION_VERSION "0.9.4" #define IBUS_RIME_INSTALL_PREFIX "/usr" #define IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX "/share/rime-data" @@ -103,6 +103,9 @@ g_error("notify_init failed"); exit(1); } + + RimeSetupLogging("rime.ibus"); + gboolean full_check = FALSE; ibus_rime_start(full_check); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
