Hello community,
here is the log from the commit of package kinput2
checked in at Tue Mar 11 18:31:13 CET 2008.
--------
--- kinput2/kinput2.changes 2007-03-05 18:33:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/kinput2/kinput2.changes 2008-03-10 12:24:14.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Mar 10 12:23:47 CET 2008 - mfabian@suse.de
+
+- bnc#368441: fix “local variable used before set” compiler
+ warning.
+
+-------------------------------------------------------------------
+Tue Mar 06 15:41:06 CET 2007 - mfabian@suse.de
+
+- make the package build for sles9.
+
+-------------------------------------------------------------------
New:
----
bugzilla-368441-local-variable-used-before-set.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kinput2.spec ++++++
--- /var/tmp/diff_new_pack.p21810/_old 2008-03-11 18:31:05.000000000 +0100
+++ /var/tmp/diff_new_pack.p21810/_new 2008-03-11 18:31:05.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kinput2 (Version v3.1)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,8 +10,14 @@
# norootforbuild
+
Name: kinput2
-BuildRequires: canna-devel fwnndev xorg-x11-devel
+BuildRequires: canna-devel fwnndev
+%if 0%{?sles_version} == 9
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: XFree86-devel XFree86-libs
+%endif
%if "%(xft-config --prefix)" == "/usr"
%define xprefix %{_prefix}
%define xbindir %{_bindir}
@@ -27,12 +33,12 @@
%define xincludes /usr/X11R6/include
%define xlibraries /usr/X11R6/%{_lib}
%endif
-License: BSD License and BSD-like
+License: Any permissive; X11/MIT
Group: System/I18n/Japanese
-Autoreqprov: on
+AutoReqProv: on
Provides: locale(xorg-x11:ja)
Version: v3.1
-Release: 376
+Release: 466
# URL:
Source0: ftp://ftp.sra.co.jp/pub/x11/kinput2/%{name}-v3.1.tar.bz2
Source10: etc-x11-xim.d-kinput2-canna
@@ -52,6 +58,7 @@
Patch12: %{name}-%{version}-prototypes.patch
Patch13: canna_c-warn.diff
Patch14: bugzilla-137396-cannot-work-after-specific-function-calls.patch
+Patch15: bugzilla-368441-local-variable-used-before-set.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Kanji Input Server for the X Window System
# Summary(ja): X用日本語入力サーバ
@@ -86,6 +93,7 @@
%patch12 -p1
%patch13
%patch14 -p1
+%patch15 -p1
head -n 21 cmd/kinput2.c > Copyright
%build
@@ -102,7 +110,6 @@
make CCOPTIONS="$RPM_OPT_FLAGS"
%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
make install DESTDIR=$RPM_BUILD_ROOT
make install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ja
@@ -119,7 +126,6 @@
popd
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
%files
%defattr(-, root, root)
@@ -134,81 +140,86 @@
%{xprefix}/lib/X11/ccdef/*
%changelog
-* Mon Mar 05 2007 - mfabian@suse.de
+* Mon Mar 10 2008 mfabian@suse.de
+- bnc#368441: fix “local variable used before set” compiler
+ warning.
+* Tue Mar 06 2007 mfabian@suse.de
+- make the package build for sles9.
+* Mon Mar 05 2007 mfabian@suse.de
- Bugzilla #137396: "LTC20105-kinput2 cannot work after specific
function calls ": fixed by patch received from Shoji SUGIYAMA
from IBM.
- use macros to make it build with the old X.org as well.
-* Sun Aug 06 2006 - cthiel@suse.de
+* Sun Aug 06 2006 cthiel@suse.de
- fix build with X.org 7.1
-* Tue Feb 28 2006 - mfabian@suse.de
+* Tue Feb 28 2006 mfabian@suse.de
- add "Provides: locale(xorg-x11:ja)".
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Tue Nov 08 2005 - dmueller@suse.de
+* Tue Nov 08 2005 dmueller@suse.de
- don't build as root
-* Fri Nov 04 2005 - aj@suse.de
+* Fri Nov 04 2005 aj@suse.de
- Fix some compiler warnings in Canna.c.
-* Wed Jun 15 2005 - meissner@suse.de
+* Wed Jun 15 2005 meissner@suse.de
- use RPM_OPT_FLAGS
- fixed implicit declarations by adding more includes.
-* Thu May 19 2005 - mfabian@suse.de
+* Thu May 19 2005 mfabian@suse.de
- Bugzilla #62553: "LTC11323-kinput2 may not handle spot location
properly on Motif": add patch by Jiro SEKIBA .
-* Tue Apr 26 2005 - mfabian@suse.de
+* Tue Apr 26 2005 mfabian@suse.de
- Bugzilla #63978: "LTC12852-kinput2 doesn't update its status
description after XmbResetIC": add patch by .
-* Wed Mar 16 2005 - uli@suse.de
+* Wed Mar 16 2005 uli@suse.de
- likewise for /etc/X11/xim.d/kinput2-canna
-* Mon Mar 14 2005 - uli@suse.de
+* Mon Mar 14 2005 uli@suse.de
- fix thinko in /etc/X11/xim.d/kinput2-wnn
-* Tue Feb 22 2005 - mfabian@suse.de
+* Tue Feb 22 2005 mfabian@suse.de
- fix typo in /etc/X11/xim.d/kinput2-{canna,wnn}.
-* Mon Feb 21 2005 - mfabian@suse.de
+* Mon Feb 21 2005 mfabian@suse.de
- create start scripts /etc/X11/xim.d/kinput2-{canna,wnn}
and symlinks in ja subdirectory.
-* Sat Oct 16 2004 - mfabian@suse.de
+* Sat Oct 16 2004 mfabian@suse.de
- Bugzilla #47203: "LTC11198-Unexpected window overlap order on
KDE". Fixed with patch created by IBM.
-* Wed Jul 28 2004 - mfabian@suse.de
+* Wed Jul 28 2004 mfabian@suse.de
- add 64bit.patch received from Mitsuru Chinen ,
see Bugzilla #42973 (patch slightly improved to make it build
on STABLE).
-* Mon May 24 2004 - ro@suse.de
+* Mon May 24 2004 ro@suse.de
- added return values to non-void functions
-* Fri Apr 02 2004 - mfabian@suse.de
+* Fri Apr 02 2004 mfabian@suse.de
- Bugzilla #35697:
"LTC6518-kinput2 doesn't work properly for XmbResetIC() with
XIMInitialState"
apply patch received from IBM.
-* Fri Feb 20 2004 - mfabian@suse.de
+* Fri Feb 20 2004 mfabian@suse.de
- Bugzilla #34752: don't allow to close the candidate window
with the close button of the window manager.
Thanks to Mitsuru Chinen
-* Fri Jun 13 2003 - mfabian@suse.de
+* Sat Jun 14 2003 mfabian@suse.de
- fix "directory not owned by any package".
-* Thu Nov 14 2002 - mfabian@suse.de
+* Thu Nov 14 2002 mfabian@suse.de
- remove Epoch tag. I added this because the version changed
from v3.1beta4 to v3.1, but it looks like using Epoch because
of that is not a good idea.
-* Wed Oct 23 2002 - mfabian@suse.de
+* Wed Oct 23 2002 mfabian@suse.de
- update to v3.1
-* Sun Aug 11 2002 - mfabian@suse.de
+* Sun Aug 11 2002 mfabian@suse.de
- change # neededforbuild:
cannadev -> canna canna-devel canna-libs
xf86 -> x-devel-packages
-* Fri Aug 02 2002 - mfabian@suse.de
+* Fri Aug 02 2002 mfabian@suse.de
- update to v3.1-beta4:
* A bug in destroying IC, which is introduced by the previous
beta and causes some clients core dump is fixed.
-* Mon Mar 11 2002 - mfabian@suse.de
+* Mon Mar 11 2002 mfabian@suse.de
- change app-defaults to avoid input focus for the
"SeparateConversion", "selectionShell", and "auxShell" widgets.
These windows should never get focus, it just causes problems
when they do.
-* Sat Jan 19 2002 - mfabian@suse.de
+* Sat Jan 19 2002 mfabian@suse.de
- updated to v3.1-beta3
-* Mon Sep 24 2001 - mfabian@suse.de
+* Mon Sep 24 2001 mfabian@suse.de
- change the default keybindings for kinput2/Wnn to use
ccdef.kinput2.egg. User feedback seems to indicate that nobody
likes the "default default" keybindings from ccdef.kinput2
@@ -217,18 +228,18 @@
of other input methods like kinput2/Canna etc., therefore they
seem to more natural for most people.
- fix the man-page to mention the new default.
-* Thu Sep 06 2001 - mfabian@suse.de
+* Thu Sep 06 2001 mfabian@suse.de
- fix "too few arguments to function `jl_kanji_len'"
(was always wrong, but went unnoticed until
fixed some stuff in FreeWnn.
- remove warnings (passing incompatible pointer type etc.)
-* Fri Aug 10 2001 - mfabian@suse.de
+* Fri Aug 10 2001 mfabian@suse.de
- updated to v3.1-beta2
-* Sat May 12 2001 - schwab@suse.de
+* Sat May 12 2001 schwab@suse.de
- Fix missing declarations.
-* Mon May 07 2001 - mfabian@suse.de
+* Mon May 07 2001 mfabian@suse.de
- bzip2 sources
-* Wed Nov 01 2000 - mfabian@suse.de
+* Wed Nov 01 2000 mfabian@suse.de
- added support for wnn.
-* Fri Jul 14 2000 - mfabian@suse.de
+* Fri Jul 14 2000 mfabian@suse.de
- new package: kinput2, Version v3.1 alpha1
++++++ bugzilla-368441-local-variable-used-before-set.patch ++++++
--- kinput2-v3.1/lib/XimpProto.c.~1~ 2002-10-03 11:35:28.000000000 +0200
+++ kinput2-v3.1/lib/XimpProto.c 2008-03-10 12:22:11.000000000 +0100
@@ -1689,10 +1689,10 @@
/* data[0]-data[3]: Area.{x,y,width,height} */
if (mask & XIMP_STS_AREA_MASK) {
- data[0] = xsattr->areax = data[0];
- data[1] = xsattr->areay = data[1];
- data[2] = xsattr->areawidth = data[2];
- data[3] = xsattr->areaheight = data[3];
+ data[0] = xsattr->areax;
+ data[1] = xsattr->areay;
+ data[2] = xsattr->areawidth;
+ data[3] = xsattr->areaheight;
}
/* data[4]: Foreground */
if (mask & XIMP_STS_FG_MASK) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org