Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2013-07-08 15:08:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2013-04-29 09:53:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2013-07-08 15:08:17.000000000 +0200 @@ -1,0 +2,22 @@ +Sun Jun 30 23:12:53 UTC 2013 - [email protected] + +- update version 4.2.8 + * New Default Theme + * Add modifier only key support to trigger keys + * New DBus based Tray Icon support + * Desktop Notification Support + * First time start will only choose language in current locale + * Use first keyboard input method as default keyboard layout for most case + * fcitx-qt supports a key grab widget forked from KDE, and Qt <-> Fcitx Key +translation. + * Multi file quickphrase Support. + * Ship with some default quick phrase + * quickphrase editor support +- drop all old patches: upstream absorbed. +- add new patch: fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch + * DBUS_TIMEOUT_USE_DEFAULT is undefined in src/module/freedesktop-notify/freedesktop-notify.c +- add new patch: fcitx-4.2.8-arch-dependent-file-in-usr-share.patch + * don't install fcitx-po-parser,fcitx-scanner,comp-spell-dict into + /usr/share/cmake/fcitx + +------------------------------------------------------------------- Old: ---- bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch fcitx-4.2.7-compat-12.2.patch fcitx-4.2.7-compat-gcc46.patch fcitx-4.2.7-compat-qt474.patch fcitx-4.2.7.tar.bz2 New: ---- fcitx-4.2.8-arch-dependent-file-in-usr-share.patch fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch fcitx-4.2.8_dict.tar.xz macros.fcitx ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.ruqp5l/_old 2013-07-08 15:08:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ruqp5l/_new 2013-07-08 15:08:19.000000000 +0200 @@ -15,33 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define libver -4_2_7 + +%define libver -4_2_8 Name: fcitx -Version: 4.2.7 +Version: 4.2.8 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension License: GPL-2.0+ Group: System/I18n/Chinese Url: http://code.google.com/p/fcitx -#Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz -# use bzip to be compatible with sles. -Source: %{name}-%{version}.tar.bz2 +Source: http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz Source1: xim.d-fcitx Source2: fcitx-README.suse Source3: xim.fcitx.suse.template # for fedora auto-start Source7: xinput-fcitx Source8: openSUSE-default.tar.gz -# fix-for-openSUSE [email protected] - fix opensuse builds <= 1220 -Patch1: fcitx-4.2.7-compat-12.2.patch -# fix-for-openSUSE [email protected] - fix qt 4.7 builds -Patch2: fcitx-4.2.7-compat-qt474.patch -# fix-for-openSUSE [email protected] - fix gcc 4.6 builds -Patch3: fcitx-4.2.7-compat-gcc46.patch -# fix-for-openSUSE [email protected] - xkeyboard-config in SUSE use symlink for xkb rule files, -# which caused fcitx unexpected behavior in keyboard layout handling. -Patch4: bnc801318-fcitx-4.2.7-xkb-rule-symlink-detection.patch +Source9: macros.%{name} +# PATCH-FIX-UPSTREAM [email protected] - fix missing DBUS_TIMEOUT_USE_DEFAULT in freedesktop-notify.c +Patch: fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch +# PATCH-FIX-UPSTREAM [email protected] - don't install binary into /usr/share/cmake/fcitx +Patch1: fcitx-4.2.8-arch-dependent-file-in-usr-share.patch BuildRequires: cairo-devel %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -79,6 +74,7 @@ BuildRequires: gcc-c++ BuildRequires: libicu-devel BuildRequires: libxml2-devel +BuildRequires: xz Requires: %{name}-gtk2 = %{version}-%{release} Requires: lib%{name}%{libver} = %{version}-%{release} %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} @@ -101,9 +97,9 @@ %if 0%{?fedora_version} Requires: %{name}-pinyin = %{version}-%{release} Requires: %{name}-table = %{version}-%{release} -Requires: opencc -Requires: libpresage1 Requires: enchant +Requires: libpresage1 +Requires: opencc Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives %endif @@ -371,14 +367,8 @@ %prep %setup -q -n %{name}-%{version} -%if 0%{?suse_version} <= 1220 +%patch -p1 %patch1 -p1 -%endif -%if 0%{?suse_version} <= 1210 -%patch2 -p1 -%patch3 -p1 -%endif -%patch4 -p1 %build mkdir build @@ -398,6 +388,7 @@ %endif %if 0%{?sles_version} -DENABLE_QT=Off \ + -DENABLE_QT_IM_MODULE=off \ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_INSTALL_DIR=%{_libdir} \ @@ -486,6 +477,9 @@ install -pm 644 -D %{SOURCE7} %{buildroot}%{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf %endif +# install rpm macros +install -D -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/rpm/macros.%{name} + # remove *.la %{__rm} -rf %{buildroot}%{_libdir}/lib%{name}-config.la @@ -583,9 +577,6 @@ %{_bindir}/%{name}-skin-installer %{_bindir}/%{name}-dbus-watcher %{_bindir}/%{name}-diagnose -%if 0%{?suse_version} >= 1220 -%{_bindir}/%{name}-qt-gui-wrapper -%endif %{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/icons/* @@ -605,9 +596,9 @@ # excludes %exclude %{_datadir}/%{name}/pinyin -%exclude %{_datadir}/%{name}/table -%exclude %{_datadir}/%{name}/imicon -%exclude %{_datadir}/%{name}/inputmethod +%exclude %{_datadir}/%{name}/table/* +%exclude %{_datadir}/%{name}/imicon/* +%exclude %{_datadir}/%{name}/inputmethod/* %exclude %{_datadir}/%{name}/addon/%{name}-pinyin.conf %exclude %{_datadir}/%{name}/addon/%{name}-table.conf %exclude %{_datadir}/%{name}/addon/%{name}-qw.conf @@ -616,6 +607,9 @@ %exclude %{_libdir}/%{name}/fcitx-pinyin.so %exclude %{_libdir}/%{name}/fcitx-table.so %exclude %{_libdir}/%{name}/fcitx-qw.so +%exclude %{_libdir}/%{name}/libexec/comp-spell-dict +%exclude %{_libdir}/%{name}/libexec/fcitx-po-parser +%exclude %{_libdir}/%{name}/libexec/fcitx-scanner %if 0%{?suse_version} %exclude %{_datadir}/%{name}/skin/openSUSE-default %endif @@ -645,15 +639,12 @@ %files quwei %defattr(-,root,root) -%dir %{_datadir}/%{name}/inputmethod %{_libdir}/%{name}/%{name}-qw.so %{_datadir}/%{name}/inputmethod/qw.conf %{_datadir}/%{name}/addon/%{name}-qw.conf %files pinyin %defattr(-,root,root) -%dir %{_datadir}/%{name}/imicon -%dir %{_datadir}/%{name}/inputmethod %{_libdir}/%{name}/%{name}-pinyin.so %{_datadir}/%{name}/pinyin/ %{_datadir}/%{name}/inputmethod/pinyin.conf @@ -665,14 +656,12 @@ %files table %defattr(-,root,root) -%dir %{_datadir}/%{name}/table/ %{_libdir}/%{name}/%{name}-table.so %{_datadir}/%{name}/addon/%{name}-table.conf %{_datadir}/%{name}/configdesc/table.desc %files table-cn-cangjie %defattr(-,root,root) -%dir %{_datadir}/%{name}/imicon %{_datadir}/%{name}/table/cangjie.* %{_datadir}/%{name}/imicon/cangjie.png @@ -682,7 +671,6 @@ %files table-cn-erbi %defattr(-,root,root) -%dir %{_datadir}/%{name}/imicon %{_datadir}/%{name}/table/erbi.* %{_datadir}/%{name}/imicon/erbi.png @@ -696,19 +684,16 @@ %files table-cn-wubi-pinyin %defattr(-,root,root) -%dir %{_datadir}/%{name}/imicon %{_datadir}/%{name}/table/wbpy.* %{_datadir}/%{name}/imicon/wbpy.png %files table-cn-wubi %defattr(-,root,root) -%dir %{_datadir}/%{name}/imicon %{_datadir}/%{name}/table/wbx.* %{_datadir}/%{name}/imicon/wubi.png %files table-cn-ziran %defattr(-,root,root) -%dir %{_datadir}/%{name}/imicon %{_datadir}/%{name}/table/zrm.* %{_datadir}/%{name}/imicon/ziranma.png @@ -750,10 +735,12 @@ %files devel %defattr(-,root,root) +%config %{_sysconfdir}/rpm/macros.%{name} %{_includedir}/* %{_bindir}/%{name}4-config -%{_bindir}/%{name}-po-parser -%{_bindir}/%{name}-scanner +%{_libdir}/%{name}/libexec/comp-spell-dict +%{_libdir}/%{name}/libexec/fcitx-po-parser +%{_libdir}/%{name}/libexec/fcitx-scanner %{_libdir}/pkgconfig/*.pc %{_datadir}/cmake/ %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.ruqp5l/_old 2013-07-08 15:08:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ruqp5l/_new 2013-07-08 15:08:19.000000000 +0200 @@ -1,11 +1,11 @@ -libfcitx-4_2_7 +libfcitx-4_2_8 requires "fcitx = <version>" obsoletes "libfcitx-<targettype> < <version>" provides "libfcitx-<targettype> = <version>" post "/sbin/ldconfig" postun "/sbin/ldconfig" fcitx-gtk2 - requires "libfcitx-4_2_7-<targettype> = <version>" + requires "libfcitx-4_2_8-<targettype> = <version>" post "%if "%_lib" == "lib64"" post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" post "%else" @@ -17,7 +17,7 @@ postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" postun "%endif" fcitx-gtk3 - requires "libfcitx-4_2_7-<targettype> = <version>" + requires "libfcitx-4_2_8-<targettype> = <version>" post "%if "%_lib" == "lib64"" post "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" post "%else" @@ -29,4 +29,4 @@ postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" fcitx-qt4 - requires "libfcitx-4_2_7-<targettype> = <version>" \ No newline at end of file + requires "libfcitx-4_2_8-<targettype> = <version>" ++++++ fcitx-4.2.8-arch-dependent-file-in-usr-share.patch ++++++ Index: fcitx-4.2.8/cmake/FcitxMacro.cmake =================================================================== --- fcitx-4.2.8.orig/cmake/FcitxMacro.cmake +++ fcitx-4.2.8/cmake/FcitxMacro.cmake @@ -184,10 +184,10 @@ function(__fcitx_cmake_init) CACHE INTERNAL "include dir" FORCE) else() set(FCITX_SCANNER_EXECUTABLE - "${FCITX_MACRO_CMAKE_DIR}/fcitx-scanner" + "${FCITX4_ADDON_INSTALL_DIR}/libexec/fcitx-scanner" CACHE INTERNAL "fcitx-scanner" FORCE) set(FCITX_PO_PARSER_EXECUTABLE - "${FCITX_MACRO_CMAKE_DIR}/fcitx-po-parser" + "${FCITX4_ADDON_INSTALL_DIR}/libexec/fcitx-po-parser" CACHE INTERNAL "fcitx-po-parser" FORCE) execute_process(COMMAND env ${FCITX_PO_PARSER_EXECUTABLE} --gettext-support RESULT_VARIABLE result) Index: fcitx-4.2.8/src/module/spell/dict/CMakeLists.txt =================================================================== --- fcitx-4.2.8.orig/src/module/spell/dict/CMakeLists.txt +++ fcitx-4.2.8/src/module/spell/dict/CMakeLists.txt @@ -5,7 +5,7 @@ set(DICT_COMP_SRC add_executable(comp-spell-dict ${DICT_COMP_SRC}) target_link_libraries(comp-spell-dict fcitx-utils) install(TARGETS comp-spell-dict - DESTINATION "${prefix}/share/cmake/fcitx/") + DESTINATION "${addondir}/libexec") set(SPELL_EN_DICT_VER 20121020) set(SPELL_EN_DICT "${CMAKE_CURRENT_BINARY_DIR}/en_dict.fscd") @@ -27,4 +27,4 @@ add_custom_command( COMMAND "${COMP_SPELL_DICT}" --comp-dict "${SPELL_EN_DICT_SRC}" "${SPELL_EN_DICT}") add_custom_target(spell_en_dict ALL DEPENDS "${SPELL_EN_DICT}") -install(FILES "${SPELL_EN_DICT}" DESTINATION "${pkgdatadir}/spell") \ No newline at end of file +install(FILES "${SPELL_EN_DICT}" DESTINATION "${pkgdatadir}/spell") Index: fcitx-4.2.8/tools/dev/CMakeLists.txt =================================================================== --- fcitx-4.2.8.orig/tools/dev/CMakeLists.txt +++ fcitx-4.2.8/tools/dev/CMakeLists.txt @@ -20,4 +20,4 @@ if(NOT _FCITX_DISABLE_GETTEXT) endif() install(TARGETS fcitx-scanner fcitx-po-parser - DESTINATION "${prefix}/share/cmake/fcitx/") + DESTINATION "${addondir}/libexec") ++++++ fcitx-4.2.8-freedesktop-notify.c-DBUS_TIMEOUT_USE_DEFAULT.patch ++++++ Index: fcitx-4.2.8/src/module/freedesktop-notify/freedesktop-notify.c =================================================================== --- fcitx-4.2.8.orig/src/module/freedesktop-notify/freedesktop-notify.c +++ fcitx-4.2.8/src/module/freedesktop-notify/freedesktop-notify.c @@ -50,6 +50,10 @@ NOTIFICATIONS_MATCH_SIGNAL "," \ "member='NotificationClosed'" +#ifndef DBUS_TIMEOUT_USE_DEFAULT +# define DBUS_TIMEOUT_USE_DEFAULT (-1) +#endif + static void *FcitxNotifyCreate(FcitxInstance *instance); static void FcitxNotifyDestroy(void *arg); ++++++ macros.fcitx ++++++ # RPM macros for fcitx %_fcitx_includedir %{_includedir}/fcitx %_fcitx_moduleincdir %{_fcitx_includedir}/module %_fcitx_libdir %{_libdir}/fcitx %_fcitx_libexecdir %{_fcitx_libdir}/libexec %_fcitx_datadir %{_datadir}/fcitx %_fcitx_addondir %{_fcitx_datadir}/addon %_fcitx_descdir %{_fcitx_datadir}/configdesc %_fcitx_imicondir %{_fcitx_datadir}/imicon %_fcitx_inputmethoddir %{_fcitx_datadir}/inputmethod %_fcitx_skindir %{_fcitx_datadir}/skin %_fcitx_autostartdir %{_sysconfdir}/X11/xim.d %_fcitx_tabledir %{_fcitx_datadir}/table %fcitx_requires \ Requires: fcitx %fcitx_table_requires \ Requires: fcitx-table ++++++ xim.d-fcitx ++++++ --- /var/tmp/diff_new_pack.ruqp5l/_old 2013-07-08 15:08:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ruqp5l/_new 2013-07-08 15:08:19.000000000 +0200 @@ -13,6 +13,7 @@ # So you can use either zh_CN.UTF-8 or zh_CN.GB2312 export XMODIFIERS="@im=fcitx" export GTK_IM_MODULE=fcitx +export GTK3_IM_MODULE=fcitx export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=fcitx fcitx -d ++++++ xim.fcitx.suse.template ++++++ --- /var/tmp/diff_new_pack.ruqp5l/_old 2013-07-08 15:08:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ruqp5l/_new 2013-07-08 15:08:19.000000000 +0200 @@ -19,5 +19,7 @@ export XMODIFIERS="@im=fcitx" export GTK_IM_MODULE=fcitx +export GTK3_IM_MODULE=fcitx +export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=fcitx -fcitx -d \ No newline at end of file +fcitx -d ++++++ xinput-fcitx ++++++ --- /var/tmp/diff_new_pack.ruqp5l/_old 2013-07-08 15:08:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ruqp5l/_new 2013-07-08 15:08:19.000000000 +0200 @@ -5,6 +5,7 @@ PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool SHORT_DESC="FCITX" GTK_IM_MODULE=fcitx +GTK3_IM_MODULE=fcitx if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx.so || \ test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
