Hello community, here is the log from the commit of package scim for openSUSE:Factory checked in at 2015-03-25 21:05:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-11-24 11:08:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim.new/scim.changes 2015-03-25 21:32:52.000000000 +0100 @@ -1,0 +2,16 @@ +Sun Mar 22 14:49:13 UTC 2015 - [email protected] + +- Update to version 1.4.15 + * ChangeLog has not been updated for this release +- Update home project and download Url +- No hard dependencies for devel subpackage; let pkgconfig handles + this +- Add pkgconfig build require +- Add autoconf build require; as the tarball is generated from git, + the configure script has to be created at first +- Remove sle-11-gtk-widget-get-visible.patch; upstreamed +- Split out translation files +- Add scim-fix-no-return-in-non-void.patch +- Add scim-disable-subdir-objects.patch + +------------------------------------------------------------------- Old: ---- scim-1.4.14.tar.gz sle-11-gtk-widget-get-visible.patch New: ---- scim-1.4.15.tar.gz scim-disable-subdir-objects.patch scim-fix-no-return-in-non-void.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim.spec ++++++ --- /var/tmp/diff_new_pack.sEnDma/_old 2015-03-25 21:32:53.000000000 +0100 +++ /var/tmp/diff_new_pack.sEnDma/_new 2015-03-25 21:32:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scim # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,15 +17,16 @@ Name: scim +BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: fdupes +BuildRequires: fontconfig BuildRequires: gcc-c++ BuildRequires: graphviz BuildRequires: graphviz-gd BuildRequires: intltool # for older distros -BuildRequires: gtk2-devel BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel %if 0%{?suse_version} >= 1310 @@ -35,25 +36,28 @@ BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Parser +BuildRequires: pkgconfig BuildRequires: update-desktop-files %if 0%{?suse_version} > 1130 BuildRequires: gtk3-devel %endif -Version: 1.4.14 +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: http://www.scim-im.org/ -Source0: scim-%{version}.tar.gz +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 -#FIX-FOR-UPSTREAM fix an upstream typo error in panel/*.cpp -Patch4: sle-11-gtk-widget-get-visible.patch +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} @@ -87,10 +91,6 @@ Summary: Include Files and Libraries mandatory for Development Group: System/I18n/Chinese Requires: %{name} = %{version} -Requires: gtk2-devel -Requires: libexpat-devel -Requires: libstdc++-devel -Requires: pkgconfig >= 0.12 %description devel This package contains all necessary include files and libraries needed @@ -130,6 +130,8 @@ %description qt4 This package contains SCIM im module for qt4 +%lang_package + %prep %define build_config_socket 1 %define build_config_simple 1 @@ -142,12 +144,12 @@ %define build_scim_setup 1 %define build_panel_gtk 1 %define build_gtk_utils 1 -%setup -q +%setup -q -n %{name}-%{name}-%{version} %patch1 -p1 %if 0%{?suse_version} > 1110 %patch2 -p1 %endif -# %patch3 -p1 +%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/,$//") @@ -169,6 +171,7 @@ libtoolize --force autoreconf --force --install --verbose %endif +./bootstrap if [ ! -f po/Makevars -a -f po/Makevars.template ] ; then cp po/Makevars.template po/Makevars @@ -176,9 +179,9 @@ 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" +#export CFLAGS="%{optflags} -fno-strict-aliasing" # so configure detects gettext with gcc-4.7 -export CXXFLAGS="-fpermissive" +#export CXXFLAGS="%{optflags} -fpermissive" %configure\ --libexecdir=%{_prefix}/lib/scim-1.0\ %if 0%{?suse_version} > 1130 @@ -291,7 +294,7 @@ %gtk3_immodule_postun %endif -%files -f scim.lang +%files %defattr(-, root, root) %doc AUTHORS COPYING README ChangeLog TODO # %doc docs/dist/manual/zh_CN @@ -333,4 +336,7 @@ %{_libdir}/pkgconfig/*.pc %{_includedir}/scim-1.0 +%files lang -f %{name}.lang +%defattr(-, root, root) + %changelog ++++++ scim-1.4.14.tar.gz -> scim-1.4.15.tar.gz ++++++ ++++ 95791 lines of diff (skipped) ++++++ scim-disable-subdir-objects.patch ++++++ >From 88fbabed7dc236642021f8263f1b25bf67c6806e Mon Sep 17 00:00:00 2001 From: Tz-Huan Huang <[email protected]> Date: Fri, 24 Oct 2014 13:12:32 +0800 Subject: [PATCH] Disable subdir-objects --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3d89eb1..f3901ba 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain]) ########################################################### # Init automake stuff -AM_INIT_AUTOMAKE([subdir-objects]) +AM_INIT_AUTOMAKE([]) AM_CONFIG_HEADER([config.h]) # Init libtool ++++++ scim-fix-no-return-in-non-void.patch ++++++ --- 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; } + + return 0; + } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
