Hello community, here is the log from the commit of package kinput2 for openSUSE:Factory checked in at 2014-10-29 21:10:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kinput2 (Old) and /work/SRC/openSUSE:Factory/.kinput2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinput2" Changes: -------- --- /work/SRC/openSUSE:Factory/kinput2/kinput2.changes 2013-07-21 11:52:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kinput2.new/kinput2.changes 2014-10-29 21:10:41.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Oct 27 10:12:20 UTC 2014 - [email protected] + +- fix build for factory + * add patch: kinput2-v3.1-getline.patch + * getline() is a standard function from stdio.h, + rename to getLine +- remove unnessarily self-defined macros + +------------------------------------------------------------------- New: ---- kinput2-v3.1-getline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kinput2.spec ++++++ --- /var/tmp/diff_new_pack.yBy1dV/_old 2014-10-29 21:10:43.000000000 +0100 +++ /var/tmp/diff_new_pack.yBy1dV/_new 2014-10-29 21:10:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kinput2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,19 +17,13 @@ Name: kinput2 -BuildRequires: canna-devel -BuildRequires: fwnndev -BuildRequires: xorg-x11-devel -%define xprefix %{_prefix} -%define xbindir %{_bindir} -%define xmandir %{_mandir} -%define appdefdir /usr/share/X11 -%define xincludes /usr/include -%define xlibraries /usr/%{_lib} Version: v3.1 Release: 0 -# URL: -Source0: ftp://ftp.sra.co.jp/pub/x11/kinput2/%{name}-v3.1.tar.bz2 +Summary: Kanji Input Server for the X Window System +License: HPND +Group: System/I18n/Japanese +Url: ftp://ftp.sra.co.jp/pub/x11/kinput2 +Source: ftp://ftp.sra.co.jp/pub/x11/kinput2/%{name}-v3.1.tar.bz2 Source10: etc-x11-xim.d-kinput2-canna Source11: etc-x11-xim.d-kinput2-wnn Patch0: kinput2.app-defaults.patch @@ -48,20 +42,22 @@ Patch13: canna_c-warn.diff Patch14: bugzilla-137396-cannot-work-after-specific-function-calls.patch Patch15: bugzilla-368441-local-variable-used-before-set.patch +# PATCH-FIX-UPSTREAM getline() is a standard function in stdio.h +# rename to getLine +Patch16: kinput2-v3.1-getline.patch +BuildRequires: canna-devel +BuildRequires: fwnndev +BuildRequires: xorg-x11-devel +# Own /etc/X11/xim.d +BuildRequires: x11-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Kanji Input Server for the X Window System -License: HPND -Group: System/I18n/Japanese -# Summary(ja): X用日本語入力サーバ -# %description -l ja -# Kinput2は日本語入力を必要とするXアプリケーション用の入力サーバーです。 %description Kinput2 is an input server for X Window System applications that require Japanese text input. %prep -%setup0 -n %{name}-v3.1 +%setup -n %{name}-v3.1 %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -79,28 +75,24 @@ %patch13 %patch14 -p1 %patch15 -p1 +%patch16 -p1 head -n 21 cmd/kinput2.c > Copyright %build -# edit Kinput2.conf here ... -#sed -e 's/#define UseSj3/#undef UseSj3/' Kinput2.conf > Kinput2.conf.sed -#mv Kinput2.conf.sed Kinput2.conf -#sed -e 's/\/\* #define UseWnn \*\//#define UseWnn/' Kinput2.conf > Kinput2.conf.sed -#mv Kinput2.conf.sed Kinput2.conf xmkmf -make Makefiles -make depend -make CCOPTIONS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} Makefiles +make %{?_smp_mflags} depend +make %{?_smp_mflags} CCOPTIONS="%{optflags}" %install -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 -install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-kinput2-canna \ - $RPM_BUILD_ROOT/etc/X11/xim.d/kinput2-canna -install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-kinput2-wnn \ - $RPM_BUILD_ROOT/etc/X11/xim.d/kinput2-wnn -pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ +make DESTDIR=%{buildroot} install %{?_smp_mflags} +make install.man MANSUFFIX=1 LIBMANSUFFIX=3 DESTDIR=%{buildroot} +mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ja +install -m 644 %{SOURCE10} \ + %{buildroot}%{_sysconfdir}/X11/xim.d/kinput2-canna +install -m 644 %{SOURCE11} \ + %{buildroot}%{_sysconfdir}/X11/xim.d/kinput2-wnn +pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ ln -s kinput2-canna kinput2 pushd ja ln -s ../kinput2-canna 70-kinput2-canna @@ -108,18 +100,15 @@ popd popd -%clean - %files %defattr(-, root, root) %doc Copyright NEWS doc %doc client/README -%dir /etc/X11/xim.d/ -/etc/X11/xim.d/* -%{xbindir}/* -%config %{appdefdir}/app-defaults -%doc %{xmandir}/*/* -%dir %{xprefix}/lib/X11/ccdef/ -%{xprefix}/lib/X11/ccdef/* +%config %{_sysconfdir}/X11/xim.d/* +%{_bindir}/* +%{_datadir}/X11/app-defaults +%doc %{_mandir}/*/* +%dir %{_libexecdir}/X11/ccdef/ +%{_libexecdir}/X11/ccdef/* %changelog ++++++ kinput2-v3.1-getline.patch ++++++ Index: kinput2-v3.1/lib/cconv.c =================================================================== --- kinput2-v3.1.orig/lib/cconv.c +++ kinput2-v3.1/lib/cconv.c @@ -790,7 +790,7 @@ static wchar *promptsave(wchar *); static int parseLine(uchar *, uchar **, int); static FILE *openfile(char *); static int doinclude(uchar *, Files *, void (*)()); -static uchar *getline(uchar *, int, Files *, void (*)()); +static uchar *getLine(uchar *, int, Files *, void (*)()); static int readRuleFile(ccRule, char *); static int registMode(ccRule, int, uchar **); static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *, @@ -1035,8 +1035,8 @@ void (*efunc)(); return 0; } -/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ -static uchar *getline(line, linesize, files, efunc) +/* getLine -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ +static uchar *getLine(line, linesize, files, efunc) uchar *line; int linesize; Files *files; @@ -1100,7 +1100,7 @@ char *file; rule->nmode = 0; rule->initialmode = -1; - while (getline(line, sizeof(line), &files, efunc)) { + while (getLine(line, sizeof(line), &files, efunc)) { (void)Strcpy(tmp, line); if ((argc = parseLine(tmp, argv, 20)) == 0) continue; @@ -1269,7 +1269,7 @@ uchar **av; cdbuf.cdbuf = NULL; /* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */ - while (getline(line, sizeof(line), files, efunc)) { + while (getLine(line, sizeof(line), files, efunc)) { /* '#' $B$G;O$^$k9T$O%3%a%s%H(B */ if (*line == '\0' || *line == '\n' || *line == '#') continue; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
