Hello community, here is the log from the commit of package scim for openSUSE:Factory checked in at 2015-09-19 06:54:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim (Old) and /work/SRC/openSUSE:Factory/.scim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim" Changes: -------- --- /work/SRC/openSUSE:Factory/scim/scim.changes 2015-03-25 21:32:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim.new/scim.changes 2015-09-19 06:54:45.000000000 +0200 @@ -1,0 +2,31 @@ +Thu Sep 10 16:02:05 UTC 2015 - i...@marguerite.su + +- Update to version 1.4.15+git20150804.187a1fd: + * drop and ignore dotfiles + * drop some empty files + * disable subdir-objects + * add manpages taken from debian + * IMdkit: Track window property offsets correctly + * disable setpwent. patch from openSUSE + * add sharedmethod support + * use reference-to-const for copy constructor to pass c++11 + * fix SCIM_DEBUG_AllMask to be unsigned +- refactored xim.d-scim + * skim is not available, no need to conditional check any more + * it should not be scim to set path for kde3 + * this is shipped w/ scim, no need to check existence +- baselibs.conf: no more scim-qt3 +- drop patch: scim-disable-subdir-objects.patch, upstreamed +- drop patch: scim-no-setpwent.diff, upstreamed +- fix post/postun scripts +- remove unneeded conditionals which will be always built like + gtk2/qt4-immodule, simple config and x11 frontend +- remove unneeded gnome_prefix macro +- remove unneeded provides/obsoletes, those packages are not in + either SLE or openSUSE now. +- remove SLE_10 hacks +- add patch: G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch + * define G_GNUC_BEGIN_IGNORE_DEPRECATIONS is undefined +- add macros.scim + +------------------------------------------------------------------- Old: ---- etc-x11-xim.d-scim scim-1.4.15.tar.gz scim-disable-subdir-objects.patch scim-no-setpwent.diff New: ---- G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch _service macros.scim scim-1.4.15+git20150804.187a1fd.tar.xz xim.d-scim ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim.spec ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:46.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,71 +17,44 @@ Name: scim -BuildRequires: autoconf +Version: 1.4.15+git20150804.187a1fd +Release: 0 +Summary: Smart Chinese/Common Input Method platform +License: LGPL-2.1+ +Group: System/I18n/Chinese +Url: https://github.com/scim-im/scim +Source: %{name}-%{version}.tar.xz +Source1: xim.d-scim +Source2: scim.config +Source3: macros.scim +Source99: baselibs.conf +Patch1: configs.patch +Patch2: scim-fix-no-return-in-non-void.patch +Patch3: G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: fontconfig BuildRequires: gcc-c++ -BuildRequires: graphviz -BuildRequires: graphviz-gd +BuildRequires: gtk2-devel BuildRequires: intltool -# for older distros -BuildRequires: libexpat-devel -BuildRequires: libgnomeui-devel -%if 0%{?suse_version} >= 1310 -BuildRequires: libpng-tools -%endif BuildRequires: libqt4-devel BuildRequires: libtool -BuildRequires: libxslt -BuildRequires: perl-XML-Parser -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: update-desktop-files +BuildRequires: x11-tools +BuildRequires: xz +# not SLE_12 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 +BuildRequires: libpng-tools +%endif %if 0%{?suse_version} > 1130 BuildRequires: gtk3-devel +Requires: scim-gtk3 = %{version} %endif -BuildRequires: gtk2-devel -Version: 1.4.15 -Release: 0 -Summary: Smart Chinese/Common Input Method platform -License: LGPL-2.1+ -Group: System/I18n/Chinese -Url: https://github.com/scim-im/scim -Source0: https://github.com/scim-im/scim/archive/%{name}-%{version}.tar.gz -Source1: baselibs.conf -Source10: etc-x11-xim.d-scim -Source11: scim.config -Patch1: configs.patch -Patch2: scim-no-setpwent.diff -Patch3: scim-fix-no-return-in-non-void.patch -Patch4: scim-disable-subdir-objects.patch -Requires(pre): /usr/bin/touch -Recommends: %{name}-lang -Obsoletes: scim-config-gconf < %{version}-%{release} -Obsoletes: scim-config-simple < %{version}-%{release} -Obsoletes: scim-config-socket < %{version}-%{release} -Obsoletes: scim-frontend-socket < %{version}-%{release} -Obsoletes: scim-frontend-x11 < %{version}-%{release} -Obsoletes: scim-gtk2-immodule < %{version}-%{release} -Obsoletes: scim-server-rawcode < %{version}-%{release} -Obsoletes: scim-server-socket < %{version}-%{release} -Obsoletes: scim-server-table < %{version}-%{release} -Provides: scim-config-gconf -Provides: scim-config-simple -Provides: scim-config-socket -Provides: scim-frontend-socket -Provides: scim-frontend-x11 -Provides: scim-gtk2-immodule -Provides: scim-server-rawcode -Provides: scim-server-socket -Provides: scim-server-table +Requires: scim-gtk = %{version} +Requires: scim-qt4 = %{version} +Recommends: scim-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gtk2_immodule_requires -%if 0%{?suse_version} > 1130 -%gtk3_immodule_requires -%endif -%define gnome_prefix %(pkg-config --variable=prefix libgnomeui-2.0) %description SCIM is a developing platform to significantly reduce the difficulty of @@ -89,7 +62,7 @@ %package devel Summary: Include Files and Libraries mandatory for Development -Group: System/I18n/Chinese +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel @@ -100,21 +73,24 @@ Summary: SCIM im module for gtk2 Group: System/I18n/Chinese Requires: %{name} = %{version} -%gtk2_immodule_requires Supplements: packageand(scim:gtk2) +%if 0%{?sles_version} && 0%{?suse_version} != 1315 +Requires(post): gtk2 +Requires(postun): gtk2 +%else +%{gtk2_immodule_requires} +%endif %description gtk This package contains SCIM im module for gtk2 %if 0%{?suse_version} > 1130 %package gtk3 - Summary: SCIM im module for gtk3 Group: System/I18n/Chinese Requires: %{name} = %{version} -BuildRequires: gtk3-devel -%gtk3_immodule_requires Supplements: packageand(scim:gtk3) +%{gtk3_immodule_requires} %description gtk3 This package contains SCIM im module for gtk3 @@ -124,7 +100,6 @@ Summary: SCIM im module for qt4 Group: System/I18n/Chinese Requires: %{name} = %{version} -BuildRequires: libqt4-devel Supplements: packageand(scim:libqt4) %description qt4 @@ -133,117 +108,47 @@ %lang_package %prep -%define build_config_socket 1 -%define build_config_simple 1 -%define build_frontend_x11 1 -%define build_frontend_socket 1 -%define build_imengine_rawcode 1 -%define build_imengine_table 1 -%define build_imengine_socket 1 -%define build_gtk2_immodule 1 -%define build_scim_setup 1 -%define build_panel_gtk 1 -%define build_gtk_utils 1 -%setup -q -n %{name}-%{name}-%{version} +%setup -q %patch1 -p1 -%if 0%{?suse_version} > 1110 %patch2 -p1 -%endif +%if 0%{?sles_version} && 0%{?suse_version} != 1315 %patch3 -p1 -%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 -# hack to build with older distros -%if 0%{?suse_version} < 1100 -sed -i -e'/supplements/d' $RPM_SOURCE_DIR/baselibs.conf %endif +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 # hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) -%if %suse_version < 1310 +%if 0%{?suse_version} < 1310 sed -i \ -e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \ -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \ - $RPM_SOURCE_DIR/baselibs.conf + %{_sourcedir}/baselibs.conf %endif %build -%if 0%{?suse_version} <= 1100 -libtoolize --force -autoreconf --force --install --verbose -%endif ./bootstrap - -if [ ! -f po/Makevars -a -f po/Makevars.template ] ; then - cp po/Makevars.template po/Makevars -fi -if [ ! -f po/Makevars -a -f /usr/share/gettext/po/Makevars.template ] ; then - cp /usr/share/gettext/po/Makevars.template po/Makevars -fi -#export CFLAGS="%{optflags} -fno-strict-aliasing" -# so configure detects gettext with gcc-4.7 -#export CXXFLAGS="%{optflags} -fpermissive" %configure\ - --libexecdir=%{_prefix}/lib/scim-1.0\ + --libexecdir=%{_libexecdir}/scim-1.0\ %if 0%{?suse_version} > 1130 --with-gtk3-im-module-dir=%{_libdir}/gtk-3.0/3.0.0/immodules\ --with-gtk-version=3\ %endif + --enable-gtk2-immodule\ + --enable-qt4-immodule\ --disable-static\ -%if ! %{build_config_socket} - --disable-config-socket\ -%endif -%if ! %{build_config_simple} - --disable-config-simple\ -%endif -%if ! %{build_frontend_x11} - --disable-frontend-x11\ -%endif -%if ! %{build_frontend_socket} - --disable-frontend-socket\ -%endif -%if ! %{build_imengine_rawcode} - --disable-im-rawcode\ -%endif -%if ! %{build_imengine_table} - --disable-im-table\ -%endif -%if ! %{build_imengine_socket} - --disable-im-socket\ -%endif -%if ! %{build_gtk2_immodule} - --disable-gtk2-immodule\ -%endif -%if ! %{build_scim_setup} - --disable-setup-ui\ -%endif --enable-debug\ - --enable-ld-version-script\ - --enable-gtk2-immodule\ - --enable-qt4-immodule -make top_builddir=$(pwd) + --enable-ld-version-script +make %{?_smp_mflags} top_builddir=$(pwd) # build documentation: -make -C docs html -# manual is missing in 1.4.11 -## make -C docs/manual/zh_CN html +make %{?_smp_mflags} -C docs html %install make DESTDIR=%{buildroot} top_builddir=$(pwd) install -mkdir -p %{buildroot}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI} -rm -f %{buildroot}/%{_libdir}/lib*.*a -rm -f %{buildroot}/%{_libdir}/scim-1.0/*/*/*.*a -rm -f %{buildroot}/%{_libdir}/gtk-2.0/2.10.0/immodules/im-scim.la -rm -f %{buildroot}/%{_libdir}/qt4/plugins/inputmethods/im-scim.la -%if 0%{?suse_version} > 1130 -rm -f %{buildroot}/%{_libdir}/gtk-3.0/3.0.0/immodules/*.la -%endif -# 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/ +find %{buildroot} -type f -name "*.la" -delete -print + # install configuration files mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ -install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim \ - %{buildroot}%{_sysconfdir}/X11/xim.d/scim +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/scim + # install symlinks in /etc/X11/xim.d/$lang for all languages # where SCIM might be useful: PRIORITY=50 @@ -258,65 +163,123 @@ popd done popd -install -m 755 $RPM_SOURCE_DIR/scim.config \ - %{buildroot}/%{_datadir}/scim + +install -m 755 %{SOURCE2} %{buildroot}/%{_datadir}/scim %find_lang scim %suse_update_desktop_file scim-setup System SystemSetup -%if 0%{?suse_version} >= 1310 +# own _scim_tabledir +install -d %{buildroot}%{_datadir}/scim/tables + +# install macro.scim +mkdir -p %{buildroot}%{_sysconfdir}/rpm +install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/ + +# not SLE_12 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 %png_fix %{buildroot}/%{_datadir}/%{name}/icons/menu.png %endif + %fdupes %{buildroot} %post /sbin/ldconfig -%if %{build_gtk2_immodule} -%gtk2_immodule_post +# Update KeyboardLayout +%{_datadir}/scim/scim.config + +%postun -p /sbin/ldconfig + +%post gtk +/sbin/ldconfig +%if 0%{?sles_version} && 0%{?suse_version} != 1315 +%if "%{_lib}" == "lib64" + %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules +%else + %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules +%endif +%else +%{gtk2_immodule_post} %endif + +%postun gtk +/sbin/ldconfig +%if 0%{?sles_version} && 0%{?suse_version} != 1315 +if [ $1 -eq 0 ] ; then +%if "%{_lib}" == "lib64" + %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules +%else + %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules +%endif +fi +%else +%{gtk2_immodule_postun} +%endif + %if 0%{?suse_version} > 1130 +%post gtk3 #Add icons to gnome3 panel -TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js" +TARGET="%{_datadir}/gnome-shell/js/ui/statusIconDispatcher.js" if [ -f $TARGET ] && [ ! -f $TARGET-scim ] ; then mv $TARGET $TARGET-scim sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'scim-panel-gtk': 'input-method'," $TARGET-scim > $TARGET fi -%gtk3_immodule_post -%endif -# Update KeyboardLayout -%{_datadir}/scim/scim.config +%{gtk3_immodule_post} -%postun +%postun gtk3 /sbin/ldconfig -%if %{build_gtk2_immodule} -%gtk2_immodule_postun -%endif -%if 0%{?suse_version} > 1130 -%gtk3_immodule_postun +%{gtk3_immodule_postun} %endif %files %defattr(-, root, root) %doc AUTHORS COPYING README ChangeLog TODO -# %doc docs/dist/manual/zh_CN -%dir %{_sysconfdir}/X11/xim.d/ %config %{_sysconfdir}/X11/xim.d/* +%config %{_sysconfdir}/rpm/macros.scim %dir %{_sysconfdir}/scim -%config %{_sysconfdir}/scim/* -%{_libdir}/lib*.so.* -%{_libdir}/scim-1.0 +%config %{_sysconfdir}/scim/config +%config %{_sysconfdir}/scim/global +%{_bindir}/scim +%{_bindir}/scim-config-agent +%{_bindir}/scim-im-agent +%{_bindir}/scim-setup +%{_libdir}/scim-1.0/scim-helper-launcher +%{_libdir}/scim-1.0/scim-helper-manager +%{_libdir}/scim-1.0/scim-launcher +%{_libdir}/scim-1.0/scim-panel-gtk %{_datadir}/scim -%{_datadir}/pixmaps/* -%{_bindir}/* -%if %{build_scim_setup} +%dir %{_datadir}/scim/tables +%{_datadir}/pixmaps/scim-setup.png %{_datadir}/applications/scim-setup.desktop %{_datadir}/control-center-2.0 -%endif +%{_libdir}/libscim-1.0.so.8 +%{_libdir}/libscim-1.0.so.8.2.6 +%{_libdir}/libscim-gtkutils-1.0.so.8 +%{_libdir}/libscim-gtkutils-1.0.so.8.2.6 +%{_libdir}/libscim-x11utils-1.0.so.8 +%{_libdir}/libscim-x11utils-1.0.so.8.2.6 +%dir %{_libdir}/scim-1.0 +%dir %{_libdir}/scim-1.0/1.4.0 +%dir %{_libdir}/scim-1.0/1.4.0/Config +%dir %{_libdir}/scim-1.0/1.4.0/Filter +%dir %{_libdir}/scim-1.0/1.4.0/FrontEnd +%dir %{_libdir}/scim-1.0/1.4.0/Helper +%dir %{_libdir}/scim-1.0/1.4.0/IMEngine +%dir %{_libdir}/scim-1.0/1.4.0/SetupUI +%{_libdir}/scim-1.0/1.4.0/Config/simple.so +%{_libdir}/scim-1.0/1.4.0/Config/socket.so +%{_libdir}/scim-1.0/1.4.0/Filter/sctc.so +%{_libdir}/scim-1.0/1.4.0/FrontEnd/socket.so +%{_libdir}/scim-1.0/1.4.0/FrontEnd/x11.so +%{_libdir}/scim-1.0/1.4.0/Helper/setup.so +%{_libdir}/scim-1.0/1.4.0/IMEngine/rawcode.so +%{_libdir}/scim-1.0/1.4.0/IMEngine/socket.so +%{_libdir}/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.so +%{_libdir}/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.so +%{_libdir}/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.so %files gtk %defattr(-, root, root) -%dir %{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0 -%dir %{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0/immodules -%{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0/immodules/im-scim.so +%{_libdir}/gtk-2.0/2.10.0/immodules/im-scim.so %if 0%{?suse_version} > 1130 %files gtk3 @@ -326,14 +289,18 @@ %files qt4 %defattr(-, root, root) -%{_libdir}/qt4/plugins/ +%{_libdir}/qt4/plugins/inputmethods/im-scim.so %files devel %defattr(-, root, root) %doc docs/html %doc docs/developers -%{_libdir}/libscim*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libscim-1.0.so +%{_libdir}/libscim-gtkutils-1.0.so +%{_libdir}/libscim-x11utils-1.0.so +%{_libdir}/pkgconfig/scim.pc +%{_libdir}/pkgconfig/scim-gtkutils.pc +%{_libdir}/pkgconfig/scim-x11utils.pc %{_includedir}/scim-1.0 %files lang -f %{name}.lang ++++++ G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch ++++++ Index: scim-1.4.15+git20150804.187a1fd/src/scim_private.h =================================================================== --- scim-1.4.15+git20150804.187a1fd.orig/src/scim_private.h +++ scim-1.4.15+git20150804.187a1fd/src/scim_private.h @@ -46,6 +46,17 @@ #define bind_textdomain_codeset(domain,codeset) #endif +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#define G_GNUC_END_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic pop") +#else +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS +#define G_GNUC_END_IGNORE_DEPRECATIONS +#endif + #endif //__SCIM_PRIVATE_H /* ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/scim-im/scim</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">1.4.15+git%cd.%h</param> <param name="revision">master</param> </service> <service name="recompress" mode="disabled"> <param name="file">scim-*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"> <param name="basename">scim</param> </service> </services> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:47.000000000 +0200 @@ -22,6 +22,5 @@ postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" supplements "packageand(scim:gtk3-<targettype>)" -scim-qt3 scim-qt4 scim ++++++ configs.patch ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:47.000000000 +0200 @@ -1,16 +1,5 @@ ---- - 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 -+/FrontEnd/SharedInputMethod = true - /FrontEnd/ChangeFactoryGlobally = false - /FrontEnd/Socket/ConfigReadOnly = false - /FrontEnd/Socket/MaxClients = 512 @@ -10,7 +11,7 @@ /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 ++++++ macros.scim ++++++ %_scim_bindir %{_bindir} %_scim_sysconfdir %{_sysconfdir}/scim %_scim_binary_version %(pkg-config --variable=scim_binary_version scim) %_scim_libdir %{_libdir}/scim-1.0/%{_scim_binary_version} %_scim_enginedir %{_scim_libdir}/IMEngine %_scim_uidir %{_scim_libdir}/SetupUI %_scim_helperdir %{_scim_libdir}/Helper %_scim_frontenddir %{_scim_libdir}/FrontEnd %_scim_backenddir %{_scim_libdir}/Config %_scim_datadir %{_datadir}/scim %_scim_icondir %{_scim_datadir}/icons %_scim_tabledir %{_scim_datadir}/tables %scim_gtk2_immodule_requires \ %if 0%{?sles_version} && 0%{?suse_version} != 1315 \ Requires(post): gtk2 \ Requires(postun): gtk2 \ %else \ %{gtk2_immodule_requires} \ %endif %scim_gtk2_immodule_post \ %if 0%{?sles_version} && 0%{?suse_version} != 1315 \ %if "%{_lib}" == "lib64" \ %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules \ %else \ %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules \ %endif \ %else \ %{gtk2_immodule_post} \ %endif %scim_gtk2_immodule_postun \ %if 0%{?sles_version} && 0%{?suse_version} != 1315 \ if [ $1 -eq 0 ] ; then \ %if "%{_lib}" == "lib64" \ %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules \ %else \ %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules \ %endif \ fi \ %else \ %{gtk2_immodule_postun} \ %endif ++++++ scim-fix-no-return-in-non-void.patch ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:47.000000000 +0200 @@ -1,14 +1,12 @@ ---- a/extras/immodules/agent/scim-bridge-agent-client-listener.cpp 2014-10-23 11:14:53.000000000 +0200 -+++ b/extras/immodules/agent/scim-bridge-agent-client-listener.cpp 2015-03-22 16:31:35.937496486 +0100 -@@ -406,9 +406,12 @@ - } else { - - scim_bridge_perrorln ("Unknown message: %s", message_header); -- return RETVAL_FAILED; -+ return RETVAL_FAILED; +Index: scim-1.4.15+git20150804.187a1fd/extras/immodules/agent/scim-bridge-agent-client-listener.cpp +=================================================================== +--- scim-1.4.15+git20150804.187a1fd.orig/extras/immodules/agent/scim-bridge-agent-client-listener.cpp ++++ scim-1.4.15+git20150804.187a1fd/extras/immodules/agent/scim-bridge-agent-client-listener.cpp +@@ -409,6 +409,9 @@ retval_t ScimBridgeAgentClientListenerIm + return RETVAL_FAILED; } -+ ++ + return 0; + } ++++++ xim.d-scim ++++++ export LC_CTYPE=$LANG export XMODIFIERS="@im=SCIM" export GTK_IM_MODULE="scim" export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=scim scim -d # success: return 0
