François Andriot
10 years ago
parent
846cd1365d
commit
60e9ece833
@ -1,270 +0,0 @@
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
|
||||
%define tde_tdeappdir %{tde_datadir}/applications/kde
|
||||
%define tde_tdedocdir %{tde_docdir}/tde
|
||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
Summary: Audio-decoding framework
|
||||
Name: trinity-akode
|
||||
Version: 2.0.2
|
||||
Release: 3%{?dist}%{?_variant}
|
||||
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
#URL: http://carewolf.com/akode/
|
||||
URL: http://www.kde-apps.org/content/show.php?content=30375
|
||||
Source0: http://www.kde-apps.org/CONTENT/content-files/akode-%{version}.tar.bz2
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
|
||||
# Legacy Fedora 9 patches
|
||||
Patch1: akode-pulseaudio.patch
|
||||
Patch2: akode-2.0.2-multilib.patch
|
||||
Patch3: akode-2.0.2-flac113-portable.patch
|
||||
Patch4: akode-2.0.2-gcc43.patch
|
||||
|
||||
# New patch for Fedora 16 / TDE 3.5.13
|
||||
Patch10: akode-autotools.patch
|
||||
Patch11: akode-2.0.2-fix_ffmpeg_include.patch
|
||||
|
||||
# Optional features that are always enabled :-)
|
||||
%define _with_flac --with-flac
|
||||
|
||||
# Except on RHEL4 ...
|
||||
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
|
||||
%define _with_jack --with-jack
|
||||
%define _with_libsamplerate --with-libsamplerate
|
||||
%endif
|
||||
|
||||
# Pulseaudio is not available on RHEL 5 and earlier
|
||||
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
|
||||
%define _with_pulseaudio --with-pulseaudio
|
||||
%endif
|
||||
|
||||
BuildRequires: automake libtool
|
||||
BuildRequires: alsa-lib-devel
|
||||
%{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: speex-devel
|
||||
|
||||
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||
%{?_with_jack:BuildRequires: %{_lib}jack-devel}
|
||||
%{?_with_flac:BuildRequires: %{_lib}flac-devel}
|
||||
%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
|
||||
%endif
|
||||
%if 0%{?rhel} || 0%{?fedora}
|
||||
%{?_with_flac:BuildRequires: flac-devel}
|
||||
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
|
||||
%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%{?_with_flac:BuildRequires: flac-devel}
|
||||
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
|
||||
%{?_with_pulseaudio:BuildRequires: pulseaudio-devel}
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
aKode is a simple audio-decoding frame-work that provides a uniform
|
||||
interface to decode the most common audio-formats. It also has a direct
|
||||
playback option for a number of audio-outputs.
|
||||
|
||||
aKode currently has the following decoder plugins:
|
||||
* mpc: Decodes musepack aka mpc audio.
|
||||
* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio.
|
||||
|
||||
aKode also has the following audio outputs:
|
||||
* alsa: Outputs to ALSA (dmix is recommended).
|
||||
|
||||
%package devel
|
||||
Summary: Headers for developing programs that will use %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%package jack
|
||||
Summary: Jack audio output backend for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description jack
|
||||
%{summary}.
|
||||
|
||||
%package pulseaudio
|
||||
Summary: Pulseaudio output backend for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description pulseaudio
|
||||
%{summary}.
|
||||
Recommended for network transparent audio.
|
||||
|
||||
# Packaged separately to keep main/core %{akode} package LGPL-clean.
|
||||
%package libsamplerate
|
||||
Summary: Resampler based on libsamplerate for %{name}
|
||||
Group: Development/Libraries
|
||||
License: GPLv2+
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description libsamplerate
|
||||
%{summary}.
|
||||
|
||||
|
||||
%if 0%{?suse_version} || 0%{?pclinuxos}
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n akode-%{version}
|
||||
|
||||
%patch1 -p1 -b .pulseaudio
|
||||
%patch2 -p1 -b .multilib
|
||||
%patch3 -p4 -b .flac113_portable
|
||||
%patch4 -p1 -b .gcc43
|
||||
|
||||
%patch10 -p1
|
||||
%patch11 -p1 -b .ffmpeg
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i "admin/acinclude.m4.in" \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f admin/Makefile.common cvs
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--bindir=%{tde_bindir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--includedir=%{tde_includedir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--disable-debug --disable-warnings --disable-dependency-tracking \
|
||||
--without-libltdl \
|
||||
--with-alsa \
|
||||
--with-oss \
|
||||
%{?_with_flac} %{!?_with_flac:--without-flac} \
|
||||
%{?_with_jack} %{!?_with_jack:--without-jack} \
|
||||
%{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
|
||||
%{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
|
||||
--with-speex \
|
||||
--with-vorbis \
|
||||
--without-ffmpeg \
|
||||
--without-libmad \
|
||||
--enable-closure \
|
||||
--enable-new-ldflags \
|
||||
--enable-final
|
||||
|
||||
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
|
||||
|
||||
|
||||
%install
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
# unpackaged files
|
||||
%__rm -f %{buildroot}%{tde_libdir}/*.a
|
||||
|
||||
# rpmdocs
|
||||
for file in AUTHORS COPYING NEWS README TODO ; do
|
||||
test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
|
||||
done
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%post devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun devel
|
||||
/sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc rpmdocs/*
|
||||
%{tde_bindir}/akodeplay
|
||||
%{tde_libdir}/libakode.so.*
|
||||
%{tde_libdir}/libakode_alsa_sink.la
|
||||
%{tde_libdir}/libakode_alsa_sink.so
|
||||
%{tde_libdir}/libakode_mpc_decoder.la
|
||||
%{tde_libdir}/libakode_mpc_decoder.so
|
||||
%{tde_libdir}/libakode_oss_sink.la
|
||||
%{tde_libdir}/libakode_oss_sink.so
|
||||
%{tde_libdir}/libakode_xiph_decoder.la
|
||||
%{tde_libdir}/libakode_xiph_decoder.so
|
||||
|
||||
#files -libmad
|
||||
# /opt/trinity/lib64/libakode_mpeg_decoder.la
|
||||
# /opt/trinity/lib64/libakode_mpeg_decoder.so
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_bindir}/akode-config
|
||||
%{tde_includedir}/*
|
||||
%{tde_libdir}/libakode.la
|
||||
%{tde_libdir}/libakode.so
|
||||
%{tde_libdir}/pkgconfig/*.pc
|
||||
|
||||
%if "%{?_with_jack}" != ""
|
||||
%files jack
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_libdir}/libakode_jack_sink.la
|
||||
%{tde_libdir}/libakode_jack_sink.so
|
||||
%endif
|
||||
|
||||
# License: GPLv2+
|
||||
%if "%{?_with_libsamplerate:1}" == "1"
|
||||
%files libsamplerate
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_libdir}/libakode_src_resampler.la
|
||||
%{tde_libdir}/libakode_src_resampler.so
|
||||
%endif
|
||||
|
||||
%if "%{?_with_pulseaudio:1}" == "1"
|
||||
%files pulseaudio
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_libdir}/libakode_polyp_sink.la
|
||||
%{tde_libdir}/libakode_polyp_sink.so
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
|
||||
- Initial release for TDE 3.5.13.1
|
||||
|
||||
* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
|
||||
- Re-adds '.la' files
|
||||
|
||||
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1
|
||||
- Port to TDE 3.5.13
|
||||
- Based on spec file from Fedora 9 'akode-2.0.2-5'
|
||||
@ -1,251 +0,0 @@
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
|
||||
%define tde_tdeappdir %{tde_datadir}/applications/kde
|
||||
%define tde_tdedocdir %{tde_docdir}/tde
|
||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
Summary: Audio-decoding framework
|
||||
Name: trinity-akode
|
||||
Version: 2.0.2
|
||||
Release: 2%{?dist}%{?_variant}
|
||||
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
#URL: http://carewolf.com/akode/
|
||||
URL: http://www.kde-apps.org/content/show.php?content=30375
|
||||
Source0: http://www.kde-apps.org/CONTENT/content-files/akode-%{version}.tar.bz2
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
|
||||
# Legacy Fedora 9 patches
|
||||
Patch1: akode-pulseaudio.patch
|
||||
Patch2: akode-2.0.2-multilib.patch
|
||||
Patch3: akode-2.0.2-flac113-portable.patch
|
||||
Patch4: akode-2.0.2-gcc43.patch
|
||||
|
||||
# New patch for Fedora 16 / TDE 3.5.13
|
||||
Patch10: akode-autotools.patch
|
||||
Patch11: akode-2.0.2-fix_ffmpeg_include.patch
|
||||
|
||||
# Optional features that are always enabled :-)
|
||||
%define _with_flac --with-flac
|
||||
%define _with_jack --with-jack
|
||||
%define _with_libsamplerate --with-libsamplerate
|
||||
|
||||
# Pulseaudio is not available on RHEL 5 and earlier
|
||||
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion}
|
||||
%define _with_pulseaudio --with-pulseaudio
|
||||
%endif
|
||||
|
||||
BuildRequires: automake libtool
|
||||
BuildRequires: alsa-lib-devel
|
||||
%{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: speex-devel
|
||||
|
||||
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||
%{?_with_jack:BuildRequires: %{_lib}jack-devel}
|
||||
%{?_with_flac:BuildRequires: %{_lib}flac-devel}
|
||||
%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
|
||||
%else
|
||||
%{?_with_flac:BuildRequires: flac-devel}
|
||||
%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
|
||||
%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
|
||||
%endif
|
||||
|
||||
%description
|
||||
aKode is a simple audio-decoding frame-work that provides a uniform
|
||||
interface to decode the most common audio-formats. It also has a direct
|
||||
playback option for a number of audio-outputs.
|
||||
|
||||
aKode currently has the following decoder plugins:
|
||||
* mpc: Decodes musepack aka mpc audio.
|
||||
* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio.
|
||||
|
||||
aKode also has the following audio outputs:
|
||||
* alsa: Outputs to ALSA (dmix is recommended).
|
||||
|
||||
%package devel
|
||||
Summary: Headers for developing programs that will use %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%package jack
|
||||
Summary: Jack audio output backend for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description jack
|
||||
%{summary}.
|
||||
|
||||
%package pulseaudio
|
||||
Summary: Pulseaudio output backend for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description pulseaudio
|
||||
%{summary}.
|
||||
Recommended for network transparent audio.
|
||||
|
||||
# Packaged separately to keep main/core %{akode} package LGPL-clean.
|
||||
%package libsamplerate
|
||||
Summary: Resampler based on libsamplerate for %{name}
|
||||
Group: Development/Libraries
|
||||
License: GPLv2+
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description libsamplerate
|
||||
%{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n akode-%{version}
|
||||
|
||||
%patch1 -p1 -b .pulseaudio
|
||||
%patch2 -p1 -b .multilib
|
||||
%patch3 -p4 -b .flac113_portable
|
||||
%patch4 -p1 -b .gcc43
|
||||
|
||||
%patch10 -p1
|
||||
%patch11 -p1 -b .ffmpeg
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i "admin/acinclude.m4.in" \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f admin/Makefile.common cvs
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--bindir=%{tde_bindir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--includedir=%{tde_includedir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--disable-debug --disable-warnings --disable-dependency-tracking \
|
||||
--without-libltdl \
|
||||
--with-alsa \
|
||||
--with-oss \
|
||||
%{?_with_flac} %{!?_with_flac:--without-flac} \
|
||||
%{?_with_jack} %{!?_with_jack:--without-jack} \
|
||||
%{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
|
||||
%{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
|
||||
--with-speex \
|
||||
--with-vorbis \
|
||||
--without-ffmpeg \
|
||||
--without-libmad \
|
||||
--enable-closure \
|
||||
--enable-new-ldflags \
|
||||
--enable-final
|
||||
|
||||
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
|
||||
|
||||
|
||||
%install
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
# unpackaged files
|
||||
%__rm -f %{buildroot}%{tde_libdir}/*.a
|
||||
|
||||
# rpmdocs
|
||||
for file in AUTHORS COPYING NEWS README TODO ; do
|
||||
test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
|
||||
done
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%post devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun devel
|
||||
/sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc rpmdocs/*
|
||||
%{tde_bindir}/akodeplay
|
||||
%{tde_libdir}/libakode.so.*
|
||||
%{tde_libdir}/libakode_alsa_sink.la
|
||||
%{tde_libdir}/libakode_alsa_sink.so
|
||||
%{tde_libdir}/libakode_mpc_decoder.la
|
||||
%{tde_libdir}/libakode_mpc_decoder.so
|
||||
%{tde_libdir}/libakode_oss_sink.la
|
||||
%{tde_libdir}/libakode_oss_sink.so
|
||||
%{tde_libdir}/libakode_xiph_decoder.la
|
||||
%{tde_libdir}/libakode_xiph_decoder.so
|
||||
|
||||
#files -libmad
|
||||
# /opt/trinity/lib64/libakode_mpeg_decoder.la
|
||||
# /opt/trinity/lib64/libakode_mpeg_decoder.so
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_bindir}/akode-config
|
||||
%{tde_includedir}/*
|
||||
%{tde_libdir}/libakode.la
|
||||
%{tde_libdir}/libakode.so
|
||||
%{tde_libdir}/pkgconfig/*.pc
|
||||
|
||||
%if "%{?_with_jack:1}" == "1"
|
||||
%files jack
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_libdir}/libakode_jack_sink.la
|
||||
%{tde_libdir}/libakode_jack_sink.so
|
||||
%endif
|
||||
|
||||
# License: GPLv2+
|
||||
%if "%{?_with_libsamplerate:1}" == "1"
|
||||
%files libsamplerate
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_libdir}/libakode_src_resampler.la
|
||||
%{tde_libdir}/libakode_src_resampler.so
|
||||
%endif
|
||||
|
||||
%if "%{?_with_pulseaudio:1}" == "1"
|
||||
%files pulseaudio
|
||||
%defattr(-,root,root,-)
|
||||
%{tde_libdir}/libakode_polyp_sink.la
|
||||
%{tde_libdir}/libakode_polyp_sink.so
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
|
||||
- Re-adds '.la' files
|
||||
|
||||
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1
|
||||
- Port to TDE 3.5.13
|
||||
- Based on spec file from Fedora 9 'akode-2.0.2-5'
|
||||
@ -1,235 +0,0 @@
|
||||
# Default version for this component
|
||||
%if "%{?version}" == ""
|
||||
%define version 3.5.12
|
||||
%endif
|
||||
%define release 2
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%define _docdir %{_prefix}/share/doc
|
||||
%endif
|
||||
|
||||
# TDE 3.5.12 specific building variables
|
||||
BuildRequires: autoconf automake libtool m4
|
||||
%define tde_docdir %{_docdir}
|
||||
%define tde_includedir %{_includedir}/kde
|
||||
%define tde_libdir %{_libdir}/kde3
|
||||
|
||||
|
||||
Name: trinity-kdeedu
|
||||
Summary: Educational/Edutainment applications
|
||||
Version: %{?version}
|
||||
Release: %{?release}%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2
|
||||
Group: Amusements/Games
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: kdeedu-%{version}.tar.gz
|
||||
|
||||
Provides: kdeedu3 = %{version}-%{release}
|
||||
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: trinity-kdelibs-devel
|
||||
BuildRequires: python-devel python
|
||||
BuildRequires: boost-devel
|
||||
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
|
||||
BuildRequires: ocaml(compiler)
|
||||
%else
|
||||
BuildRequires: ocaml
|
||||
%endif
|
||||
#BuildRequires: ocaml-facile-devel
|
||||
|
||||
|
||||
%description
|
||||
Educational/Edutainment applications, including:
|
||||
* blinken: Simon Says Game
|
||||
* kalzium: Periodic Table of Elements
|
||||
* kanagram: Letter Order Game
|
||||
* kbruch: Exercise Fractions
|
||||
* keduca: Tests and Exams
|
||||
* kgeography: Geography Trainer
|
||||
* khangman: Hangman Game
|
||||
* kig: Interactive Geometry
|
||||
* kiten: Japanese Reference/Study Tool
|
||||
* klatin: Latin Reviser
|
||||
* klettres: French alphabet tutor
|
||||
* kmplot: Mathematical Function Plotter
|
||||
* kpercentage: Excersie Percentages
|
||||
* kstars: Desktop Planetarium
|
||||
* ktouch: Touch Typing Tutor
|
||||
* kturtle: Logo Programming Environment
|
||||
* kverbos: Study Spanish Verbforms
|
||||
* kvoctrain: Vocabulary Trainer
|
||||
* kwordquiz: Vocabulary Trainer
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Provides: kdeedu3-devel = %{version}-%{release}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
%description devel
|
||||
%{summary}.
|
||||
|
||||
%package libs
|
||||
Summary: %{name} runtime libraries
|
||||
Group: System Environment/Libraries
|
||||
Requires: trinity-kdelibs
|
||||
# include to be paranoid, installing libs-only is still mostly untested -- Rex
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%description libs
|
||||
%{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n kdeedu
|
||||
|
||||
%if 0%{?rhel} > 0
|
||||
rm -rf doc/kgeography kgeography
|
||||
perl -pi -e "s|kgeography||" subdirs
|
||||
%endif
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
|
||||
|
||||
# Fix link with kparts
|
||||
export CXXFLAGS="${CXXFLAGS} -lkparts"
|
||||
|
||||
%if 0%{?fedora}
|
||||
export CXXFLAGS="${CXXFLAGS} -fpermissive"
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--enable-new-ldflags \
|
||||
--disable-dependency-tracking \
|
||||
--disable-rpath \
|
||||
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
|
||||
--enable-kig-python-scripting \
|
||||
%else
|
||||
--disable-kig-python-scripting \
|
||||
%endif
|
||||
--disable-debug \
|
||||
--disable-warnings \
|
||||
--enable-final \
|
||||
--enable-closure \
|
||||
--includedir=%{_includedir}/kde \
|
||||
--disable-ocamlsolver \
|
||||
--with-extra-includes=%{_includedir}/tqt
|
||||
|
||||
|
||||
%__make \
|
||||
OCAMLLIB=$(ocamlc -where) FACILELIB=$(ocamlc -where)
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
# locale's
|
||||
%find_lang %{name} || touch %{name}.lang
|
||||
HTML_DIR=$(kde-config --expandvars --install html)
|
||||
if [ -d %{buildroot}$HTML_DIR ]; then
|
||||
for lang_dir in %{buildroot}$HTML_DIR/* ; do
|
||||
if [ -d $lang_dir ]; then
|
||||
lang=$(basename $lang_dir)
|
||||
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
|
||||
# replace absolute symlinks with relative ones
|
||||
pushd $lang_dir
|
||||
for i in *; do
|
||||
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
|
||||
done
|
||||
popd
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# rpmdocs
|
||||
for dir in blinken k* ; do
|
||||
for file in AUTHORS ChangeLog README TODO ; do
|
||||
test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
|
||||
done
|
||||
done
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
for i in crystalsvg hicolor locolor ; do
|
||||
touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
|
||||
done
|
||||
update-desktop-database >& /dev/null ||:
|
||||
|
||||
%postun
|
||||
for i in crystalsvg hicolor locolor ; do
|
||||
touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
|
||||
gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
|
||||
done
|
||||
update-desktop-database >& /dev/null ||:
|
||||
|
||||
%post libs
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun libs
|
||||
/sbin/ldconfig
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc README COPYING
|
||||
%doc rpmdocs/*
|
||||
%{_bindir}/*
|
||||
%{_datadir}/applications/kde/*
|
||||
# FIXME
|
||||
%{_datadir}/applnk/Edutainment/
|
||||
%{_datadir}/apps/*
|
||||
%config %{_datadir}/config*/*
|
||||
%{_datadir}/mimelnk/*/*
|
||||
%{_datadir}/icons/crystalsvg/*/*/*
|
||||
%{_datadir}/icons/hicolor/*/*/*
|
||||
%{_datadir}/icons/locolor/*/*/*
|
||||
%{_datadir}/services/*
|
||||
%{tde_libdir}/*
|
||||
|
||||
%files libs
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/lib*.so.*
|
||||
%{_libdir}/lib*.la
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc libkdeedu/AUTHORS libkdeedu/README
|
||||
%{tde_includedir}/*
|
||||
%{_libdir}/lib*.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
|
||||
- Add support for RHEL5
|
||||
|
||||
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
|
||||
- Initial release for RHEL 6
|
||||
- Spec file based on Fedora 8 "kdeedu-3.5.10-1"
|
||||
- Import to GIT
|
||||
@ -1,17 +0,0 @@
|
||||
--- tdeedu/kiten/dict.h
|
||||
+++ tdeedu/kiten/dict.h 2012-04-11 01:14:04.481645011 -0500
|
||||
@@ -65,12 +65,12 @@
|
||||
, data(d)
|
||||
, dataSize(s)
|
||||
{
|
||||
- setRawData(data, dataSize / sizeof(T));
|
||||
+ this->setRawData(data, dataSize / sizeof(T));
|
||||
}
|
||||
|
||||
template<class T> Array<T>::~Array()
|
||||
{
|
||||
- resetRawData(data, dataSize / sizeof(T));
|
||||
+ this->resetRawData(data, dataSize / sizeof(T));
|
||||
}
|
||||
|
||||
// File manages all the files, pointers, and memory management associated
|
||||
@ -1,18 +0,0 @@
|
||||
commit 9d1871a43cd11869f9a1eac7f6e1c6ae23b84072
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1330147966 -0600
|
||||
|
||||
Fix kbruch/Makefile.am to eliminate build error.
|
||||
This resolves bug report 786.
|
||||
|
||||
diff --git a/kbruch/Makefile.am b/kbruch/Makefile.am
|
||||
index b2c27d1..7b159ff 100644
|
||||
--- a/kbruch/Makefile.am
|
||||
+++ b/kbruch/Makefile.am
|
||||
@@ -2,5 +2,5 @@ SUBDIRS = src testcases
|
||||
|
||||
EXTRA_DIST = AUTHORS ChangeLog README TODO kbruch.lsm VERSION
|
||||
|
||||
-VERSION:=`cat ${PWD}/VERSION`
|
||||
+VERSION=`cat ${PWD}/VERSION`
|
||||
include ../admin/Doxyfile.am
|
||||
@ -1,51 +0,0 @@
|
||||
commit 0cd3b7cec9eed70d39e1ae884d76db585790c9a3
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1327530864 -0600
|
||||
|
||||
Fix linear alphabet string errors
|
||||
|
||||
diff --git a/kstars/kstars/indi/base64.c b/kstars/kstars/indi/base64.c
|
||||
index e83db54..2842451 100644
|
||||
--- a/kstars/kstars/indi/base64.c
|
||||
+++ b/kstars/kstars/indi/base64.c
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "base64.h"
|
||||
|
||||
static const char base64digits[] =
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
|
||||
#define BAD (-1)
|
||||
static const char base64val[] = {
|
||||
diff --git a/ktouch/extras/training-gen/perl/dk.config b/ktouch/extras/training-gen/perl/dk.config
|
||||
index 46d7edd..409a07c 100644
|
||||
--- a/ktouch/extras/training-gen/perl/dk.config
|
||||
+++ b/ktouch/extras/training-gen/perl/dk.config
|
||||
@@ -16,4 +16,4 @@ wn
|
||||
cæ
|
||||
x
|
||||
,.
|
||||
-ABCDEFGHIJKLMNOPTQRSTUVWYZÆØÅ
|
||||
\ No newline at end of file
|
||||
+ABCDEFGHIJKLMNOPQRSTUVWYZÆØÅ
|
||||
\ No newline at end of file
|
||||
diff --git a/ktouch/extras/training-gen/perl/en.config b/ktouch/extras/training-gen/perl/en.config
|
||||
index cca1346..bb5df1a 100644
|
||||
--- a/ktouch/extras/training-gen/perl/en.config
|
||||
+++ b/ktouch/extras/training-gen/perl/en.config
|
||||
@@ -12,4 +12,4 @@ qu
|
||||
wn
|
||||
cx
|
||||
yz
|
||||
-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
|
||||
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
diff --git a/ktouch/extras/training-gen/perl/es.config b/ktouch/extras/training-gen/perl/es.config
|
||||
index 1efd7b7..49b8b32 100644
|
||||
--- a/ktouch/extras/training-gen/perl/es.config
|
||||
+++ b/ktouch/extras/training-gen/perl/es.config
|
||||
@@ -14,4 +14,4 @@ qu
|
||||
wnñ
|
||||
cx
|
||||
yz
|
||||
-ABCDEFGHIJKLMNOPTQRSTUVWXYZ
|
||||
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
@ -1,17 +0,0 @@
|
||||
commit b83d045598947bb355ed6a2996b24225da6a9ffa
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1326310679 -0600
|
||||
|
||||
Fix kdeedu makefile glitch
|
||||
This closes Bug 785
|
||||
|
||||
diff --git a/kalzium/src/solver/Makefile b/kalzium/src/solver/Makefile
|
||||
index 4b96fdb..6012982 100644
|
||||
--- a/kalzium/src/solver/Makefile
|
||||
+++ b/kalzium/src/solver/Makefile
|
||||
@@ -89,4 +89,4 @@ install :
|
||||
.depend: parser.ml lexer.ml
|
||||
$(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@
|
||||
|
||||
-include .depend
|
||||
+-include .depend
|
||||
@ -1,55 +0,0 @@
|
||||
--- kdeedu/libkdeedu/kdeeducore/Makefile.am.ORI 2012-08-01 16:03:57.158018060 +0200
|
||||
+++ kdeedu/libkdeedu/kdeeducore/Makefile.am 2012-08-01 16:04:06.206657197 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
libkdeeducode_includedir = $(includedir)/libkdeedu
|
||||
libkdeeducode_include_HEADERS = keduvocdata.h
|
||||
|
||||
-libkdeeducore_la_LIBADD = $(LIB_KDECORE)
|
||||
+libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
--- kdeedu/libkdeedu/kdeeduui/Makefile.am.ORI 2012-08-01 16:08:47.875060426 +0200
|
||||
+++ kdeedu/libkdeedu/kdeeduui/Makefile.am 2012-08-01 16:08:53.275867176 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
libkdeeduuiinclude_HEADERS = kdeeduglossary.h
|
||||
|
||||
libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
|
||||
-libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
|
||||
+libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_QT)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
--- kdeedu/libkdeedu/extdate/Makefile.am.ORI 2012-08-01 16:10:28.272515295 +0200
|
||||
+++ kdeedu/libkdeedu/extdate/Makefile.am 2012-08-01 16:10:37.999176797 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
|
||||
|
||||
libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
|
||||
-libextdate_la_LIBADD = $(LIB_KDEUI)
|
||||
+libextdate_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
|
||||
|
||||
test_extdate_SOURCES = test_extdate.cc
|
||||
test_extdate_LDADD = libextdate.la
|
||||
--- kdeedu/kiten/Makefile.am.ORI 2012-08-01 16:15:45.679552203 +0200
|
||||
+++ kdeedu/kiten/Makefile.am 2012-08-01 16:15:53.606341454 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
lib_LTLIBRARIES = libkiten.la
|
||||
|
||||
libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
|
||||
-libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
|
||||
+libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
|
||||
|
||||
libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
|
||||
deinf.cpp kitenconfig.kcfgc
|
||||
--- kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am.ORI 2012-08-01 16:24:48.865399440 +0200
|
||||
+++ kdeedu/kvoctrain/kvoctrain/kvt-core/Makefile.am 2012-08-01 16:24:54.832227336 +0200
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
SUBDIRS = kvt-xml
|
||||
|
||||
-libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la
|
||||
+libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) -lDCOP
|
||||
+libkvoctraincore_la_LDFLAGS = $(QT_LDFLAGS)
|
||||
|
||||
noinst_HEADERS = grammarmanager.h
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,170 +0,0 @@
|
||||
commit c5dacf57e07e93dd186692d4de64fbe9784af87d
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1365376170 -0500
|
||||
|
||||
Allow kvoctrain to build even if undefined symbols have been disallowed
|
||||
This relates to Bug 1134
|
||||
|
||||
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
|
||||
index d48a7eb..d148f85 100644
|
||||
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
|
||||
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
|
||||
@@ -32,6 +32,55 @@
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
+vector<int> getCsvOrder(kvoctrainDoc *doc)
|
||||
+{
|
||||
+ vector<int> csv_order;
|
||||
+ TQStringList lang_order = Prefs::pasteOrder();
|
||||
+
|
||||
+ if (!Prefs::useCurrent())
|
||||
+ {
|
||||
+ if (/*lang_order &&*/ lang_order.count() != 0) {
|
||||
+ for (int i = 0; i < (int) lang_order.count(); i++)
|
||||
+ {
|
||||
+ int j = doc->findIdent((lang_order)[i]);
|
||||
+ if (j >= 0)
|
||||
+ csv_order.push_back (j);
|
||||
+ else
|
||||
+ csv_order.push_back (-1);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+/*
|
||||
+ for (int i = 0; i < csv_order.size(); i++)
|
||||
+ cout << csv_order[i] << " ";
|
||||
+ cout << endl;
|
||||
+*/
|
||||
+
|
||||
+/* perhaps skip missing ??
|
||||
+ for (int i = csv_order.size()-1; i >= 0; i--)
|
||||
+ if (csv_order[i] == -1)
|
||||
+ csv_order.erase(csv_order.begin() + i);
|
||||
+*/
|
||||
+ // append indices from doc if no order given
|
||||
+ for (int i = 0; i < doc->numLangs(); i++)
|
||||
+ if (::find (csv_order.begin(), csv_order.end(), i) == csv_order.end())
|
||||
+ csv_order.push_back(i);
|
||||
+/*
|
||||
+ if (csv_order.size() > doc->numLangs() )
|
||||
+ csv_order.erase(csv_order.begin() + doc->numLangs(), csv_order.end());
|
||||
+*/
|
||||
+
|
||||
+ // remove trailing garbage
|
||||
+ for (int i = csv_order.size()-1; i >= 0; i--) {
|
||||
+ if (csv_order[i] != -1)
|
||||
+ break;
|
||||
+ else
|
||||
+ csv_order.erase(csv_order.begin() + i);
|
||||
+ }
|
||||
+
|
||||
+ return csv_order;
|
||||
+}
|
||||
+
|
||||
bool kvoctrainDoc::saveTypeNameCsv (TQTextStream &)
|
||||
{
|
||||
return true;
|
||||
@@ -70,7 +119,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &)
|
||||
os << i18n("! Title:") << separator << getTitle() << "\n";
|
||||
os << i18n("! Author:") << separator << getAuthor() << "\n";
|
||||
|
||||
- vector <int> csv_order = kvoctrainApp::getCsvOrder(this);
|
||||
+ vector <int> csv_order = getCsvOrder(this);
|
||||
|
||||
vector<kvoctrainExpr>::const_iterator first = vocabulary.begin ();
|
||||
TQString exp;
|
||||
commit 2e1267ad62d5a62f6ace0e5452c07f4c8b685d6a
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1365377332 -0500
|
||||
|
||||
Reconsolidate split code from prior commit
|
||||
|
||||
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
|
||||
index 881fbed..66e1ca9 100644
|
||||
--- a/kvoctrain/kvoctrain/kva_clip.cpp
|
||||
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
|
||||
@@ -35,6 +35,8 @@
|
||||
#include <algorithm>
|
||||
using namespace std;
|
||||
|
||||
+extern vector<int> getCsvOrderStatic(kvoctrainDoc *doc);
|
||||
+
|
||||
void kvoctrainApp::slotSmartSearchClip()
|
||||
{
|
||||
TQString s;
|
||||
@@ -62,51 +64,7 @@ void kvoctrainApp::slotSmartSearchClip()
|
||||
|
||||
vector<int> kvoctrainApp::getCsvOrder(kvoctrainDoc *doc)
|
||||
{
|
||||
- vector<int> csv_order;
|
||||
- TQStringList lang_order = Prefs::pasteOrder();
|
||||
-
|
||||
- if (!Prefs::useCurrent())
|
||||
- {
|
||||
- if (/*lang_order &&*/ lang_order.count() != 0) {
|
||||
- for (int i = 0; i < (int) lang_order.count(); i++)
|
||||
- {
|
||||
- int j = doc->findIdent((lang_order)[i]);
|
||||
- if (j >= 0)
|
||||
- csv_order.push_back (j);
|
||||
- else
|
||||
- csv_order.push_back (-1);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-/*
|
||||
- for (int i = 0; i < csv_order.size(); i++)
|
||||
- cout << csv_order[i] << " ";
|
||||
- cout << endl;
|
||||
-*/
|
||||
-
|
||||
-/* perhaps skip missing ??
|
||||
- for (int i = csv_order.size()-1; i >= 0; i--)
|
||||
- if (csv_order[i] == -1)
|
||||
- csv_order.erase(csv_order.begin() + i);
|
||||
-*/
|
||||
- // append indices from doc if no order given
|
||||
- for (int i = 0; i < doc->numLangs(); i++)
|
||||
- if (::find (csv_order.begin(), csv_order.end(), i) == csv_order.end())
|
||||
- csv_order.push_back(i);
|
||||
-/*
|
||||
- if (csv_order.size() > doc->numLangs() )
|
||||
- csv_order.erase(csv_order.begin() + doc->numLangs(), csv_order.end());
|
||||
-*/
|
||||
-
|
||||
- // remove trailing garbage
|
||||
- for (int i = csv_order.size()-1; i >= 0; i--) {
|
||||
- if (csv_order[i] != -1)
|
||||
- break;
|
||||
- else
|
||||
- csv_order.erase(csv_order.begin() + i);
|
||||
- }
|
||||
-
|
||||
- return csv_order;
|
||||
+ return getCsvOrderStatic(doc);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
|
||||
index d148f85..d1d2212 100644
|
||||
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
|
||||
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
-vector<int> getCsvOrder(kvoctrainDoc *doc)
|
||||
+vector<int> getCsvOrderStatic(kvoctrainDoc *doc)
|
||||
{
|
||||
vector<int> csv_order;
|
||||
TQStringList lang_order = Prefs::pasteOrder();
|
||||
@@ -119,7 +119,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &)
|
||||
os << i18n("! Title:") << separator << getTitle() << "\n";
|
||||
os << i18n("! Author:") << separator << getAuthor() << "\n";
|
||||
|
||||
- vector <int> csv_order = getCsvOrder(this);
|
||||
+ vector <int> csv_order = getCsvOrderStatic(this);
|
||||
|
||||
vector<kvoctrainExpr>::const_iterator first = vocabulary.begin ();
|
||||
TQString exp;
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue