diff options
Diffstat (limited to 'redhat/dependencies')
52 files changed, 2707 insertions, 611 deletions
diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec new file mode 100644 index 000000000..f4b24e33a --- /dev/null +++ b/redhat/dependencies/akode/akode-14.0.0.spec @@ -0,0 +1,365 @@ +# +# spec file for package akode (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# BUILD WARNING: +# Remove qt-devel and qt3-devel and any kde*-devel on your system ! +# Having KDE libraries may cause FTBFS here ! + +# TDE variables +%define tde_epoch 2 +%if "%{?tde_version}" == "" +%define tde_version 14.0.0 +%endif +%define tde_prefix /opt/trinity +%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/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libakode %{_lib}akode +%else +%define libakode libakode +%endif + +Name: trinity-akode +Epoch: %{tde_epoch} +Version: 2.0.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Audio-decoding framework +Group: System Environment/Libraries +URL: http://www.kde-apps.org/content/show.php?content=30375 +#URL: http://carewolf.com/akode/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: libtool + +# TQT support +BuildRequires: libtqt4-devel +BuildRequires: trinity-filesystem >= %{tde_version} + +# FLAC support +%define _with_flac --with-flac +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libflac-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: flac-devel +%endif + +# JACK support +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_jack --with-jack +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libjack-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: jack-audio-connection-kit-devel +%endif +%endif + +# SAMPLERATE support +%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_libsamplerate --with-libsamplerate +BuildRequires: libsamplerate-devel +%endif + +# PULSEAUDIO support +%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_pulseaudio --with-pulseaudio +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libpulseaudio-devel +%endif +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: pulseaudio-libs-devel +%endif +%if 0%{?suse_version} +BuildRequires: pulseaudio-devel +%endif +%endif + +# MAD support +%ifarch %{ix86} x86_64 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%define _with_libmad --with-libmad +BuildRequires: libmad-devel +%endif +%endif + +# ALSA support +%if 0%{?suse_version} +BuildRequires: alsa-devel +%else +BuildRequires: alsa-lib-devel +%endif + +BuildRequires: libvorbis-devel +BuildRequires: speex-devel + + +%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). +* jack +* pulseaudio + +%files +%defattr(-,root,root,-) +%doc rpmdocs/* +%{_bindir}/akodeplay +%{_libdir}/libakode.so.* +%{_libdir}/libakode_alsa_sink.la +%{_libdir}/libakode_alsa_sink.so +%{_libdir}/libakode_mpc_decoder.la +%{_libdir}/libakode_mpc_decoder.so +%{_libdir}/libakode_oss_sink.la +%{_libdir}/libakode_oss_sink.so +%{_libdir}/libakode_xiph_decoder.la +%{_libdir}/libakode_xiph_decoder.so + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +########## + +%package devel +Summary: Headers for developing programs that will use %{name} +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%{?_with_jack:Requires: %{libakode}_jack_sink = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_pulseaudio:Requires: %{libakode}_pulse_sink = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_libsamplerate:Requires: %{libakode}_src_resampler = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_libmad:Requires: %{libakode}_mpeg_decoder = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: pkgconfig + +%description devel +This package contains the development files for Akode. +It is needed if you intend to build an application linked against Akode. + +%files devel +%defattr(-,root,root,-) +%{_bindir}/akode-config +%{_includedir}/* +%{_libdir}/libakode.la +%{_libdir}/libakode.so +%{_libdir}/pkgconfig/akode.pc + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + +########## + +%if "%{?_with_jack}" != "" + +%package -n %{libakode}_jack_sink +Summary: Jack audio output backend for %{name} +Group: Development/Libraries +Provides: libakode_jack_sink = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_jack_sink +This package contains the Jack audio output backend for Akode. + +%files -n %{libakode}_jack_sink +%defattr(-,root,root,-) +%{_libdir}/libakode_jack_sink.la +%{_libdir}/libakode_jack_sink.so + +%post -n %{libakode}_jack_sink +/sbin/ldconfig + +%postun -n %{libakode}_jack_sink +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_pulseaudio}" != "" + +%package -n %{libakode}_pulse_sink +Summary: Pulseaudio output backend for %{name} +Group: Development/Libraries +Provides: libakode_pulse_sink = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_pulse_sink +This package contains the pulseaudio backend for Akode. +Recommended for network transparent audio. + +%files -n %{libakode}_pulse_sink +%defattr(-,root,root,-) +%{_libdir}/libakode_pulse_sink.la +%{_libdir}/libakode_pulse_sink.so + +%post -n %{libakode}_pulse_sink +/sbin/ldconfig + +%postun -n %{libakode}_pulse_sink +/sbin/ldconfig + +%endif + +########## + +# Packaged separately to keep main/core %{akode} package LGPL-clean. +%if "%{?_with_libsamplerate:1}" == "1" + +%package -n %{libakode}_src_resampler +Summary: Resampler based on libsamplerate for %{name} +Group: Development/Libraries +Provides: libakode_src_resampler = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_src_resampler +This package contains the samplerate decoder for Akode. + +%files -n %{libakode}_src_resampler +%defattr(-,root,root,-) +%{_libdir}/libakode_src_resampler.la +%{_libdir}/libakode_src_resampler.so + +%post -n %{libakode}_src_resampler +/sbin/ldconfig + +%postun -n %{libakode}_src_resampler +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_libmad}" != "" + +%package -n %{libakode}_mpeg_decoder +Summary: Decoder based on libmad for %{name} +Group: Development/Libraries +Provides: libakode_mpeg_decoder = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{libakode}_mpeg_decoder +This package contains the mad decoder for Akode. + +%files -n %{libakode}_mpeg_decoder +%defattr(-,root,root,-) +%{_libdir}/libakode_mpeg_decoder.la +%{_libdir}/libakode_mpeg_decoder.so + +%post -n %{libakode}_mpeg_decoder +/sbin/ldconfig + +%postun -n %{libakode}_mpeg_decoder +/sbin/ldconfig + +%endif + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + \ + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_LIBLTDL="OFF" \ + -DWITH_ALSA_SINK="ON" \ + %{!?_with_jack:-DWITH_JACK_SINK="OFF"} %{?_with_jack:-DWITH_JACK_SINK="ON"} \ + %{!?_with_pulseaudio:-DWITH_PULSE_SINK="OFF"} %{?_with_pulseaudio:-DWITH_PULSE_SINK="ON"} \ + -DWITH_OSS_SINK="ON" \ + -DWITH_SUN_SINK="OFF" \ + \ + -DWITH_FFMPEG_DECODER="OFF" \ + -DWITH_MPC_DECODER="ON" \ + %{!?_with_libmad:-DWITH_MPEG_DECODER="OFF"} %{?_with_libmad:-DWITH_MPEG_DECODER="ON"} \ + -DWITH_SRC_RESAMPLER="ON" \ + -DWITH_XIPH_DECODER="ON" \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +# 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} + + +%changelog diff --git a/redhat/dependencies/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec new file mode 100644 index 000000000..3a3ef35df --- /dev/null +++ b/redhat/dependencies/akode/akode-3.5.13.2.spec @@ -0,0 +1,350 @@ +# +# spec file for package akode (version 3.5.13-SRU) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# BUILD WARNING: +# Remove qt-devel and qt3-devel and any kde*-devel on your system ! +# Having KDE libraries may cause FTBFS here ! + +# TDE variables +%define tde_epoch 1 +%if "%{?tde_version}" == "" +%define tde_version 3.5.13.2 +%endif +%define tde_prefix /opt/trinity +%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 + +Name: trinity-akode +Summary: Audio-decoding framework +Group: System Environment/Libraries +Epoch: %{tde_epoch} +Version: 2.0.2 +Release: 1%{?dist} +URL: http://www.kde-apps.org/content/show.php?content=30375 +#URL: http://carewolf.com/akode/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +Source0: akode-%{tde_version}.tar.gz + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libtool + +# TQT support +BuildRequires: libtqt4-devel +BuildRequires: trinity-filesystem >= %{tde_version} + +# FLAC support +%define _with_flac --with-flac +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libflac-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: flac-devel +%endif + +# JACK support +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_jack --with-jack +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libjack-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: jack-audio-connection-kit-devel +%endif +%endif + +# SAMPLERATE support +%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_libsamplerate --with-libsamplerate +BuildRequires: libsamplerate-devel +%endif + +# PULSEAUDIO support +%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_pulseaudio --with-pulseaudio +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libpulseaudio-devel +%endif +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: pulseaudio-libs-devel +%endif +%if 0%{?suse_version} +BuildRequires: pulseaudio-devel +%endif +%endif + +# MAD support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%define _with_libmad --with-libmad +BuildRequires: libmad-devel +%endif + +BuildRequires: alsa-lib-devel +BuildRequires: libvorbis-devel +BuildRequires: speex-devel + + +%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). +* jack +* pulseaudio + +%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 + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +########## + +%package devel +Summary: Headers for developing programs that will use %{name} +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: pkgconfig + +%description devel +This package contains the development files for Akode. +It is needed if you intend to build an application linked against Akode. + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/akode-config +%{tde_includedir}/* +%{tde_libdir}/libakode.la +%{tde_libdir}/libakode.so +%{tde_libdir}/pkgconfig/*.pc + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + +########## + +%if "%{?_with_jack}" != "" + +%package jack +Summary: Jack audio output backend for %{name} +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description jack +This package contains the Jack audio output backend for Akode. + +%files jack +%defattr(-,root,root,-) +%{tde_libdir}/libakode_jack_sink.la +%{tde_libdir}/libakode_jack_sink.so + +%post jack +/sbin/ldconfig + +%postun jack +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_pulseaudio}" != "" + +%package pulseaudio +Summary: Pulseaudio output backend for %{name} +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description pulseaudio +This package contains the pulseaudio backend for Akode. +Recommended for network transparent audio. + +%files pulseaudio +%defattr(-,root,root,-) +%{tde_libdir}/libakode_polyp_sink.la +%{tde_libdir}/libakode_polyp_sink.so + +%post pulseaudio +/sbin/ldconfig + +%postun pulseaudio +/sbin/ldconfig + +%endif + +########## + +# Packaged separately to keep main/core %{akode} package LGPL-clean. +%if "%{?_with_libsamplerate:1}" == "1" + +%package libsamplerate +Summary: Resampler based on libsamplerate for %{name} +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description libsamplerate +This package contains the samplerate decoder for Akode. + +%files libsamplerate +%defattr(-,root,root,-) +%{tde_libdir}/libakode_src_resampler.la +%{tde_libdir}/libakode_src_resampler.so + +%post libsamplerate +/sbin/ldconfig + +%postun libsamplerate +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_libmad}" != "" + +%package libmad +Summary: Decoder based on libmad for %{name} +Group: Development/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description libmad +This package contains the mad decoder for Akode. + +%files libmad +%defattr(-,root,root,-) +%{tde_libdir}/libakode_mpeg_decoder.la +%{tde_libdir}/libakode_mpeg_decoder.so + +%post libmad +/sbin/ldconfig + +%postun libmad +/sbin/ldconfig + +%endif + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n akode-2.0.2 + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + + +%build +unset QTDIR QTINC QTLIB +export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H" + +%configure \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_includedir} \ + --datadir=%{tde_datadir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath \ + \ + --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 \ + %{?_with_libmad} %{!?_with_libmad:--without-libmad} + +%__make %{?_smp_mflags} || %__make + + +%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} + + +%changelog diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index 244c370e3..765d14efa 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package arts (version R14.0.0) +# spec file for package arts (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,10 +21,13 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg arts %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -35,16 +38,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# 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 - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ @@ -62,6 +60,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} @@ -79,18 +78,17 @@ BuildRequires: libvorbis-devel # ESOUND support %define with_esound 1 +%if 0%{?with_esound} BuildRequires: esound-devel +%endif # JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_jack 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%define jack_devel %{_lib}jack-devel -%endif %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel libjack-devel %endif BuildRequires: %{jack_devel} @@ -98,7 +96,7 @@ BuildRequires: %{jack_devel} # LIBTOOL %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel +BuildRequires: libltdl-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libtool-ltdl-devel @@ -115,10 +113,7 @@ BuildRequires: libtool %ifarch %{ix86} x86_64 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_libmad 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -%define mad_devel %{_lib}mad-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion} %define mad_devel libmad-devel %endif BuildRequires: %{mad_devel} @@ -169,12 +164,6 @@ playing a wave file with some effects. # The '.la' files are needed for runtime, not devel ! %{tde_libdir}/lib*.la -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - ########## %package devel @@ -188,7 +177,7 @@ Obsoletes: arts-devel Requires: alsa-lib-devel Requires: audiofile-devel Requires: libvorbis-devel -Requires: esound-devel +%{?with_esound:Requires: esound-devel} %{?with_libmad:Requires: %{mad_devel}} %{?with_jack:Requires: %{jack_devel}} @@ -216,12 +205,6 @@ playing a wave file with some effects. %{tde_libdir}/pkgconfig/*.pc %{tde_libdir}/*.a -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %if 0%{?with_pulseaudio} @@ -237,7 +220,7 @@ intended for systems running the Pulseaudio server. %files config-pulseaudio %defattr(-,root,root,-) -%{tde_datadir}/config/kcmartsrc +%{tde_confdir}/kcmartsrc %endif @@ -299,13 +282,14 @@ fi # Installs the Pulseaudio configuration file %if 0%{?with_pulseaudio} -cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc" +%__mkdir_p "%{?buildroot}%{tde_confdir}" +cat <<EOF >"%{?buildroot}%{tde_confdir}/kcmartsrc" [Arts] Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f NetworkTransparent=true SuspendTime=1 EOF -chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" +chmod 644 "%{?buildroot}%{tde_confdir}/kcmartsrc" %endif # Add supplementary folders @@ -317,5 +301,3 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.5.10-2 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec index ad8473da4..02e031f9e 100644 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ b/redhat/dependencies/arts/arts-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -29,21 +29,17 @@ %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} +%define tde_sbindir %{tde_prefix}/sbin %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 -# 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 - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ @@ -62,6 +58,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} + BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} Requires: trinity-filesystem >= %{tde_version} @@ -83,25 +81,22 @@ BuildRequires: esound-devel # JACK support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack} %define with_jack 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%define jack_devel %{_lib}jack-devel -%endif %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel %endif -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define jack_devel libjack-devel %endif BuildRequires: %{jack_devel} %endif # LIBTOOL -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif %if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libtool-ltdl-devel %endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libltdl-devel +%endif %if 0%{?suse_version} %if 0%{?suse_version} >= 1220 BuildRequires: libltdl-devel @@ -110,16 +105,14 @@ BuildRequires: libtool %endif %endif +# UUID support +BuildRequires: libuuid-devel + # MAD support %ifarch %{ix86} x86_64 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_libmad 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -%define mad_devel %{_lib}mad-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define mad_devel libmad-devel -%endif BuildRequires: %{mad_devel} %endif %endif @@ -250,6 +243,7 @@ intended for systems running the Pulseaudio server. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%{?tde_patch:%patch1 -p1} %build @@ -316,15 +310,3 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-2 -- Rebuild. - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-1 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 - diff --git a/redhat/dependencies/arts/trinity-arts-rpmlintrc b/redhat/dependencies/arts/trinity-arts-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/dependencies/arts/trinity-arts-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec index 41d6c5f7f..1989ceb7b 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package avahi-tqt (version R14.0.0) +# spec file for package avahi-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libavahi %{_lib}avahi @@ -29,7 +31,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -50,13 +52,31 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# GLIB2 support +BuildRequires: glib2-devel + # GETTEXT support BuildRequires: gettext-devel +# Xi support +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libxi-devel +%endif +%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} +BuildRequires: libXi-devel +%endif +%if 0%{?suse_version} == 1140 +BuildRequires: libXi6-devel +%endif + # DBUS support %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -70,7 +90,7 @@ BuildRequires: libcap-devel # AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel %{_lib}avahi-client-devel +%define avahi_devel libavahi-client-devel %endif %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %define avahi_devel avahi-devel @@ -170,6 +190,7 @@ into a TQt main loop application. %files -n %{libavahi}-tqt-devel %defattr(-,root,root,-) %{_includedir}/avahi-tqt/ +%{_libdir}/libavahi-tqt.a %{_libdir}/libavahi-tqt.so %{_libdir}/libavahi-tqt.la %{_libdir}/pkgconfig/avahi-tqt.pc @@ -184,40 +205,31 @@ into a TQt main loop application. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -export NOCONFIGURE=1 -./autogen.sh %build unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --exec-prefix=%{_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-static \ - --disable-dependency-tracking \ - \ - --enable-compat-libdns_sd \ - --with-systemdsystemunitdir=/lib/systemd/system \ -%if 0%{?suse_version} - --with-distro=suse \ -%endif -%if 0%{?fedora} || 0%{?rhel} - --with-distro=fedora \ -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} - --with-distro=mandriva \ -%endif + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + .. %__make %{?_smp_mflags} || %__make %install %__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} +%__make install DESTDIR="%{?buildroot}" -C build %clean @@ -225,5 +237,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.30-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec index 8ecd7f82c..c9e7121e6 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -29,7 +29,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -54,9 +54,26 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# GLIB2 support +BuildRequires: glib2-devel + # GETTEXT support BuildRequires: gettext-devel +# Xi support +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libxi-devel +%endif +%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} +BuildRequires: libXi-devel +%endif +%if 0%{?suse_version} == 1140 +BuildRequires: libXi6-devel +%endif + # DBUS support %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -70,7 +87,7 @@ BuildRequires: libcap-devel # AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel %{_lib}avahi-client-devel +%define avahi_devel libavahi-client-devel %endif %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %define avahi_devel avahi-devel @@ -176,7 +193,7 @@ into a TQt main loop application. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -226,8 +243,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-2 -- Rename package to 'libavahi-tqt' - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index f83aba4d6..7f8d9f3cb 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-1-tqt (version R14.0.0) +# spec file for package dbus-1-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus @@ -29,7 +31,7 @@ Name: trinity-dbus-1-tqt Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -112,6 +114,12 @@ Requires: %{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?suse_version} +Requires: dbus-1-devel +%else +Requires: dbus-devel +%endif + %description -n %{libdbus}-1-tqt-devel D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in @@ -181,5 +189,3 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.9-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec index ce1fa478c..8e4771767 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -29,8 +29,8 @@ Name: trinity-dbus-1-tqt Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} -Summary: dbus bindings for the Trinity Qt [TQt] interface +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} +Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -74,7 +74,7 @@ See the dbus description for more information about D-BUS in general. ########### %package -n %{libdbus}-1-tqt0 -Summary: dbus bindings for the Trinity Qt [TQt] interface +Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries Provides: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} @@ -104,7 +104,7 @@ See the dbus description for more information about D-BUS in general. ########## %package -n %{libdbus}-1-tqt-devel -Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files) +Summary: Dbus bindings for the Trinity Qt [TQt] interface (Development Files) Group: Development/Libraries/C and C++ Provides: libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} @@ -137,7 +137,7 @@ See the dbus description for more information about D-BUS in general. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -181,11 +181,3 @@ fi %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.9-2 -- Rename package to 'libdbus-1-tqt' - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.9-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec index 7f63f8bae..75ec11785 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-tqt (version R14.0.0) +# spec file for package dbus-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus @@ -29,7 +31,7 @@ Name: trinity-dbus-tqt Epoch: %{tde_epoch} Version: 0.63 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Simple inter-process messaging system Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -113,6 +115,12 @@ Requires: %{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?suse_version} +Requires: dbus-1-devel +%else +Requires: dbus-devel +%endif + %description -n %{libdbus}-tqt-1-devel D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in @@ -181,5 +189,3 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.63-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec index f61010da4..81ec5d368 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -29,7 +29,7 @@ Name: trinity-dbus-tqt Epoch: %{tde_epoch} Version: 0.63 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Simple inter-process messaging system Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -192,11 +192,3 @@ fi %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.63-2 -- Rename package to 'libdbus-tqt-1' - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.63-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index 3f4acc2fd..cd8a9ebc2 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libart-lgpl (version R14.0.0) +# spec file for package libart-lgpl (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,13 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libart %{_lib}art @@ -27,12 +29,13 @@ %endif -Name: trinity-libart-lgpl -Version: 2.3.22 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: Library of functions for 2D graphics -Group: System/Libraries -URL: http://www.trinitydesktop.org/ +Name: trinity-libart-lgpl +Epoch: %{tde_epoch} +Version: 2.3.22 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Library of functions for 2D graphics +Group: System/Libraries +URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} License: LGPL-2.0+ @@ -93,8 +96,8 @@ especially suitable for embedded applications. %package -n %{libart}_lgpl-devel Summary: Library of functions for 2D graphics - development files Group: Development/Libraries -Provides: libart_lgpl-devel = %{version}-%{release} -Requires: %{libart}_lgpl_2-2 = %{version}-%{release} +Provides: libart_lgpl-devel = %{tde_epoch}:%{version}-%{release} +Requires: %{libart}_lgpl_2-2 = %{tde_epoch}:%{version}-%{release} %description -n %{libart}_lgpl-devel A library of functions for 2D graphics supporting a superset of the @@ -175,7 +178,7 @@ especially suitable for embedded applications. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" autoreconf -fiv @@ -206,5 +209,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3.22-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 386e92fbc..a4bf7ebb2 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libcaldav (version R14.0.0) +# spec file for package libcaldav (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A client library that adds support for the CalDAV protocol (rfc4791) Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -52,6 +54,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: libcaldav-14.0.1-rhel5.patch + BuildRequires: make BuildRequires: libtool BuildRequires: fdupes @@ -65,15 +69,10 @@ BuildRequires: gtk2-devel %endif # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define libcurl_devel libcurl-devel -%else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel libcurl-devel >= 7.15.5 %else -# Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel curl-devel >= 7.15.5 %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -152,7 +151,10 @@ This package includes the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -./autogen.sh +%if 0%{?rhel} == 5 +%patch1 -p1 -b .ftbfs +%endif +autoreconf -fiv %build @@ -193,6 +195,4 @@ mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{ver %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.5-1 -- Initial release for TDE R14.0.0 +%changelog diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch new file mode 100644 index 000000000..0cf9f056b --- /dev/null +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch @@ -0,0 +1,193 @@ +diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c +index 68a4377..35aef48 100644 +--- a/src/add-caldav-object.c ++++ b/src/add-caldav-object.c +@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c +index 9a85168..ea5733f 100644 +--- a/src/delete-caldav-object.c ++++ b/src/delete-caldav-object.c +@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + g_free(search); + curl_slist_free_all(http_header); +@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { + caldav_unlock_object( +@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + g_free(search); + curl_slist_free_all(http_header); +@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { + caldav_unlock_object( +diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c +index d916259..0021cb8 100644 +--- a/src/get-caldav-report.c ++++ b/src/get-caldav-report.c +@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +diff --git a/src/get-display-name.c b/src/get-display-name.c +index 8fc0ff8..c205efd 100644 +--- a/src/get-display-name.c ++++ b/src/get-display-name.c +@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c +index f75ab92..40a5a3c 100644 +--- a/src/get-freebusy-report.c ++++ b/src/get-freebusy-report.c +@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c +index 30f2d20..6845551 100644 +--- a/src/lock-caldav-object.c ++++ b/src/lock-caldav-object.c +@@ -107,7 +107,6 @@ gchar* caldav_lock_object( + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + curl_slist_free_all(http_header); + if (res != 0) { +@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI, + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + curl_slist_free_all(http_header); + if (res != 0) { +diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c +index fb3a4d0..f3563d8 100644 +--- a/src/modify-caldav-object.c ++++ b/src/modify-caldav-object.c +@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + curl_slist_free_all(http_header); + http_header = NULL; +@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { + strlen(settings->file)); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { +@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + curl_slist_free_all(http_header); + http_header = NULL; +@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { + strlen(settings->file)); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { +diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c +index 1d97d04..0045afe 100644 +--- a/src/options-caldav-server.c ++++ b/src/options-caldav-server.c +@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res == 0) { + gchar* head; +@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu + } + else if ( + (res == CURLE_SSL_CONNECT_ERROR || +- CURLE_PEER_FAILED_VERIFICATION || + CURLE_SSL_ENGINE_NOTFOUND || + CURLE_SSL_ENGINE_SETFAILED || + CURLE_SSL_CERTPROBLEM || + CURLE_SSL_CIPHER || + CURLE_SSL_CACERT || +- CURLE_SSL_CACERT_BADFILE || +- CURLE_SSL_CRL_BADFILE || +- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) { ++ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) { + error->code = -2; + error->str = g_strdup(error_buf); + } diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec index 4ff94304e..419ff8ff9 100644 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} Summary: A client library that adds support for the CalDAV protocol (rfc4791) Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -65,15 +65,11 @@ BuildRequires: gtk2-devel %endif # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define libcurl_devel libcurl-devel %else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel -%else # Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel trinity-libcurl-devel %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -196,16 +192,4 @@ mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/l %__rm -rf %{buildroot} -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.5-4 -- Build for Fedora 19 - -* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.2 -- Add missing BuildRequires - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 +%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec index c02b79769..27e23795e 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libcarddav (version R14.0.0) +# spec file for package libcarddav (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -52,19 +54,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: libcarddav-14.0.1-rhel5.patch + BuildRequires: make BuildRequires: libtool # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define libcurl_devel libcurl-devel -%else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%define libcurl_devel libcurl-devel >= 7.15.5 %else # Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel curl-devel >= 7.15.5 %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -151,11 +151,14 @@ This package contains the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?rhel} == 5 +%patch1 -p1 -b .ftbfs +%endif # Fix empty ChangeLog cause invalid macro in 'configure.ac' echo "%{name} (%{version})" >ChangeLog -./autogen.sh +autoreconf -fiv %build @@ -191,6 +194,4 @@ fi %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.2-1 -- Initial release for TDE R14.0.0 +%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch new file mode 100644 index 000000000..a6bf4e6e0 --- /dev/null +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch @@ -0,0 +1,164 @@ +diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c +index 5574991..a1586d8 100644 +--- a/src/add-carddav-object.c ++++ b/src/add-carddav-object.c +@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c +index 96b9033..6984a82 100644 +--- a/src/delete-carddav-object.c ++++ b/src/delete-carddav-object.c +@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + g_free(search); + curl_slist_free_all(http_header); +@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { + carddav_unlock_object( +@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error) + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { + carddav_unlock_object( +diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c +index b44fd2c..7655b29 100644 +--- a/src/get-carddav-report.c ++++ b/src/get-carddav-report.c +@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error) + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error) + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error) + curl_easy_cleanup(curl); + g_free(dav_file_listing); + return result; +-} +\ No newline at end of file ++} +diff --git a/src/get-display-name.c b/src/get-display-name.c +index 9e782e0..16c3e4b 100644 +--- a/src/get-display-name.c ++++ b/src/get-display-name.c +@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + if (res != 0) { + error->code = -1; +diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c +index 163264c..2292cad 100644 +--- a/src/lock-carddav-object.c ++++ b/src/lock-carddav-object.c +@@ -109,7 +109,6 @@ gchar* carddav_lock_object( + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + curl_slist_free_all(http_header); + if (res != 0) { +@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI, + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + curl_slist_free_all(http_header); + if (res != 0) { +diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c +index 1822068..a8b6de2 100644 +--- a/src/modify-carddav-object.c ++++ b/src/modify-carddav-object.c +@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) { + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + res = curl_easy_perform(curl); + curl_slist_free_all(http_header); + http_header = NULL; +@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) { + strlen(settings->file)); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { +@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error) + strlen(settings->file)); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); + res = curl_easy_perform(curl); + if (LOCKSUPPORT && lock_token) { +diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c +index b774401..b44aae2 100644 +--- a/src/options-carddav-server.c ++++ b/src/options-carddav-server.c +@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re + curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); +- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + if (settings->debug) { + curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); + } +@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re + } + else if ( + (res == CURLE_SSL_CONNECT_ERROR || +- CURLE_PEER_FAILED_VERIFICATION || + CURLE_SSL_ENGINE_NOTFOUND || + CURLE_SSL_ENGINE_SETFAILED || + CURLE_SSL_CERTPROBLEM || + CURLE_SSL_CIPHER || + CURLE_SSL_CACERT || +- CURLE_SSL_CACERT_BADFILE || +- CURLE_SSL_CRL_BADFILE || +- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) { ++ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) { + error->code = -2; + error->str = g_strdup(error_buf); + } diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec index d09b0fed7..152f1cf90 100644 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec +++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -56,15 +56,11 @@ BuildRequires: make BuildRequires: libtool # CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define libcurl_devel libcurl-devel %else -%if 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel %{_lib}curl-devel -%else # Specific CURL version for TDE on RHEL 5 (and older) -#define libcurl_devel trinity-libcurl-devel -%endif +%define libcurl_devel trinity-libcurl-devel %endif %{?libcurl_devel:BuildRequires: %{libcurl_devel}} @@ -151,6 +147,7 @@ This package contains the development files. %prep %setup -q -n libcarddav-%{version} +%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/" autoreconf --force --install --symlink @@ -195,13 +192,4 @@ fi %__rm -rf %{buildroot} -%Changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4 -- Build for Fedora 19 - -* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2debian2 .1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 +%changelog diff --git a/redhat/dependencies/libr/libr.spec b/redhat/dependencies/libr/libr.spec new file mode 100644 index 000000000..ba6ed625a --- /dev/null +++ b/redhat/dependencies/libr/libr.spec @@ -0,0 +1,180 @@ +# +# spec file for package libr (version R14) +# +# Copyright (c) 2014 Trinity Desktop Environment +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ +# + +# TDE variables +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif + +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define libr %{_lib}r +%else +%define libr libr +%endif + + +Name: trinity-libr +Version: 0.6.0 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: ELF binary resource library +Group: System/Libraries +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Project +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 + +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +BuildRequires: binutils-devel + +# GLADE2 +%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +BuildRequires: %{_lib}glade2.0_0-devel +%else +BuildRequires: libglade2-devel +%endif + + +%description +Store and retrieve resources from ELF binaries. + +########## + +%package -n %{libr} +Summary: Simple inter-process messaging system (TQt-based shared library) +Group: System/Libraries + +%description -n %{libr} +Store and retrieve resources from ELF binaries. + +%post -n %{libr} +/sbin/ldconfig || : + +%postun -n %{libr} +/sbin/ldconfig || : + +%files -n %{libr} +%defattr(-,root,root,-) +%{_libdir}/libr.so.0 +%{_libdir}/libr.so.0.0.0 + + +########## + +%package -n %{libr}-devel +Summary: Simple inter-process messaging system (TQt interface) +Group: Development/Libraries/C and C++ +Requires: %{libr} == %{version}-%{release} +Provides: libr-devel == %{version}-%{release} + +%description -n %{libr}-devel +Store and retrieve resources from ELF binaries. + +%post -n %{libr}-devel +/sbin/ldconfig || : + +%postun -n %{libr}-devel +/sbin/ldconfig || : + +%files -n %{libr}-devel +%defattr(-,root,root,-) +%{_includedir}/libr/ +%{_libdir}/libr.a +%{_libdir}/libr.la +%{_libdir}/libr.so +%{_libdir}/pkgconfig/libr.pc +%{_mandir}/man3/IconSVG.3* +%{_mandir}/man3/OneCanvasIconInfo.3* +%{_mandir}/man3/libr_clear.3* +%{_mandir}/man3/libr_close.3* +%{_mandir}/man3/libr_errmsg.3* +%{_mandir}/man3/libr_errno.3* +%{_mandir}/man3/libr_icon_close.3* +%{_mandir}/man3/libr_icon_geticon_byname.3* +%{_mandir}/man3/libr_icon_geticon_bysize.3* +%{_mandir}/man3/libr_icon_getuuid.3* +%{_mandir}/man3/libr_icon_setuuid.3* +%{_mandir}/man3/libr_list.3* +%{_mandir}/man3/libr_malloc.3* +%{_mandir}/man3/libr_open.3* +%{_mandir}/man3/libr_read.3* +%{_mandir}/man3/libr_resources.3* +%{_mandir}/man3/libr_size.3* +%{_mandir}/man3/libr_status.3* +%{_mandir}/man3/libr_write.3* + + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR QTINC QTLIB + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + + +%clean +%__rm -rf %{?buildroot} + + +%changelog diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec index 000b00936..3b8b54d68 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package python-tqt (version R14.0.0) +# spec file for package python-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -23,7 +23,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg python-tqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -36,16 +38,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# 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 - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.18.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt bindings for Python Group: Development/Libraries/Python URL: http://www.trinitydesktop.org/ @@ -265,5 +262,3 @@ echo yes | %__python ../configure.py \ %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.18.1-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch new file mode 100644 index 000000000..09d697fb4 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch @@ -0,0 +1,15 @@ +--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 ++++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 +@@ -501,10 +501,10 @@ + (*f).latin1(), + (const char*) QFile::encodeName( old->library() ) ); + } else { +- qWarning("%s: Feature %s already defined in %s!", ++/* qWarning("%s: Feature %s already defined in %s!", + (const char*) QFile::encodeName( old->library() ), + (*f).latin1(), +- (const char*) QFile::encodeName( plugin->library() ) ); ++ (const char*) QFile::encodeName( plugin->library() ) ); */ + } + } + } diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch new file mode 100644 index 000000000..009ab81fb --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 ++++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 +@@ -11,7 +11,7 @@ + install: FORCE + @$(MAKE) qt.install + +-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples ++all: symlinks src-qmake src-moc sub-src sub-tools + @echo + @echo "The Qt library is now built in ./lib" + @echo "The Qt examples are built in the directories in ./examples" diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch new file mode 100644 index 000000000..5bd5e9e0a --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch @@ -0,0 +1,18 @@ +--- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 ++++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 +@@ -4748,10 +4748,11 @@ + + // GB18030 fonts on Turbolinux + static const psfont SongGBK2K [] = { +- { "MSung-Light-GBK2K-H", 0, 100. }, +- { "MSung-Italic-GBK2K-H", 0, 100. }, +- { "MSung-Bold-GBK2K-H", 0, 100. }, +- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ + }; + static const psfont KaiGBK2K [] = { + { "MKai-Medium-GBK2K-H", 0, 100. }, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch new file mode 100644 index 000000000..9dca7998d --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch @@ -0,0 +1,15 @@ +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 +@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy + toPos += 2; + if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { + if (matra_position == Post || matra_position == Split) { +- toPos = matra+1; ++ if (matra_position == Post ) ++ toPos = matra; ++ else ++ toPos = matra+1; + matra -= 2; + } + } else if (script == QFont::Kannada) { diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch new file mode 100644 index 000000000..84b885b8b --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch @@ -0,0 +1,11 @@ +--- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200 ++++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200 +@@ -261,7 +261,7 @@ + Other, Other, Other, Other, + Other, Other, Other, Other, + +- Other, Other, Other, Other, ++ Other, Other, VowelMark, VowelMark, + Other, Other, Other, Other, + Other, Other, Other, Other, + Other, Other, Other, Other, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch new file mode 100644 index 000000000..01f3824c1 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch @@ -0,0 +1,60 @@ +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 +@@ -868,7 +868,7 @@ + None, None, None, None, + None, None, None, Post, + +- Post, None, Below, None, ++ None, None, None, None, + None, Post, None, None, + None, None, None, None, + None, None, Post, Post, +@@ -1271,6 +1271,16 @@ + int base = 0; + int reph = -1; + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ bool is_special_conjuction_malayalam = false; ++ ++ if ((len == 3) && ++ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && ++ (reordered[1] == 0x0d4d) && ++ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { ++ is_special_conjuction_malayalam = true; ++ } ++ + #ifdef INDIC_DEBUG + IDEBUG("original:"); + for (i = 0; i < len; i++) { +@@ -1547,6 +1557,15 @@ + reph = i; + } + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned short temp; ++ ++ temp = reordered[0]; ++ reordered[0] = reordered[2]; ++ reordered[2] = temp; ++ } ++ + if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, + &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) + return FALSE; +@@ -1658,6 +1677,15 @@ + + // halant always applies + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned int temp; ++ ++ temp = properties[0]; ++ properties[0] = ~PreSubstProperty; ++ properties[2] = temp; ++ } ++ + #ifdef INDIC_DEBUG + { + IDEBUG("OT properties:"); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch new file mode 100644 index 000000000..8dbb2ae98 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 +@@ -864,7 +864,7 @@ + None, None, None, Post, + + None, None, None, None, +- None, Post, None, None, ++ None, None, None, None, + None, None, None, None, + None, None, Post, Post, + diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch new file mode 100644 index 000000000..eb880b1cc --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch @@ -0,0 +1,12 @@ +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 +@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri + if ( script >= QFont::Arabic && script <= QFont::Khmer ) { + // complex script shaping. Have to do some hard work + int from = QMAX( 0, pos - 8 ); +- int to = QMIN( (int)str.length(), pos + 8 ); ++ int to = str.length(); + QConstString cstr( str.unicode()+from, to-from); + QTextEngine layout( cstr.string(), d ); + layout.itemize( QTextEngine::WidthOnly ); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch new file mode 100644 index 000000000..eb3868c96 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 +@@ -786,7 +786,7 @@ + Below, None, Below, Below, + Below, Below, Below, Below, + +- Below, None, Below, Below, ++ Below, Below, Below, Below, + None, Below, Below, Below, + Below, Below, None, None, + None, None, Post, Above, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch new file mode 100644 index 000000000..41a74fba7 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch @@ -0,0 +1,23 @@ +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -1240,7 +1240,7 @@ + int script = item->script; + Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); + const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); +- const unsigned short ra = script_base + 0x30; ++ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification + const unsigned short halant = script_base + 0x4d; + const unsigned short nukta = script_base + 0x3c; + +@@ -1278,6 +1278,11 @@ + } + #endif + ++ unsigned short *chkAssamese=reordered.data(); ++ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra ++ { ++ ra = script_base + 0x70; ++ } + if (len != 1) { + unsigned short *uc = reordered.data(); + bool beginsWithRa = FALSE; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch new file mode 100644 index 000000000..7583239cc --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -601,7 +601,7 @@ + None, None, None, None, + None, None, None, None, + +- None, None, None, None, ++ Below, None, None, None, + None, None, None, None, + None, None, None, None, + None, None, None, None, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch new file mode 100644 index 000000000..02a40b225 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch @@ -0,0 +1,12 @@ +--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 ++++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 +@@ -149,6 +149,9 @@ + } else { + trmacro = &opt[1]; + } ++ } else if ( opt == "nostdlib") { ++ QStringList x; ++ QApplication::setLibraryPaths(x); + } else if ( opt == "L" ) { + if ( !(n < argc-1) ) { + error = "Missing plugin path."; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch new file mode 100644 index 000000000..6dce7aa80 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch @@ -0,0 +1,14 @@ +--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 ++++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 +@@ -288,8 +288,9 @@ + { + #if defined(QT_CHECK_STATE) + if ( qApp->type() == QApplication::Tty ) { +- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " +- "is being used" ); ++// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " ++// "is being used" ); ++ ; + } + #endif + diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch new file mode 100644 index 000000000..0d03f0809 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 ++++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 +@@ -1412,7 +1412,7 @@ + False, XA_ATOM, &type, &format, &nitems, &after, &data); + + if (type == XA_ATOM && format == 32) { +- ts.writeBlock((const char *) data, nitems * 4); ++ ts.writeBlock((const char *) data, nitems * sizeof(long)); + offset += nitems; + } else + after = 0; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch new file mode 100644 index 000000000..a9cfaf4c3 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 ++++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 +@@ -975,7 +981,7 @@ + }; + const XftDefaultFont defaults[] = { + { "Serif", "serif", FALSE }, +- { "Sans Serif", "sans-serif", FALSE }, ++ { "Sans", "sans-serif", FALSE }, + { "Monospace", "monospace", TRUE }, + { 0, 0, FALSE } + }; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch new file mode 100644 index 000000000..ee960442e --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch @@ -0,0 +1,92 @@ +--- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200 ++++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200 +@@ -1904,9 +1904,6 @@ + + void QTextEdit::removeSelectedText( int selNum ) + { +- if(selNum != 0) +- resetInputContext(); +- + QTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); + QTextCursor c2 = doc->selectionEndCursor( selNum ); +@@ -3169,7 +3166,6 @@ + return; + } + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3196,7 +3192,6 @@ + return; + } + #endif +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3238,7 +3233,6 @@ + if ( d->optimMode ) + return; + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3283,7 +3277,6 @@ + if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3334,7 +3327,6 @@ + if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3448,7 +3440,6 @@ + { + if ( isReadOnly() ) + return; +- resetInputContext(); + normalCopy(); + removeSelectedText(); + updateMicroFocusHint(); +@@ -3936,7 +3927,6 @@ + return; + } + #endif +- resetInputContext(); + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) + return; +@@ -4110,7 +4100,6 @@ + if ( !p ) + return; + +- resetInputContext(); + if ( index > p->length() - 1 ) + index = p->length() - 1; + +@@ -4167,7 +4156,6 @@ + return; + } + #endif +- resetInputContext(); + if ( doc->hasSelection( selNum ) ) { + doc->removeSelection( selNum ); + repaintChanged(); +@@ -5074,7 +5062,6 @@ + } + if ( dc == doc ) + return; +- resetInputContext(); + doc = dc; + delete cursor; + cursor = new QTextCursor( doc ); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch new file mode 100644 index 000000000..efc24c8a1 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch @@ -0,0 +1,36 @@ +--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 +@@ -87,7 +87,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch new file mode 100644 index 000000000..f2351909f --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch @@ -0,0 +1,14 @@ +--- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 ++++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 +@@ -994,7 +994,10 @@ + #endif + + QFile file( filename + ".tmp" ); +- if (! file.open(IO_WriteOnly)) { ++ mode_t old_umask = umask(0022); ++ bool f = file.open(IO_WriteOnly); ++ umask(old_umask); ++ if (! f) { + + #ifdef QT_CHECK_STATE + qWarning("QSettings::sync: failed to open '%s' for writing", diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch new file mode 100644 index 000000000..c1ff66c2c --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 ++++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 +@@ -817,7 +817,7 @@ + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + </GROUP> +- <GROUP><Name>QtGenerated</NAME> ++ <GROUP><NAME>QtGenerated</NAME> + $$CODEWARRIOR_QPREPROCESS_GROUP + $$CODEWARRIOR_QPREPROCESSOUT_GROUP + </GROUP> diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch new file mode 100644 index 000000000..341cab7e1 --- /dev/null +++ b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch @@ -0,0 +1,24 @@ +diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 +@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) + out << "/****************************************************************************" << endl; + out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; + out << "**" << endl; +- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; ++ out << "** Created by User Interface Compiler" << endl; + out << "**" << endl; + out << "** WARNING! All changes made in this file will be lost!" << endl; + out << "****************************************************************************/" << endl << endl; +diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 +@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const + for ( it = images.begin(); it != images.end(); ++it ) + out << "** " << *it << "\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created by The User Interface Compiler" << "\n"; + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; + out << "****************************************************************************/\n"; diff --git a/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch new file mode 100644 index 000000000..0c93c416a --- /dev/null +++ b/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch @@ -0,0 +1,25 @@ +--- qt-x11-free-3.3.7/src/tools/qglobal.h.orig 2007-04-24 09:02:36.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qglobal.h 2007-04-24 09:03:02.000000000 -0400 +@@ -315,9 +315,9 @@ + QString bloat. However, gcc 3.4 doesn't allow us to create references to + members of a packed struct. (Pointers are OK, because then you + supposedly know what you are doing.) */ +-# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) ++# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__) + # define Q_PACKED __attribute__ ((packed)) +-# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 ++# if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + # define Q_NO_PACKED_REFERENCE + # endif + # endif +--- qt-x11-free-3.3.7/src/tools/qstring.h.orig 2007-04-24 09:03:11.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qstring.h 2007-04-24 09:03:27.000000000 -0400 +@@ -194,7 +194,7 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort *)&ucs); } + #else + ushort &unicode() { return ucs; } + #endif diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.patch b/redhat/dependencies/qt3/qt3-3.5.13.2.patch new file mode 100644 index 000000000..6c9a6f8f0 --- /dev/null +++ b/redhat/dependencies/qt3/qt3-3.5.13.2.patch @@ -0,0 +1,516 @@ +commit 1ee1ffbae69dc78721af139f0794628571fd35ef +Author: Slávek Banko <slavek.banko@axis.cz> +Date: 1386900429 +0100 + + Fix FTBFS with libfreetype6 >= 2.5.x + This resolves Bug 1765 + +diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test +index 5cabc32..d4cb4ba 100755 +--- a/config.tests/x11/xfreetype.test ++++ b/config.tests/x11/xfreetype.test +@@ -116,12 +116,15 @@ fi + # check for freetype2 headers + FREETYPE2_INCDIR= + if [ "$XFT" = "yes" ]; then +- INC="freetype2/freetype/freetype.h" + XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` + LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` + INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" + F= + for INCDIR in $INCDIRS; do ++ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1 ++ if ! [ -f $INCDIR/$INC ]; then ++ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1 ++ fi + if [ -f $INCDIR/$INC ]; then + # detect major version of freetype2 + FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` +--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 ++++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 +@@ -501,10 +501,10 @@ + (*f).latin1(), + (const char*) QFile::encodeName( old->library() ) ); + } else { +- qWarning("%s: Feature %s already defined in %s!", ++/* qWarning("%s: Feature %s already defined in %s!", + (const char*) QFile::encodeName( old->library() ), + (*f).latin1(), +- (const char*) QFile::encodeName( plugin->library() ) ); ++ (const char*) QFile::encodeName( plugin->library() ) ); */ + } + } + } +--- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 ++++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 +@@ -11,7 +11,7 @@ + install: FORCE + @$(MAKE) qt.install + +-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples ++all: symlinks src-qmake src-moc sub-src sub-tools + @echo + @echo "The Qt library is now built in ./lib" + @echo "The Qt examples are built in the directories in ./examples" +--- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 ++++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 +@@ -4748,10 +4748,11 @@ + + // GB18030 fonts on Turbolinux + static const psfont SongGBK2K [] = { +- { "MSung-Light-GBK2K-H", 0, 100. }, +- { "MSung-Italic-GBK2K-H", 0, 100. }, +- { "MSung-Bold-GBK2K-H", 0, 100. }, +- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ { "MSungGBK-Light-GBK2K-H", 0, 100. }, ++ + }; + static const psfont KaiGBK2K [] = { + { "MKai-Medium-GBK2K-H", 0, 100. }, +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 +@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy + toPos += 2; + if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { + if (matra_position == Post || matra_position == Split) { +- toPos = matra+1; ++ if (matra_position == Post ) ++ toPos = matra; ++ else ++ toPos = matra+1; + matra -= 2; + } + } else if (script == QFont::Kannada) { +--- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200 ++++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200 +@@ -261,7 +261,7 @@ + Other, Other, Other, Other, + Other, Other, Other, Other, + +- Other, Other, Other, Other, ++ Other, Other, VowelMark, VowelMark, + Other, Other, Other, Other, + Other, Other, Other, Other, + Other, Other, Other, Other, +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 +@@ -868,7 +868,7 @@ + None, None, None, None, + None, None, None, Post, + +- Post, None, Below, None, ++ None, None, None, None, + None, Post, None, None, + None, None, None, None, + None, None, Post, Post, +@@ -1271,6 +1271,16 @@ + int base = 0; + int reph = -1; + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ bool is_special_conjuction_malayalam = false; ++ ++ if ((len == 3) && ++ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && ++ (reordered[1] == 0x0d4d) && ++ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { ++ is_special_conjuction_malayalam = true; ++ } ++ + #ifdef INDIC_DEBUG + IDEBUG("original:"); + for (i = 0; i < len; i++) { +@@ -1547,6 +1557,15 @@ + reph = i; + } + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned short temp; ++ ++ temp = reordered[0]; ++ reordered[0] = reordered[2]; ++ reordered[2] = temp; ++ } ++ + if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, + &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) + return FALSE; +@@ -1658,6 +1677,15 @@ + + // halant always applies + ++ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam ++ if (is_special_conjuction_malayalam) { ++ unsigned int temp; ++ ++ temp = properties[0]; ++ properties[0] = ~PreSubstProperty; ++ properties[2] = temp; ++ } ++ + #ifdef INDIC_DEBUG + { + IDEBUG("OT properties:"); +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 +@@ -864,7 +864,7 @@ + None, None, None, Post, + + None, None, None, None, +- None, Post, None, None, ++ None, None, None, None, + None, None, None, None, + None, None, Post, Post, + +diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp +--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 +@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri + if ( script >= QFont::Arabic && script <= QFont::Khmer ) { + // complex script shaping. Have to do some hard work + int from = QMAX( 0, pos - 8 ); +- int to = QMIN( (int)str.length(), pos + 8 ); ++ int to = str.length(); + QConstString cstr( str.unicode()+from, to-from); + QTextEngine layout( cstr.string(), d ); + layout.itemize( QTextEngine::WidthOnly ); +--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 +@@ -786,7 +786,7 @@ + Below, None, Below, Below, + Below, Below, Below, Below, + +- Below, None, Below, Below, ++ Below, Below, Below, Below, + None, Below, Below, Below, + Below, Below, None, None, + None, None, Post, Above, +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -1240,7 +1240,7 @@ + int script = item->script; + Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); + const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); +- const unsigned short ra = script_base + 0x30; ++ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification + const unsigned short halant = script_base + 0x4d; + const unsigned short nukta = script_base + 0x3c; + +@@ -1278,6 +1278,11 @@ + } + #endif + ++ unsigned short *chkAssamese=reordered.data(); ++ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra ++ { ++ ra = script_base + 0x70; ++ } + if (len != 1) { + unsigned short *uc = reordered.data(); + bool beginsWithRa = FALSE; +--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 ++++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 +@@ -601,7 +601,7 @@ + None, None, None, None, + None, None, None, None, + +- None, None, None, None, ++ Below, None, None, None, + None, None, None, None, + None, None, None, None, + None, None, None, None, +--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 ++++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 +@@ -149,6 +149,9 @@ + } else { + trmacro = &opt[1]; + } ++ } else if ( opt == "nostdlib") { ++ QStringList x; ++ QApplication::setLibraryPaths(x); + } else if ( opt == "L" ) { + if ( !(n < argc-1) ) { + error = "Missing plugin path."; +--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 ++++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 +@@ -288,8 +288,9 @@ + { + #if defined(QT_CHECK_STATE) + if ( qApp->type() == QApplication::Tty ) { +- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " +- "is being used" ); ++// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " ++// "is being used" ); ++ ; + } + #endif + +--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 ++++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 +@@ -1412,7 +1412,7 @@ + False, XA_ATOM, &type, &format, &nitems, &after, &data); + + if (type == XA_ATOM && format == 32) { +- ts.writeBlock((const char *) data, nitems * 4); ++ ts.writeBlock((const char *) data, nitems * sizeof(long)); + offset += nitems; + } else + after = 0; +--- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 ++++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 +@@ -975,7 +981,7 @@ + }; + const XftDefaultFont defaults[] = { + { "Serif", "serif", FALSE }, +- { "Sans Serif", "sans-serif", FALSE }, ++ { "Sans", "sans-serif", FALSE }, + { "Monospace", "monospace", TRUE }, + { 0, 0, FALSE } + }; +--- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200 ++++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200 +@@ -1904,9 +1904,6 @@ + + void QTextEdit::removeSelectedText( int selNum ) + { +- if(selNum != 0) +- resetInputContext(); +- + QTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); + QTextCursor c2 = doc->selectionEndCursor( selNum ); +@@ -3169,7 +3166,6 @@ + return; + } + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3196,7 +3192,6 @@ + return; + } + #endif +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3238,7 +3233,6 @@ + if ( d->optimMode ) + return; + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3283,7 +3277,6 @@ + if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3334,7 +3327,6 @@ + if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3448,7 +3440,6 @@ + { + if ( isReadOnly() ) + return; +- resetInputContext(); + normalCopy(); + removeSelectedText(); + updateMicroFocusHint(); +@@ -3936,7 +3927,6 @@ + return; + } + #endif +- resetInputContext(); + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) + return; +@@ -4110,7 +4100,6 @@ + if ( !p ) + return; + +- resetInputContext(); + if ( index > p->length() - 1 ) + index = p->length() - 1; + +@@ -4167,7 +4156,6 @@ + return; + } + #endif +- resetInputContext(); + if ( doc->hasSelection( selNum ) ) { + doc->removeSelection( selNum ); + repaintChanged(); +@@ -5074,7 +5062,6 @@ + } + if ( dc == doc ) + return; +- resetInputContext(); + doc = dc; + delete cursor; + cursor = new QTextCursor( doc ); +--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 +@@ -84,7 +84,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 +@@ -87,7 +87,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip +-QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_STRIP = ++QMAKE_STRIPFLAGS_LIB += + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +--- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 ++++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 +@@ -994,7 +994,10 @@ + #endif + + QFile file( filename + ".tmp" ); +- if (! file.open(IO_WriteOnly)) { ++ mode_t old_umask = umask(0022); ++ bool f = file.open(IO_WriteOnly); ++ umask(old_umask); ++ if (! f) { + + #ifdef QT_CHECK_STATE + qWarning("QSettings::sync: failed to open '%s' for writing", +--- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 ++++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 +@@ -817,7 +817,7 @@ + <PATHFORMAT>MacOS</PATHFORMAT> + </FILEREF> + </GROUP> +- <GROUP><Name>QtGenerated</NAME> ++ <GROUP><NAME>QtGenerated</NAME> + $$CODEWARRIOR_QPREPROCESS_GROUP + $$CODEWARRIOR_QPREPROCESSOUT_GROUP + </GROUP> +diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 +@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) + out << "/****************************************************************************" << endl; + out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; + out << "**" << endl; +- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; ++ out << "** Created by User Interface Compiler" << endl; + out << "**" << endl; + out << "** WARNING! All changes made in this file will be lost!" << endl; + out << "****************************************************************************/" << endl << endl; +diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 +@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const + for ( it = images.begin(); it != images.end(); ++it ) + out << "** " << *it << "\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created by The User Interface Compiler" << "\n"; + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; + out << "****************************************************************************/\n"; +--- a/qmake/project.cpp.orig 2015-04-10 17:15:10.731091347 +0200 ++++ b/qmake/project.cpp 2013-12-30 17:58:15.471703644 +0100 +@@ -685,7 +685,7 @@ + // fprintf(stderr,"Current QT version number: " + ver + "\n"); + if (ver != "" && ver != test_version) { + ver = test_version; +- fprintf(stderr,"Changed QT version number to " + test_version + "!\n"); ++ fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii()); + } + } + } +--- qt3/src/tools/qgdict.cpp 2015-04-10 17:15:11.057092017 +0200 ++++ qt3/src/tools/qgdict.cpp 2013-12-30 17:58:15.516704273 +0100 +@@ -846,11 +846,11 @@ + QString line; + line.fill( '-', 60 ); + double real, ideal; +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + qDebug( "DICTIONARY STATISTICS:" ); + if ( count() == 0 ) { + qDebug( "Empty!" ); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + return; + } + real = 0.0; +@@ -871,7 +871,7 @@ + while ( b-- ) + *pbuf++ = '*'; + *pbuf = '\0'; +- qDebug( buf ); ++ qDebug( "%s", buf ); + i++; + } + qDebug( "Array size = %d", size() ); +@@ -879,7 +879,7 @@ + qDebug( "Real dist = %g", real ); + qDebug( "Rand dist = %g", ideal ); + qDebug( "Real/Rand = %g", real/ideal ); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + #endif // QT_DEBUG + } + +--- a/src/tools/qgcache.cpp 2015-04-10 17:15:11.053092009 +0200 ++++ b/src/tools/qgcache.cpp 2013-12-30 17:58:15.515704259 +0100 +@@ -641,7 +641,7 @@ + #if defined(QT_DEBUG) + QString line; + line.fill( '*', 80 ); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + qDebug( "CACHE STATISTICS:" ); + qDebug( "cache contains %d item%s, with a total cost of %d", + count(), count() != 1 ? "s" : "", tCost ); +@@ -662,7 +662,7 @@ + lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts ); + qDebug( "Statistics from internal dictionary class:" ); + dict->statistics(); +- qDebug( line.ascii() ); ++ qDebug( "%s", line.ascii() ); + #endif + } + diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec index 0c4d25c81..b997dd9ec 100644 --- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec +++ b/redhat/dependencies/qt3/qt3-3.5.13.2.spec @@ -10,7 +10,12 @@ # qt-devel # ...maybe others !!!! +%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 +Name: qt +%else Name: qt3 +%endif + Epoch: 1 Version: 3.3.8.d%{?preversion:_%{preversion}} Release: 10%{?dist} @@ -20,13 +25,10 @@ License: QPL or GPLv2 or GPLv3 Group: System Environment/Libraries URL: http://www.trinitydesktop.org/ -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} + Source0: trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}.tar.gz Source2: qt.sh Source3: qt.csh @@ -35,31 +37,8 @@ Source5: assistant3.desktop Source6: linguist3.desktop Source7: qtconfig3.desktop -Patch1: qt-3.3.4-print-CJK.patch -Patch2: qt-3.0.5-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: qt-x11-free-3.3.7-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: qt-x11-free-3.3.2-quiet.patch -Patch12: qt-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch25: qt-x11-free-3.3.8b-uic-multilib.patch -Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch -Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch -Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch -Patch32: qt-3.3.6-fontrendering-214371.patch -Patch33: qt-3.3.8-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch +# Monolithic patch for QT3 for TDE 3.5.13.2 +Patch1: qt3-3.5.13.2.patch %define qt_dirname qt-3.3 %define qtdir %{_libdir}/%{qt_dirname} @@ -135,21 +114,71 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif +%description +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains the shared library needed to run Qt 3 +applications, as well as the README files for Qt 3. + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc FAQ LICENSE* README* changes* +%dir %{qtdir} +%dir %{qtdir}/bin +%dir %{qtdir}/lib +%dir %{qtdir}/plugins +%dir %{qtdir}/plugins/sqldrivers +%dir %{qtdir}/plugins/styles +%{qtdir}/translations +%{qtdir}/plugins/designer/ +%if %{immodule} +%{qtdir}/plugins/inputmethods +%endif +%config /etc/profile.d/* +/etc/ld.so.conf.d/* +%{qtdir}/lib/libqui.so.* +%{qtdir}/lib/libqt*.so.* + +########## %package config Summary: Graphical configuration tool for programs using Qt 3 Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-config = %{?epoch:%{epoch}:}%{version}-%{release} -%endif +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-config = %{?epoch:%{epoch}:}%{version}-%{release} +%description config +Qt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +Qt is written in C++ and is fully object-oriented. + +This package contains a graphical configuration tool for programs using Qt 3. + +%files config +%defattr(-,root,root,-) +%{qtdir}/bin/qtconfig +%{_datadir}/applications/*qtconfig*.desktop +%{_datadir}/pixmaps/qtconfig3.png + +########## %package devel Summary: Development files for the Qt 3 GUI toolkit Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: freetype-devel Requires: fontconfig-devel Requires: libpng-devel @@ -172,87 +201,6 @@ Requires: xorg-x11-proto-devel Requires: mesa-libGL-devel Requires: mesa-libGLU-devel %endif -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%package designer -Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-designer = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - - -%description -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run Qt 3 -applications, as well as the README files for Qt 3. - - -%description config -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using Qt 3. - %description devel The %{name}-devel package contains the files necessary to develop @@ -262,66 +210,149 @@ object compiler. Install %{name}-devel if you want to develop GUI applications using the Qt 3 toolkit. +%files devel +%defattr(-,root,root,-) +%{qt_docdir}/ +%{qtdir}/bin/moc +%{qtdir}/bin/uic +%{qtdir}/bin/findtr +%{qtdir}/bin/qt20fix +%{qtdir}/bin/qtrename140 +%{qtdir}/bin/assistant +%{qtdir}/bin/qm2ts +%{qtdir}/bin/qmake +%{qtdir}/bin/qembed +%{qtdir}/bin/linguist +%{qtdir}/bin/lupdate +%{qtdir}/bin/lrelease +%{qtdir}/include +%{qtdir}/mkspecs +%{qtdir}/lib/libqt*.so +%{qtdir}/lib/libqui.so +%{qtdir}/lib/libeditor.a +%{qtdir}/lib/libdesigner*.a +%{qtdir}/lib/libqassistantclient.a +%{qtdir}/lib/*.prl +%{qtdir}/phrasebooks +%{_libdir}/pkgconfig/* +%{_datadir}/applications/*linguist*.desktop +%{_datadir}/applications/*assistant*.desktop +%{_datadir}/pixmaps/linguist3.png +%{_datadir}/pixmaps/assistant3.png + +# QT 3.3.8.D (TDE): 4 binaries have appeared +%{qtdir}/bin/createcw +%{qtdir}/bin/makeqpf +%{qtdir}/bin/mergetr +%{qtdir}/bin/msg2qm + +########## + +%package devel-docs +Summary: Documentation for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 +Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release} +%endif %description devel-docs The %{name}-devel-docs package contains the man pages, the HTML documentation and example programs for Qt 3. +%files devel-docs +%defattr(-,root,root,-) +%doc examples +%doc tutorial +%{_mandir}/*/* + +########## + +%package ODBC +Summary: ODBC drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-ODBC = %{?epoch:%{epoch}:}%{version}-%{release} %description ODBC ODBC driver for Qt 3's SQL classes (QSQL) +%files ODBC +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlodbc.so + +########## + +%package MySQL +Summary: MySQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-MySQL = %{?epoch:%{epoch}:}%{version}-%{release} %description MySQL MySQL driver for Qt 3's SQL classes (QSQL) +%files MySQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlmysql.so + +########## + +%package PostgreSQL +Summary: PostgreSQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release} %description PostgreSQL PostgreSQL driver for Qt 3's SQL classes (QSQL) +%files PostgreSQL +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlpsql.so + +########## + +%package sqlite +Summary: sqlite drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} %description sqlite sqlite driver for Qt 3's SQL classes (QSQL) +%files sqlite +%defattr(-,root,root,-) +%{qtdir}/plugins/sqldrivers/libqsqlite.so + +########## + +%package designer +Summary: Interface designer (IDE) for the Qt 3 toolkit +Group: Development/Tools +Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: qt3-designer = %{?epoch:%{epoch}:}%{version}-%{release} %description designer The %{name}-designer package contains an User Interface designer tool for the Qt 3 toolkit. +%files designer +%defattr(-,root,root,-) +%{qtdir}/templates +%{qtdir}/bin/designer +%{_datadir}/applications/*designer*.desktop +%{_datadir}/pixmaps/designer3.png + +########## %prep %setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}} -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%patch25 -p1 -b .uic-multilib -%patch27 -p1 -b .fontrendering-ml_IN-bz#209097 -%patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch31 -p1 -b .fontrendering-te_IN-bz#211259 -%patch32 -p1 -b .fontrendering-bz#214371 -%patch33 -p1 -b .fontrendering-#214570 -%patch34 -p1 -b .fontrendering-#209974 -%patch35 -p1 -b .fontrendering-ml_IN-217657 -%patch37 -p1 -b .fontrendering-gu-228452 -# it's not 100% clear to me if this is safe for all archs -- Rex -%ifarch armv5tel -%patch39 -p1 -b .arm -%endif -%patch40 -p1 - -# immodule patches -%if %{immodule} -%patch53 -p1 -b .resetinputcontext -%endif +%patch1 -p1 -# upstream patches -%patch200 -p1 -b .fullscreen # convert to UTF-8 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ @@ -493,13 +524,13 @@ for a in */*/Makefile ; do mv -v ${a}.2 $a done -install -D -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/qt3.sh -install -D -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/qt3.csh +install -D -m 644 "%{SOURCE2}" %{buildroot}/etc/profile.d/qt3.sh +install -D -m 644 "%{SOURCE3}" %{buildroot}/etc/profile.d/qt3.csh # Add desktop files -mkdir -p %{buildroot}%{_datadir}/applications +mkdir -p "%{buildroot}%{_datadir}/applications" desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ + --dir "%{buildroot}%{_datadir}/applications" \ --vendor="qt" \ %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} @@ -514,145 +545,17 @@ mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf # install icons -mkdir %{buildroot}%{_datadir}/pixmaps -install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png -install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png -install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png -install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png +install -D -m 644 "tools/assistant/images/qt.png" "%{buildroot}%{_datadir}/pixmaps/qtconfig3.png" +install -D -m 644 "tools/assistant/images/designer.png" "%{buildroot}%{_datadir}/pixmaps/designer3.png" +install -D -m 644 "tools/assistant/images/assistant.png" "%{buildroot}%{_datadir}/pixmaps/assistant3.png" +install -D -m 644 "tools/assistant/images/linguist.png" "%{buildroot}%{_datadir}/pixmaps/linguist3.png" # own style directory -mkdir -p %{buildroot}%{qtdir}/plugins/styles +mkdir -p "%{buildroot}%{qtdir}/plugins/styles" + %clean rm -rf %{buildroot} -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ -%if %{immodule} -%{qtdir}/plugins/inputmethods -%endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libqui.so.* -%{qtdir}/lib/libqt*.so.* - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -%files devel -%defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libqt*.so -%{qtdir}/lib/libqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks -%{_libdir}/pkgconfig/* -%{_datadir}/applications/*linguist*.desktop -%{_datadir}/applications/*assistant*.desktop -%{_datadir}/pixmaps/linguist3.png -%{_datadir}/pixmaps/assistant3.png - -# QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm - - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-10 -- Initial release for TDE 3.5.13.2 - -* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9 -- Initial release for TDE 3.5.13.1 - -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8 -- Fix Provides and Obsoletes, again and again ... - -* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7 -- Fix Provides and Obsoletes. Now only for RHEL 5. - -* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6 -- Fix Qt3 builds with libpng15. [Bug #683] - -* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5 -- Fix 'Provides' AGAIN !! [Bug #823] - -* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4 -- Fix 'Provides' [Bug #823] - -* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3 -- Updates zh_TW translations, thanks to Wei-Lun Chao . - -* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2 -- Add missing BuildRequires - -* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 -- Switch to Trinity Version -- Spec file based on RHEL 6 'qt3-3.3.8b-29' diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec index 7e10966e9..6432e8099 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package sip4-tqt (version R14.0.0) +# spec file for package sip4-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -27,7 +27,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -40,18 +42,13 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# 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 - %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.10.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Python/C++ bindings generator runtime library Group: Development/Tools/Building URL: http://www.trinitydesktop.org/ @@ -175,5 +172,3 @@ cd build %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:4.10.5-1 -- Initial release for TDE R14 diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec index d078dee46..0323731dc 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqca-tls (version R14.0.0) +# spec file for package tqca-tls (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TLS plugin for the TQt Cryptographic Architecture Group: Applications/Internet URL: http://delta.affinix.com/qca/ @@ -114,5 +116,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec index 808415d93..8892b1ec2 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -24,16 +24,16 @@ %define tde_libdir %{tde_prefix}/%{_lib} %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libtqt3 %{_lib}tqt3 +%define libtqt3 %{_lib}qt3 %else -%define libtqt3 libtqt3 +%define libtqt3 libqt3 %endif Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Summary: TLS plugin for the TQt Cryptographic Architecture Group: Applications/Internet URL: http://delta.affinix.com/qca/ @@ -120,11 +120,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Build for Fedora 19 - -* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Renames TQCA to QCA in source code - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec index 4360cd56c..a6e59e772 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqca (version R14.0.0) +# spec file for package tqca (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqca %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt Cryptographic Architecture Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ @@ -148,12 +150,18 @@ unset QTDIR QTINC QTLIB --qtdir=/usr \ --debug + +# Workaround strange tqmake behaviour in RHEL5 +%if 0%{?rhel} == 5 +%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g" +%endif + %__make %{?_smp_mflags} %install %__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT=$RPM_BUILD_ROOT +%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/" %clean @@ -161,5 +169,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec index 2c6567fd3..629131436 100644 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -33,7 +33,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt Cryptographic Architecture Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ @@ -162,11 +162,3 @@ unset QTDIR QTINC QTLIB %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3 -- Build for Fedora 19 - -* Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-2 -- Renames TQCA to QCA in source code - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec index b8c7e0690..b9d293309 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqscintilla (version R14.0.0) +# spec file for package tqscintilla (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,12 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqscintilla %define tde_prefix /opt/trinity %define tde_datadir %{tde_prefix}/share @@ -33,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.7.1 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt source code editing component based on Scintilla Group: Development/Libraries/C and C++ URL: http://www.trinitydesktop.org/ @@ -172,6 +174,11 @@ export QTDIR=%{_libdir}/tqt3 unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +# Workaround strange tqmake behaviour in RHEL5 +%if 0%{?rhel} == 5 +%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g" +%endif + %__make %{?_smp_mflags} -C qt %__make %{?_smp_mflags} -C designer @@ -186,29 +193,28 @@ export QTDIR=%{_libdir}/tqt3 # Installs supplementary headers for i in include/*.h; do - %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/} + %__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/} done # Installs the HTML documentation correctly for i in doc/html/*; do - %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/} + %__install -D -m 644 $i %{buildroot}%{tde_tdedocdir}/HTML/en/%{name}/${i##*/} done # Installs the Designer plugin -for i in designer/*.so; do - %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} +for i in designer/*.so ${QTDIR}/plugins/designer/*.so; do + [ -r "${i}" ] || continue + %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} done # Installs libraries %__mkdir_p %{buildroot}%{_libdir} %__mv -f tmplib/* %{buildroot}%{_libdir} - # Fix private headers location %__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3 %__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla - # Fix permissions chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h @@ -219,5 +225,3 @@ chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.7.1-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 893e10952..dda0eb54c 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqt3 (version R14.0.0) +# spec file for package tqt3 (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,11 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt3 %{_lib}tqt3 @@ -27,7 +29,7 @@ Name: trinity-tqt3 Version: 3.5.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: TQt GUI Library, Version 3 Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -109,15 +111,10 @@ BuildRequires: cups-devel %{?uuid_devel:BuildRequires: %{uuid_devel}} # LIBAUDIO support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%define with_nas 1 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_nas 1 %define libaudio_devel nas-devel %endif -%if 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%define libaudio_devel libaudio-devel -%endif -%endif %{?libaudio_devel:BuildRequires: %{libaudio_devel}} # Xrender support @@ -134,8 +131,12 @@ BuildRequires: cups-devel %define xrandr_devel libXrandr-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +%define xrandr_devel %{_lib}xrandr2-devel +%else %define xrandr_devel libxrandr-devel %endif +%endif %{?xrandr_devel:BuildRequires: %{xrandr_devel}} # Xcursor support @@ -225,7 +226,7 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel %define xi_devel xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%define xi_devel %{_lib}xi-devel +%define xi_devel libxi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} %define xi_devel libXi-devel @@ -246,8 +247,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: MesaGLU-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -262,6 +267,11 @@ BuildRequires: unixODBC-devel # SQLITE support BuildRequires: sqlite-devel +# SQLITE3 support +%if 0%{?mgaversion} +BuildRequires: sqlite3-devel +%endif + # POSTGRESQL support BuildRequires: postgresql BuildRequires: postgresql-devel @@ -272,6 +282,24 @@ BuildRequires: postgresql-devel BuildRequires: firebird-devel %endif +# FBCLIENT support +%if 0%{?mgaversion} >= 6 +BuildRequires: %{_lib}fbclient-devel +%endif + +# NIS support +%define with_nis 1 + +# RPC support +%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 +%if 0%{?fedora} +BuildRequires: libnsl2-devel +%else +BuildRequires: libnsl-devel +%endif +BuildRequires: libtirpc-devel +%endif + # x86_64 specific stuff %if "%{_lib}" != "lib" %if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2) @@ -1250,7 +1278,12 @@ things that are possible with TQt3. # Fix strange FTBFS on RHEL5 %if 0%{?rhel} == 5 -%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|" +%__sed -i "src/kernel/ntqstyle.h" -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|" +%endif + +%if 0%{?suse_version} +echo "suse_version = %{?suse_version}" +echo "sle_version = %{?sle_version}" %endif # Add missing sqlite3 header @@ -1291,6 +1324,8 @@ for d in \ %{_includedir}/Xft2/X11/Xft \ %{_includedir}/mysql \ %{_includedir}/libpng15 \ + %{_includedir}/libpng16 \ + %{_includedir}/tirpc \ ; do if [ -d "${d}" ]; then INCDIRS="${INCDIRS} -I${d}" @@ -1332,7 +1367,7 @@ echo yes | ./configure \ -platform linux-g++ \ %endif \ - -nis \ + %{?with_nis:-nis} %{?!with_nis:-no-nis} \ -no-pch \ -cups \ -stl \ @@ -1504,5 +1539,3 @@ chmod 644 "%{?buildroot}%{_datadir}/tqt3/mkspecs/"*/* %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 8b71f3508..09c1cab1d 100755..100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqtinterface (version R14.0.0) +# spec file for package tqtinterface (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -21,15 +21,12 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# 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 - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -39,7 +36,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -69,10 +66,26 @@ BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig +# UUID support +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%define uuid_devel libuuid-devel +%endif +%if 0%{?rhel} == 5 +%define uuid_devel e2fsprogs-devel +%endif +%{?uuid_devel:BuildRequires: %{uuid_devel}} + + # PTHREAD support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} >= 5 || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: pth-devel %endif +%if 0%{?fedora} && 0%{?fedora} <= 26 +BuildRequires: pth-devel +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1500 +BuildRequires: libpth-devel +%endif # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -92,7 +105,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel +BuildRequires: libxi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -257,5 +270,3 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-1 -- Initial release for TDE 14.0.0 diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec index dd8704c7d..127e0b908 100755..100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # BUILD WARNING: @@ -25,11 +25,6 @@ %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules -# 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 - %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt4 %{_lib}tqt4 %else @@ -39,7 +34,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 4.2.0 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} Summary: The Trinity Qt Interface Libraries Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -69,6 +64,9 @@ BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig +# UUID support +BuildRequires: libuuid-devel + # PTHREAD support %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} BuildRequires: pth-devel @@ -92,7 +90,7 @@ BuildRequires: Mesa-libGLU-devel BuildRequires: xorg-x11-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel +BuildRequires: libxi-devel %endif %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: libXi-devel @@ -152,6 +150,7 @@ Provides: libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: qt3-devel >= 3.3.8d +Requires: libuuid-devel %if 0%{?suse_version} && 0%{?suse_version} < 1300 Requires: trinity-cmake-macros @@ -269,11 +268,3 @@ done %changelog -* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-3 -- Rename package to 'libtqt4' - -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 |