Hello community, here is the log from the commit of package scim for openSUSE:Factory checked in at Wed Oct 12 16:15:28 CEST 2011.
-------- --- openSUSE:Factory/scim/scim.changes 2011-09-23 12:45:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/scim/scim.changes 2011-10-11 18:29:23.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 10 22:19:19 CEST 2011 - [email protected] + +- Updated to scim-1.4.11: fix for multiple monitors, updated + translations +- Fix registration for FireFox (bnc#723337) +- Clean up spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bugzilla-248159-scim-launcher-segfault.patch scim-1.4.7.tar.bz2 scim-gcc4.4-fixes.diff scim.patch New: ---- scim-1.4.11.tar.gz scim-gtk2-register-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim.spec ++++++ --- /var/tmp/diff_new_pack.StP8d6/_old 2011-10-12 16:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.StP8d6/_new 2011-10-12 16:15:23.000000000 +0200 @@ -19,38 +19,27 @@ Name: scim -BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ graphviz gtk2-devel intltool libgnomeui-devel libxslt perl-XML-Parser update-desktop-files +BuildRequires: docbook-xsl-stylesheets gcc-c++ gtk2-devel intltool libgnomeui-devel perl-XML-Parser update-desktop-files +BuildRequires: doxygen graphviz graphviz-gd libxslt # for older distros BuildRequires: libexpat-devel Summary: Smart Chinese/Common Input Method platform -Version: 1.4.7 +Version: 1.4.11 Release: 183 License: LGPLv2.1+ Group: System/I18n/Chinese -AutoReqProv: on -# bug437293 -%ifarch ppc64 -Obsoletes: scim-64bit -%endif -# PreReq: /usr/bin/touch Obsoletes: scim-frontend-x11, scim-server-rawcode, scim-config-simple, scim-server-table, scim-gtk2-immodule, scim-config-socket, scim-server-socket, scim-config-gconf, scim-frontend-socket Provides: locale(ja;ko;zh) Provides: scim-frontend-x11, scim-server-rawcode, scim-config-simple, scim-server-table, scim-gtk2-immodule, scim-config-socket, scim-server-socket, scim-frontend-socket Url: http://www.scim-im.org/ -# CVS repository: -# cvs -d:pserver:[email protected]:/cvsroot/scim login -# cvs -z3 -d:pserver:[email protected]:/cvsroot/scim co scim -# Source0: http://freedesktop.org/~suzhe/sources/scim-0.99.7.tar.bz2 -Source0: scim-1.4.7.tar.bz2 +Source0: scim-%{version}.tar.gz Source1: baselibs.conf Source10: etc-x11-xim.d-scim Source11: SuSEconfig.scim -Patch0: scim.patch Patch1: configs.patch -Patch248159: bugzilla-248159-scim-launcher-segfault.patch -Patch2: scim-gcc4.4-fixes.diff Patch3: scim-no-setpwent.diff +Patch4: scim-gtk2-register-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %gtk2_immodule_requires @@ -74,11 +63,6 @@ Requires: pkgconfig >= 0.12 Requires: gtk2-devel Requires: libexpat-devel -# bug437293 -%ifarch ppc64 -Obsoletes: scim-devel-64bit -%endif -# %description devel This package contains all necessary include files and libraries needed @@ -103,13 +87,11 @@ %define build_panel_gtk 1 %define build_gtk_utils 1 %setup -q -n %{name}-%{version} -#%patch0 -p1 %patch1 -p1 -%patch248159 -p1 -%patch2 -p1 %if %suse_version > 1110 %patch3 -p1 %endif +%patch4 -p1 find . -type f | xargs chmod u+w UTF_8_LOCALES=$(locale -a | grep utf8 | perl -p -e "s/utf8/UTF-8/; s/\n/,/; " | perl -p -e "s/,$//") perl -pi -e "s/\/SupportedUnicodeLocales =.*/\/SupportedUnicodeLocales = $UTF_8_LOCALES/" ./configs/global @@ -165,17 +147,20 @@ make top_builddir=$(pwd) # build documentation: make -C docs html -make -C docs/manual/zh_CN html +# manual is missing in 1.4.11 +## make -C docs/manual/zh_CN html %install make DESTDIR=${RPM_BUILD_ROOT} top_builddir=$(pwd) install mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI} +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.*a rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.*a rm -f ${RPM_BUILD_ROOT}/%{gnome_prefix}/%_lib/gtk-2.0/immodules/im-scim.*a # install user manual -mkdir -p docs/dist/manual/zh_CN/figures/ -cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ -cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ +# mkdir -p docs/dist/manual/zh_CN/figures/ +# cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ +# cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ +# install configuration files mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim \ $RPM_BUILD_ROOT/etc/X11/xim.d/scim @@ -217,89 +202,20 @@ %files -f scim.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog TODO -%doc docs/dist/manual/zh_CN +# %doc docs/dist/manual/zh_CN /sbin/conf.d/SuSEconfig.scim %dir /etc/X11/xim.d/ /etc/X11/xim.d/* %dir %{_sysconfdir}/scim -%dir %{_libdir}/scim-1.0 -%dir %{_libdir}/scim-1.0/1.4.0 -%dir %{_libdir}/scim-1.0/*/Filter -%dir %{_libdir}/scim-1.0/*/FrontEnd -%dir %{_libdir}/scim-1.0/*/IMEngine -%dir %{_libdir}/scim-1.0/*/Config -%dir %{_libdir}/scim-1.0/*/SetupUI -%dir %{_libdir}/scim-1.0/*/Helper -%dir %{_libdir}/scim-1.0/Config -%dir %{_libdir}/scim-1.0/FrontEnd -%dir %{_libdir}/scim-1.0/IMEngine -%dir %{_libdir}/scim-1.0/SetupUI -%dir %{_datadir}/scim -%dir %{_datadir}/scim/icons -%config %{_sysconfdir}/scim/global -%{_bindir}/scim -%{_bindir}/scim-config-agent -%{_libdir}/libscim*.so.* -%{_libdir}/scim-1.0/scim-launcher -%{_libdir}/scim-1.0/scim-helper-launcher -%{_libdir}/scim-1.0/scim-helper-manager -%{_datadir}/scim/icons/keyboard.png -%{_datadir}/scim/icons/up.png -%{_datadir}/scim/icons/down.png -%{_datadir}/scim/icons/left.png -%{_datadir}/scim/icons/right.png -%{_datadir}/scim/icons/full-letter.png -%{_datadir}/scim/icons/half-letter.png -%{_datadir}/scim/icons/full-punct.png -%{_datadir}/scim/icons/half-punct.png -%{_datadir}/scim/icons/help.png -%{_datadir}/scim/icons/menu.png -%{_datadir}/scim/icons/pin-up.png -%{_datadir}/scim/icons/pin-down.png -%{_datadir}/scim/icons/setup.png -%{_datadir}/scim/icons/trademark.png -%{_datadir}/scim/icons/sctc-tc-to-sc.png -%{_datadir}/scim/icons/sctc-sc-to-tc.png -%{_datadir}/scim/icons/sctc.png -%{_libdir}/scim-1.0/*/Filter/sctc.so -%{_libdir}/scim-1.0/*/Helper/setup.so +%config %{_sysconfdir}/scim/* +%{_libdir}/lib*.so.* +%{_libdir}/scim-1.0 +%{_datadir}/scim +%{_datadir}/pixmaps/* +%{_bindir}/* %if %{build_scim_setup} -%{_bindir}/scim-setup %{_datadir}/applications/scim-setup.desktop %{_datadir}/control-center-2.0 -%dir %{_datadir}/control-center-2.0/capplets/ -%{_datadir}/control-center-2.0/capplets/scim-setup.desktop -%{_datadir}/pixmaps/scim-setup.png -%endif -%if %{build_panel_gtk} -%{_libdir}/scim-1.0/scim-panel-gtk -%if %{build_scim_setup} -%{_libdir}/scim-1.0/*/SetupUI/panel-gtk-setup.so -%endif -%endif -%if %{build_frontend_x11} -%{_libdir}/scim-1.0/*/FrontEnd/x11.so -%endif -%if %{build_scim_setup} -%{_libdir}/scim-1.0/*/SetupUI/aaa-frontend-setup.so -%{_libdir}/scim-1.0/*/SetupUI/aaa-imengine-setup.so -%endif -%if %{build_imengine_rawcode} -%{_libdir}/scim-1.0/*/IMEngine/rawcode.so -%{_datadir}/scim/icons/rawcode.png -%endif -%if %{build_config_simple} -%config %{_sysconfdir}/scim/config -%{_libdir}/scim-1.0/*/Config/simple.so -%endif -%if %{build_imengine_socket} -%{_libdir}/scim-1.0/*/IMEngine/socket.so -%endif -%if %{build_frontend_socket} -%{_libdir}/scim-1.0/*/FrontEnd/socket.so -%endif -%if %{build_config_socket} -%{_libdir}/scim-1.0/*/Config/socket.so %endif %if %{build_gtk2_immodule} %dir %{gnome_prefix}/%_lib/gtk-2.0/immodules @@ -311,7 +227,6 @@ %doc docs/html %doc docs/developers %{_libdir}/libscim*.so -%{_libdir}/lib*.*a %{_libdir}/pkgconfig/*.pc %{_includedir}/scim-1.0 ++++++ configs.patch ++++++ --- /var/tmp/diff_new_pack.StP8d6/_old 2011-10-12 16:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.StP8d6/_new 2011-10-12 16:15:23.000000000 +0200 @@ -1,6 +1,9 @@ -diff -ru scim-1.4.6.orig/configs/config scim-1.4.6/configs/config ---- scim-1.4.6.orig/configs/config 2007-04-23 19:22:17.000000000 +0200 -+++ scim-1.4.6/configs/config 2007-04-23 19:43:11.000000000 +0200 +--- + configs/config | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/configs/config ++++ b/configs/config @@ -1,5 +1,6 @@ # This file is encoded in UTF-8 encoding. /FrontEnd/OnTheSpot = true @@ -12,8 +15,8 @@ /Hotkeys/FrontEnd/NextFactory = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R /Hotkeys/FrontEnd/PreviousFactory = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R /Hotkeys/FrontEnd/ShowFactoryMenu = Control+Alt+Right --/Hotkeys/FrontEnd/Trigger = Control+space +-/Hotkeys/FrontEnd/Trigger = Control+space,Zenkaku_Hankaku,Hangul +/Hotkeys/FrontEnd/Trigger = Control+space,Shift+space,Zenkaku_Hankaku,Hangul - /Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+QuirkKanaRo + /Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+Meta+QuirkKanaRo /Panel/Gtk/Color/ActiveBackground = light sky blue /Panel/Gtk/Color/ActiveText = black ++++++ scim-gtk2-register-fix.diff ++++++ --- extras/gtk2_immodule/gtkimcontextscim.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/extras/gtk2_immodule/gtkimcontextscim.cpp +++ b/extras/gtk2_immodule/gtkimcontextscim.cpp @@ -450,13 +450,15 @@ SCIM_DEBUG_FRONTEND(1) << "gtk_im_context_scim_register_type...\n"; - if (!_gtk_type_im_context_scim) { - _gtk_type_im_context_scim = + if (1 /*!_gtk_type_im_context_scim*/) { + GType type = g_type_module_register_type (type_module, GTK_TYPE_IM_CONTEXT, "GtkIMContextSCIM", &im_context_scim_info, (GTypeFlags) 0); + if (type) + _gtk_type_im_context_scim = type; } } ++++++ scim-no-setpwent.diff ++++++ --- /var/tmp/diff_new_pack.StP8d6/_old 2011-10-12 16:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.StP8d6/_new 2011-10-12 16:15:23.000000000 +0200 @@ -10,9 +10,9 @@ --- a/src/scim_utility.cpp +++ b/src/scim_utility.cpp -@@ -547,9 +547,9 @@ - - struct passwd *pw; +@@ -552,9 +552,9 @@ + return String (home_dir); + } - setpwent (); + // setpwent (); @@ -22,9 +22,9 @@ if (pw) { home_dir = pw->pw_dir; -@@ -568,9 +568,9 @@ - struct passwd *pw; - const char *user_name; +@@ -578,9 +578,9 @@ + return String (user_name); + } - setpwent (); + // setpwent (); continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
