Hello community, here is the log from the commit of package stardict-tools for openSUSE:Factory checked in at 2016-07-05 09:51:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stardict-tools (Old) and /work/SRC/openSUSE:Factory/.stardict-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stardict-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/stardict-tools/stardict-tools.changes 2011-11-22 17:49:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.stardict-tools.new/stardict-tools.changes 2016-07-05 09:51:32.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 20 10:06:44 UTC 2016 - [email protected] + +- add patch: stardict-tools-3.0.1-gcc6.patch + * fix boo#985116 + * fix narrowing conversion from int to char inside {} + +------------------------------------------------------------------- Old: ---- stardict-tools.README.SuSE New: ---- stardict-tools-3.0.1-gcc6.patch stardict-tools.README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stardict-tools.spec ++++++ --- /var/tmp/diff_new_pack.NMW1W4/_old 2016-07-05 09:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.NMW1W4/_new 2016-07-05 09:51:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package stardict-tools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,64 +15,62 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: stardict-tools -Summary: StarDict Editor Version: 3.0.1 -Release: 59 +Release: 0 +Summary: StarDict Editor License: GPL-2.0+ -Url: http://stardict.sourceforge.net Group: Productivity/Office/Dictionary +Url: http://stardict.sourceforge.net Source: %{name}-%{version}.tar.bz2 -Source1: %{name}.README.SuSE +Source1: %{name}.README.SUSE Source2: stardict-editor.png Source3: stardict-tools-rpmlintrc Patch1: stardict-tools-3.0.1-includes.patch Patch2: stardict-tools-3.0.1-destbufferoverflow.patch Patch3: stardict-tools-3.0.1-gcc44.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch4: stardict-tools-3.0.1-gcc6.patch +BuildRequires: dos2unix +BuildRequires: gcc-c++ BuildRequires: gtk2-devel >= 2.6.0 +BuildRequires: pcre-devel +BuildRequires: update-desktop-files +Recommends: dictd +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} < 1010 BuildRequires: pkgconfig %else -BuildRequires: libtool pkg-config +BuildRequires: libtool +BuildRequires: pkg-config %endif %if 0%{?suse_version} > 1020 BuildRequires: libmysqlclient-devel %else BuildRequires: mysql-devel %endif -BuildRequires: gcc-c++ pcre-devel -BuildRequires: dos2unix update-desktop-files %description This package contains the dictionary conversion tools which can convert dictionaries of DICT, wquick, mova and pydict to stardict format. - - -Authors: --------- - Hu Zheng - %prep %setup -q %patch1 -p1 %patch2 %patch3 +%patch4 -p1 %build autoreconf -fiv %configure --with-pic --disable-static -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%{makeinstall} -%{__install} -d -m755 %buildroot/%{_libdir}/%{name} -%{__install} -d -m755 %buildroot/%{_datadir}/{%{name},pixmaps} -%{__install} -d -m755 %buildroot/%{_defaultdocdir}/%{name} +make %{?_smp_mflags} DESTDIR=%{buildroot} install +install -d -m755 %{buildroot}/%{_libdir}/%{name} +install -d -m755 %{buildroot}/%{_datadir}/{%{name},pixmaps} +install -d -m755 %{buildroot}/%{_defaultdocdir}/%{name} pushd src 1>/dev/null # install noinst_PROGRAMS in libdir for file in $(grep noinst_PROGRAMS Makefile.am | sed -e 's/noinst_PROGRAMS = //'); do @@ -80,33 +78,30 @@ if [[ $file == *.exe ]]; then continue; else - %{__install} -m755 $file %buildroot/%{_libdir}/%{name}/ + install -m755 $file %{buildroot}/%{_libdir}/%{name}/ fi; fi done # install scripts in sharedir for file in uyghur2dict.py mkguangyunst.py stmerge.py KangXiZiDian-djvu2tiff.py; do - echo '#!/usr/bin/python' > "${file}.tmp" + echo '#!%{_bindir}/python' > "${file}.tmp" cat "$file" >> "${file}.tmp" mv -f "${file}.tmp" "$file" chmod 755 "$file" done for file in *.py *.pl *.perl; do - dos2unix -q -n $file %buildroot/%{_datadir}/%{name}/$file - sed -i 's|^#!/usr/bin/env python.*|#!/usr/bin/python|' %buildroot/%{_datadir}/%{name}/$file - chmod 755 %buildroot/%{_datadir}/%{name}/$file + dos2unix -q -n $file %{buildroot}/%{_datadir}/%{name}/$file + sed -i 's|^#!%{_bindir}/env python.*|#!%{_bindir}/python|' %buildroot/%{_datadir}/%{name}/$file + chmod 755 %{buildroot}/%{_datadir}/%{name}/$file done popd 1>/dev/null # install documentation -sed -e "s#__LIBDIR__#%{_libdir}#g" %{SOURCE1} > %buildroot/%{_defaultdocdir}/%{name}/README.SuSE -%{__install} -m644 AUTHORS ChangeLog COPYING README %buildroot/%{_defaultdocdir}/%{name}/ +sed -e "s#__LIBDIR__#%{_libdir}#g" %{SOURCE1} > %buildroot/%{_defaultdocdir}/%{name}/README.SUSE +install -m644 AUTHORS ChangeLog COPYING README %{buildroot}/%{_defaultdocdir}/%{name}/ # install desktop entry -%{__install} -m644 %{SOURCE2} %buildroot/%{_datadir}/pixmaps/ +install -m644 %{SOURCE2} %{buildroot}/%{_datadir}/pixmaps/ %suse_update_desktop_file -c stardict-editor "Stardict Dictionary Editor" "Editor for stardict dictionaries" stardict-editor stardict-editor.png Office Dictionary -%clean -rm -rf %buildroot - %files %defattr(-, root, root) %doc %{_defaultdocdir}/%{name} ++++++ stardict-tools-3.0.1-gcc6.patch ++++++ Index: stardict-tools-3.0.1/src/ec50.cpp =================================================================== --- stardict-tools-3.0.1.orig/src/ec50.cpp +++ stardict-tools-3.0.1/src/ec50.cpp @@ -602,7 +602,7 @@ void captureAllChn(int chnum) unsigned long offset; char *cptr, *ptr; //cptr bool end = false; - const char const_ff[5]={0x0ff,0x0ff,0x0ff,0x0ff,0x0ff}; + const unsigned char const_ff[5]={0x0ff,0x0ff,0x0ff,0x0ff,0x0ff}; langMask = 'c'; unsigned short int si=0; @@ -620,7 +620,7 @@ void captureAllChn(int chnum) for (; (cptr<(chnptr+si+0x0200) && !end); cptr+=3) { m1613 = 0; - if (compare(cptr, const_ff, 3)>=0) + if (compare(cptr, (const char *)const_ff, 3)>=0) { end = true; } @@ -781,7 +781,7 @@ void captureAllWord(int chnum) unsigned long offset; char *cptr, *ptr; bool end = false; - const char const_ff[5]={0x0ff,0x0ff,0x0ff,0x0ff,0x0ff}; + const unsigned char const_ff[5]={0x0ff,0x0ff,0x0ff,0x0ff,0x0ff}; langMask = 'e'; @@ -797,7 +797,7 @@ void captureAllWord(int chnum) for (; (cptr<(chGrp[chnum]+0x0c00) && !end); cptr+=5) { m1613 = 0; - if (compare(cptr, const_ff, 5)>=0) + if (compare(cptr, (const char *)const_ff, 5)>=0) { end = true; } ++++++ stardict-tools.README.SUSE ++++++ The stardict-tools package exists since 2.4.8 and contains additional tools to convert DICT, mova, pydict and wquick dictionaries to stardict format. You can find some perl and python scripts in: /usr/share/stardict-tools/ Some additional tools for dictionary conversion can be found in: __LIBDIR__/stardict-tools/
