diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-06-26 22:46:07 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-06-26 22:46:07 +0200 |
| commit | a62bf523e93cfc54151ad9c13bb67a135fd676fd (patch) | |
| tree | c28c0d549a28457dd5a0b722238048e9bfce983f /redhat/dependencies | |
| parent | 502bd62dcfc36b32315f763557ab943edbc0a75a (diff) | |
| download | tde-packaging-a62bf523e93cfc54151ad9c13bb67a135fd676fd.tar.gz tde-packaging-a62bf523e93cfc54151ad9c13bb67a135fd676fd.zip | |
RPM Packaging: initial support for R14.0.0
Diffstat (limited to 'redhat/dependencies')
48 files changed, 1609 insertions, 1711 deletions
diff --git a/redhat/dependencies/arts/trinity-arts-14.0.0.spec b/redhat/dependencies/arts/trinity-arts-14.0.0.spec new file mode 100644 index 000000000..8a2c5c242 --- /dev/null +++ b/redhat/dependencies/arts/trinity-arts-14.0.0.spec @@ -0,0 +1,239 @@ +# 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 + +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_datadir %{tde_prefix}/share + +%define tde_tdeincludedir %{tde_includedir}/tde + +%define _docdir %{tde_datadir}/doc + +Name: trinity-arts +Version: 14.0.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +License: GPL +Summary: aRts (analog realtime synthesizer) - the TDE sound system +Group: System Environment/Daemons + +Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ +Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: kcmartsrc-pulseaudio + +BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: audiofile-devel +BuildRequires: alsa-lib-devel +BuildRequires: glib2-devel +BuildRequires: gsl-devel +BuildRequires: libvorbis-devel + +# ESOUND support +%define with_esound 1 +BuildRequires: esound-devel + +# JACK support +# Not on RHEL4 ! +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%define with_jack 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}jack-devel +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} +BuildRequires: jack-audio-connection-kit-devel +%endif +%if 0%{?suse_version} +BuildRequires: libjack-devel +%endif +%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%{?suse_version} +%if 0%{?suse_version} >= 1220 +BuildRequires: libltdl-devel +%else +BuildRequires: libtool +%endif +%endif + +# MAD support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%define with_libmad 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}mad-devel +%endif +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +BuildRequires: libmad-devel +%endif +%endif + +# Pulseaudio config file +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} +%define with_pulseaudio 1 +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 + +Requires: trinity-tqtinterface >= %{version} +Requires: audiofile + +%if "%{?tde_prefix}" == "/usr" +Obsoletes: arts +%endif + +%description +arts (analog real-time synthesizer) is the sound system of KDE 3. + +The principle of arts is to create/process sound using small modules which do +certain tasks. These may be create a waveform (oscillators), play samples, +filter data, add signals, perform effects like delay/flanger/chorus, or +output the data to the soundcard. + +By connecting all those small modules together, you can perform complex +tasks like simulating a mixer, generating an instrument or things like +playing a wave file with some effects. + +%files +%defattr(-,root,root,-) +%doc COPYING.LIB +%dir %{tde_libdir}/mcop +%dir %{tde_libdir}/mcop/Arts +%{tde_libdir}/mcop/Arts/* +%{tde_libdir}/mcop/*.mcopclass +%{tde_libdir}/mcop/*.mcoptype +%{tde_libdir}/lib*.so.* +%{tde_bindir}/artscat +%{tde_bindir}/artsd +%{tde_bindir}/artsdsp +%{tde_bindir}/artsplay +%{tde_bindir}/artsrec +%{tde_bindir}/artsshell +%{tde_bindir}/artswrapper +# The '.la' files are runtime, not devel ! +%{tde_libdir}/lib*.la + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +########## + +%package devel +Group: Development/Libraries +Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} +%if "%{?tde_prefix}" == "/usr" +Obsoletes: arts-devel +%endif + +%description devel +Development files for %{name} + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/mcopidl +# Arts includes are under 'tde' - this is on purpose ! +%{tde_tdeincludedir}/arts/ +# Artsc includes are not under 'tde'. +%{tde_includedir}/artsc/ +%{tde_bindir}/artsc-config +%{tde_libdir}/lib*.so +%{tde_libdir}/pkgconfig/*.pc +%{tde_libdir}/*.a + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +########## + +%if 0%{?with_pulseaudio} + +%package config-pulseaudio +Group: System Environment/Daemons +Summary: %{name} - Default configuration file for Pulseaudio +Requires: %{name} = %{version}-%{release} + +%description config-pulseaudio +%{summary} + +%files config-pulseaudio +%defattr(-,root,root,-) +%{tde_datadir}/config/kcmartsrc + +%endif + +########## + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + +########## + + +%prep +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} + + +%build +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \ + -DWITH_ALSA=ON \ + -DWITH_AUDIOFILE=ON \ + -DWITH_VORBIS=ON \ + %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ + %{?with_esound:-DWITH_ESOUND=ON} \ + %{?with_jack:-DWITH_JACK=ON} \ + -DCMAKE_SKIP_RPATH=OFF \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf %{?buildroot} +%__make install -C build DESTDIR=%{?buildroot} + +# Installs the Pulseaudio configuration file +%if 0%{?with_pulseaudio} +%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/config/kcmartsrc +%endif + + +%clean +%__rm -rf %{?buildroot} + + +%changelog +* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.2.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.2.spec index e7f5afe36..0c72fdc6c 100644 --- a/redhat/dependencies/arts/trinity-arts-3.5.13.2.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.2.spec @@ -16,8 +16,8 @@ Name: trinity-arts Version: 3.5.13.2 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPL -Summary: aRts (analog realtime synthesizer) - the KDE sound system -Group: System Environment/Daemons +Summary: aRts (analog realtime synthesizer) - the TDE sound system +Group: System Environment/Daemons Vendor: Trinity Project URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/arts/trinity-arts-r14.spec b/redhat/dependencies/arts/trinity-arts-r14.spec deleted file mode 100644 index 4e9c33264..000000000 --- a/redhat/dependencies/arts/trinity-arts-r14.spec +++ /dev/null @@ -1,123 +0,0 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _variant .opt -%endif - - -Name: trinity-arts -Version: r14 -Release: 1%{?dist}%{?_variant} -License: GPL -Summary: aRts (analog realtime synthesizer) - the TDE sound system -Group: System Environment/Daemons - -Vendor: Trinity Project -URL: http://www.trinitydesktop.org/ -Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: arts-%{version}.tar.gz - -BuildRequires: cmake >= 2.8 -BuildRequires: tqtinterface-devel -BuildRequires: audiofile-devel -BuildRequires: alsa-lib-devel -BuildRequires: glib2-devel -BuildRequires: libtool-ltdl-devel -BuildRequires: gsl-devel -BuildRequires: libvorbis-devel -BuildRequires: esound-devel -BuildRequires: jack-audio-connection-kit-devel - -Requires: tqtinterface == %{version} -Requires: audiofile - -%if "%{?_prefix}" == "/usr" -Obsoletes: arts -%endif - -%description -arts (analog real-time synthesizer) is the sound system of KDE 3. - -The principle of arts is to create/process sound using small modules which do -certain tasks. These may be create a waveform (oscillators), play samples, -filter data, add signals, perform effects like delay/flanger/chorus, or -output the data to the soundcard. - -By connecting all those small modules together, you can perform complex -tasks like simulating a mixer, generating an instrument or things like -playing a wave file with some effects. - - -%package devel -Group: Development/Libraries -Summary: %{name} - Development files -Requires: %{name} = %{version}-%{release} -%if "%{?_prefix}" == "/usr" -Obsoletes: arts-devel -%endif - -%description devel -Development files for %{name} - -%prep -%setup -q -n dependencies/arts - -%build -%__mkdir build -cd build -%cmake \ - -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \ - -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ - -DWITH_ALSA=ON \ - -DWITH_AUDIOFILE=ON \ - -DWITH_VORBIS=ON \ - -DWITH_MAD=OFF \ - -DWITH_ESOUND=ON \ - -DWITH_JACK=ON \ - .. - - -%__make %{?_smp_mflags} - -%install -%__rm -rf %{?buildroot} -%__make install -C build DESTDIR=%{?buildroot} - -%clean -%__rm -rf %{?buildroot} - -%files -%defattr(-,root,root,-) -%doc COPYING.LIB -%dir %{_libdir}/mcop -%dir %{_libdir}/mcop/Arts -%{_libdir}/mcop/Arts/* -%{_libdir}/mcop/*.mcopclass -%{_libdir}/mcop/*.mcoptype -%{_libdir}/lib*.so.* -%{_libdir}/lib*.la -%{_bindir}/artscat -%{_bindir}/artsd -%{_bindir}/artsdsp -%{_bindir}/artsplay -%{_bindir}/artsrec -%{_bindir}/artsshell -%{_bindir}/artswrapper - -%files devel -%defattr(-,root,root,-) -%{_bindir}/mcopidl -%dir %{_includedir} -%{_includedir}/*/ -%{_bindir}/artsc-config -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/*.pc -%{_libdir}/*.a - - -%changelog -* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1 -- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec new file mode 100644 index 000000000..febebfc68 --- /dev/null +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -0,0 +1,147 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_libdir %{tde_prefix}/%{_lib} + + +Name: trinity-avahi-tqt +Version: 14.0.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +License: GPL +Summary: Avahi TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: gcc-c++ +BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tqt3-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: gettext-devel +BuildRequires: libtool +%if 0%{?suse_version} +BuildRequires: dbus-1-devel +%else +BuildRequires: dbus-devel +%endif + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +%if 0%{?pclinuxos} +BuildRequires: libexpat-devel +%else +# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel' +BuildRequires: %{_lib}expat%{?mgaversion:1}-devel +%endif +Provides: %{_lib}avahi-qt3 +%else +BuildRequires: avahi-devel +%if 0%{?suse_version} +BuildRequires: libexpat-devel +%else +BuildRequires: expat-devel +%endif +%endif + +Requires: trinity-tqt3 >= %{version} +Requires: trinity-tqtinterface >= %{version} + +Obsoletes: avahi-tqt < %{version}-%{release} +Provides: avahi-tqt = %{version}-%{release} + + +%description +Avahi TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + +%if 0%{?mgaversion} || 0%{?mdkversion} +Provides: %{_lib}avahi-qt3-devel +%endif + +Obsoletes: avahi-tqt-devel < %{version}-%{release} +Provides: avahi-tqt-devel = %{version}-%{release} + +%description devel +Development files for %{name} + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR +./autogen.sh + +%configure \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --docdir=%{tde_docdir} \ + --includedir=%{tde_includedir} \ + --libdir=%{tde_libdir} \ + --enable-compat-libdns_sd \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --disable-static + +%__make %{?_smp_mflags} + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} + + +%clean +%__rm -rf %{?buildroot} + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%{tde_libdir}/libavahi-tqt.so.1 +%{tde_libdir}/libavahi-tqt.so.1.0.0 + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/avahi-tqt/ +%{tde_libdir}/libavahi-tqt.so +%{tde_libdir}/libavahi-tqt.la +%{tde_libdir}/pkgconfig/avahi-tqt.pc + +%changelog +* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec deleted file mode 100644 index 2e0b389ba..000000000 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-r14.spec +++ /dev/null @@ -1,76 +0,0 @@ -# Always build under "/usr" -%define _prefix /usr - - -Name: avahi-tqt -Version: r14 -Release: 1%{?dist} -License: GPL -Summary: Avahi TQT Interface -Group: System Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}.tar.gz - -# Allows building with TQT3 instead of QT3 -Patch1: avahi-tqt-moc-tqt3.patch - -BuildRequires: gcc-c++ -BuildRequires: avahi-devel -BuildRequires: cmake >= 2.8 -BuildRequires: tqt3-devel >= 3.4.0 -BuildRequires: tqtinterface-devel -Requires: tqt3 >= 3.4.0 -Requires: tqtinterface - -%description -Avahi TQT Interface - - -%package devel -Requires: %{name} -Summary: %{name} - Development files -Group: Development/Libraries - - -%description devel -Development files for %{name} - - -%prep -%setup -q -n dependencies/%{name} -%patch1 -p1 - -%build -./autogen.sh -%configure \ - --enable-compat-libdns_sd \ - --with-systemdsystemunitdir=/lib/systemd/system - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} - -%clean -%__rm -rf %{?buildroot} - - -%files -%{_libdir}/*.so.* - -%files devel -%{_includedir}/%{name} -%{_libdir}/*.so -%{_libdir}/*.la -%{_libdir}/pkgconfig/*.pc -%exclude %{_libdir}/libavahi-tqt.a - -%changelog -* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1 -- Initial build for TDE R14, using 'tqt3' instead of 'qt3' 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 new file mode 100644 index 000000000..c8175b29a --- /dev/null +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -0,0 +1,117 @@ +# Always install under standard prefix +%define tde_prefix /usr + +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} + +Name: trinity-dbus-1-tqt +Version: 14.0.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +License: GPL +Summary: Dbus TQT Interface +Group: System Environment/Libraries + +Obsoletes: dbus-1-tqt < %{version}-%{release} +Provides: dbus-1-tqt = %{version}-%{release} + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: gcc-c++ +%if 0%{?suse_version} +BuildRequires: dbus-1-devel +%else +BuildRequires: dbus-devel +%endif +BuildRequires: trinity-tqtinterface-devel >= %{version} + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tqt3-devel >= %{version} +Requires: trinity-tqt3 >= %{version} + + +%description +Dbus TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + +Obsoletes: dbus-1-tqt-devel < %{version}-%{release} +Provides: dbus-1-tqt-devel = %{version}-%{release} + +%description devel +Development files for %{name} + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} + + +%build +unset QTDIR +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%clean +%__rm -rf %{?buildroot} + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%{tde_bindir}/dbusxml2qt3 +%{tde_libdir}/libdbus-1-tqt.so.0 +%{tde_libdir}/libdbus-1-tqt.so.0.0.0 + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/*.h +%{tde_libdir}/libdbus-1-tqt.so +%{tde_libdir}/libdbus-1-tqt.la +%{tde_libdir}/pkgconfig/*.pc + +%changelog +* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' + diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec deleted file mode 100644 index 112520c32..000000000 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-r14.spec +++ /dev/null @@ -1,73 +0,0 @@ -# Always build under "/usr" -%define _prefix /usr - - -Name: dbus-1-tqt -Version: r14 -Release: 1%{?dist} -License: GPL -Summary: Dbus TQT Interface -Group: System Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}.tar.gz - -BuildRequires: gcc-c++ -BuildRequires: dbus-devel -BuildRequires: tqtinterface-devel -BuildRequires: cmake >= 2.8 -BuildRequires: tqt3-devel >= 3.4.0 -BuildRequires: dbus-tqt-devel == %{version} -Requires: tqt3 >= 3.4.0 -Requires: dbus-tqt == %{version} - -%description -Dbus TQT Interface - - -%package devel -Requires: %{name} -Summary: %{name} - Development files -Group: Development/Libraries - -%description devel -Development files for %{name} - - -%prep -%setup -q -n dependencies/%{name} - -%build -%__mkdir build -cd build -%cmake .. -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot}%{_includedir} -%__make install DESTDIR=%{?buildroot} -C build - -%clean -%__rm -rf %{?buildroot} - -%files -%{_bindir}/dbusxml2qt3 -%{_libdir}/*.so.* - -%files devel -%{_includedir}/*.h -%{_libdir}/*.so -%{_libdir}/*.la -%{_libdir}/pkgconfig/*.pc - -%changelog -* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1 -- Initial build for TDE R14, using 'tqt3' instead of 'qt3' - diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec new file mode 100644 index 000000000..b8acfe94d --- /dev/null +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -0,0 +1,126 @@ +# Always install under standard prefix +%define tde_prefix /usr + +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} + +Name: trinity-dbus-tqt +Version: 14.0.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +License: GPL +Summary: Dbus TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz + +# [dbus-tqt] Fix build on RHEL 4 +Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch + +BuildRequires: gcc-c++ +%if 0%{?suse_version} +BuildRequires: dbus-1-devel +%else +BuildRequires: dbus-devel +%endif +BuildRequires: trinity-tqtinterface-devel >= %{version} + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tqt3-devel >= %{version} + +Requires: trinity-tqt3 >= %{version} + +Obsoletes: dbus-tqt < %{version}-%{release} +Provides: dbus-tqt = %{version}-%{release} + + +%description +Dbus TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + +Obsoletes: dbus-tqt-devel < %{version}-%{release} +Provides: dbus-tqt-devel = %{version}-%{release} + +%description devel +Development files for %{name} + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} + +%if 0%{?rhel} == 4 +%patch1 -p1 -b .dbustypes +%endif + + +%build +unset QTDIR +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +%if 0%{?rhel} == 4 +export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}" +%endif + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%clean +%__rm -rf %{?buildroot} + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%{tde_libdir}/libdbus-tqt-1.so.0 +%{tde_libdir}/libdbus-tqt-1.so.0.0.0 + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/dbus-1.0/* +%{tde_libdir}/libdbus-tqt-1.so +%{tde_libdir}/libdbus-tqt-1.la +%{tde_libdir}/pkgconfig/dbus-tqt.pc + +%changelog +* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec deleted file mode 100644 index aaf57264a..000000000 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec +++ /dev/null @@ -1,71 +0,0 @@ -# Always build under "/usr" -%define _prefix /usr - - -Name: dbus-tqt -Version: r14 -Release: 1%{?dist} -License: GPL -Summary: Dbus TQT Interface -Group: System Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}.tar.gz - -BuildRequires: gcc-c++ -BuildRequires: dbus-devel -BuildRequires: cmake >= 2.8 -BuildRequires: tqt3-devel >= 3.4.0 -BuildRequires: tqtinterface-devel -Requires: tqt3 >= 3.4.0 -Requires: tqtinterface - -%description -Dbus TQT Interface - - -%package devel -Requires: %{name} -Summary: %{name} - Development files -Group: Development/Libraries - - -%description devel -Development files for %{name} - - -%prep -%setup -q -n dependencies/%{name} - -%build -%__mkdir build -cd build -%cmake .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - -%clean -%__rm -rf %{?buildroot} - -%files -%{_libdir}/*.so.* - -%files devel -%{_includedir}/dbus-1.0/* -%{_libdir}/*.so -%{_libdir}/*.la -%{_libdir}/pkgconfig/*.pc - -%changelog -* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1 -- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec new file mode 100644 index 000000000..108a9214b --- /dev/null +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -0,0 +1,178 @@ +# 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 + +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_datadir %{tde_prefix}/share + +%define tde_tdeincludedir %{tde_includedir}/tde + +%define _docdir %{tde_datadir}/doc + + +Name: trinity-libart-lgpl +Version: 14.0.0 +Release: 1%{?dist}%{?_variant} + +Summary: Library of functions for 2D graphics - runtime files + +Group: System Environment/Libraries +License: LGPLv2+ + +Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ +Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz + +BuildRequires: trinity-tqt3-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{version} + +%description +A library of functions for 2D graphics supporting a superset of the +PostScript imaging model, designed to be integrated with graphics, artwork, +and illustration programs. It is written in optimized C, and is fully +compatible with C++. With a small footprint of 10,000 lines of code, it is +especially suitable for embedded applications. + + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{tde_libdir}/libart_lgpl_2.so.2 +%{tde_libdir}/libart_lgpl_2.so.2.3.21 + +########## + +%package devel +Summary: Library of functions for 2D graphics - development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +A library of functions for 2D graphics supporting a superset of the +PostScript imaging model, designed to be integrated with graphics, artwork, +and illustration programs. It is written in optimized C, and is fully +compatible with C++. With a small footprint of 10,000 lines of code, it is +especially suitable for embedded applications. + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/libart2-config +%{tde_libdir}/libart_lgpl_2.a +%{tde_libdir}/libart_lgpl_2.la +%{tde_libdir}/libart_lgpl_2.so +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_affine.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_alphagamma.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_bpath.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_config.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_filterlevel.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_gray_svp.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_misc.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pathcode.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pixbuf.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_point.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_svp.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_uta.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_gradient.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_mask.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_svp.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_a_affine.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_affine.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_svp.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgba.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_intersect.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_ops.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_point.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_render_aa.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_wind.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_ops.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_rect.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_svp.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_vpath.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_bpath.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_dash.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_svp.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart-features.h +%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart.h +%{tde_libdir}/pkgconfig/libart-2.0.pc + +########## + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{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" +autoreconf -fiv + + +%build +unset QTDIR +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --disable-rpath \ + --enable-new-ldflags \ + --enable-closure \ + --disable-debug --disable-warnings \ + --enable-final + +%__make %{?_smp_mflags} + + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + + +%changelog +* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1 +- Initial build for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqt3/assistant3.desktop b/redhat/dependencies/tqt3/assistant3.desktop deleted file mode 100644 index 49e718c5d..000000000 --- a/redhat/dependencies/tqt3/assistant3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Assistant -Comment=Add translations to Qt3 applications -Exec=assistant -Icon=assistant3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/designer3.desktop b/redhat/dependencies/tqt3/designer3.desktop deleted file mode 100644 index 23f1f549a..000000000 --- a/redhat/dependencies/tqt3/designer3.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Qt3 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt3 applications -Exec=designer -Icon=designer3 -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/linguist3.desktop b/redhat/dependencies/tqt3/linguist3.desktop deleted file mode 100644 index c6fce02c8..000000000 --- a/redhat/dependencies/tqt3/linguist3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt3 Linguist -Comment=Add translations to Qt3 applications -Exec=linguist -Icon=linguist3 -MimeType=application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch b/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch deleted file mode 120000 index 7d8ae65a2..000000000 --- a/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.1.0-makefile.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch deleted file mode 120000 index 99cdc6e1d..000000000 --- a/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.4-print-CJK.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch deleted file mode 120000 index b015af122..000000000 --- a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.6-fontrendering-gu-228452.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch deleted file mode 120000 index 388a5cbe5..000000000 --- a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch deleted file mode 120000 index 93c6ba3d8..000000000 --- a/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch deleted file mode 120000 index 4ded8f792..000000000 --- a/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch deleted file mode 120000 index 09d41d4b3..000000000 --- a/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.4-fullscreen.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch deleted file mode 120000 index f8342f9f9..000000000 --- a/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch deleted file mode 120000 index 7121216bc..000000000 --- a/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.6-strip.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch deleted file mode 120000 index b7682272a..000000000 --- a/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.7-arm.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch deleted file mode 120000 index 4e2537345..000000000 --- a/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt-x11-free-3.3.8b-typo.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch deleted file mode 100644 index 5e5d9773a..000000000 --- a/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp ---- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 -+++ qt-x11-free-3.3.5/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 -@@ -306,8 +306,8 @@ - - currentIMKey = key; - -- qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", -- imIndex, (const char *)_slave->identifierName() ); -+ /* qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", -+ imIndex, (const char *)_slave->identifierName() ); */ - } - } - -diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp ---- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:36.000000000 +0200 -+++ qt-x11-free-3.3.5/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 -@@ -140,7 +140,7 @@ - // only one character. See description of - // QInputContext::filterEvent() about key compression. - val = text[0].unicode(); -- qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); -+ // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); - } - - // Store value -@@ -164,14 +164,14 @@ - - void QSimpleInputContext::setFocus() - { -- qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", -- this, focusWidget() ); -+ /* qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", -+ this, focusWidget() ); */ - } - - void QSimpleInputContext::unsetFocus() - { -- qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", -- this, focusWidget() ); -+ /* qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", -+ this, focusWidget() ); */ - reset(); - } - -@@ -188,8 +188,8 @@ - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: -- qDebug( "QSimpleInputContext::mouseHandler: " -- "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); -+ /* qDebug( "QSimpleInputContext::mouseHandler: " -+ "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); */ - break; - default: - break; -@@ -240,7 +240,7 @@ - - // no entries were found - if ( p == composeTable->data + composeTable->size ) { -- qDebug( "no match" ); -+ // qDebug( "no match" ); - clearComposeBuffer(); - return FALSE; - } -@@ -250,18 +250,18 @@ - - // check if partial match - if ( composeBuffer[i] == 0 && p->keys[i] ) { -- qDebug("partial match"); -+ // qDebug("partial match"); - return TRUE; - } - - if ( composeBuffer[i] != p->keys[i] ) { -- qDebug("different entry"); -+ // qDebug("different entry"); - clearComposeBuffer(); - return i!=0; - } - } - -- qDebug("match exactly"); -+ // qDebug("match exactly"); - - // match exactly - commitChar( p->value ); -diff -Nur qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp ---- qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp 2005-10-13 16:09:37.000000000 +0200 -+++ qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 -@@ -526,17 +526,17 @@ - return; - - if ( type == QEvent::IMStart ) { -- qDebug( "sending IMStart with %d chars to %p", -- text.length(), receiver ); -+ /* qDebug( "sending IMStart with %d chars to %p", -+ text.length(), receiver ); */ - event = new QIMEvent( type, text, cursorPosition ); - } else if ( type == QEvent::IMEnd ) { -- qDebug( "sending IMEnd with %d chars to %p, text=%s", -- text.length(), receiver, (const char*)text.local8Bit() ); -+ /* qDebug( "sending IMEnd with %d chars to %p, text=%s", -+ text.length(), receiver, (const char*)text.local8Bit() ); */ - event = new QIMEvent( type, text, cursorPosition ); - } else if ( type == QEvent::IMCompose ) { -- qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", -+ /* qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", - receiver, text.length(), cursorPosition, selLength, -- (const char*)text.local8Bit() ); -+ (const char*)text.local8Bit() ); */ - event = new QIMComposeEvent( type, text, cursorPosition, selLength ); - } - ---- qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.quiet 2005-10-13 19:00:56.000000000 +0200 -+++ qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-25 15:36:43.000000000 +0200 -@@ -356,7 +356,7 @@ - #if !defined(QT_NO_XIM) - fontsetRefCount++; - if (! qt_xim) { -- qWarning("QInputContext: no input method context available"); -+ // qWarning("QInputContext: no input method context available"); - return; - } - -@@ -742,7 +742,7 @@ - - void QXIMInputContext::close( const QString &errMsg ) - { -- qDebug( errMsg ); -+ // qDebug( errMsg ); - emit deletionRequested(); - } - diff --git a/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 Binary files differdeleted file mode 100644 index 7c122a375..000000000 --- a/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 +++ /dev/null diff --git a/redhat/dependencies/tqt3/qt.csh b/redhat/dependencies/tqt3/qt.csh deleted file mode 100755 index 7efcd89c5..000000000 --- a/redhat/dependencies/tqt3/qt.csh +++ /dev/null @@ -1,34 +0,0 @@ -# Qt initialization script (csh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# When a conflict is found between two packages corresponding with different arches, -# the installed file is the one from the preferred arch. This is very common for executables -# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an -# i386 package, the executable from x86_64 will be installe - -if ( $?QTDIR ) then - exit -endif - -switch (`uname -m`) - case x86_64: - case ia64: - case s390x: - case ppc64: - set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" - breaksw - case *: - set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" -endsw - -foreach QTPREFIX ( $QTPREFIXES ) - test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break -end -unset QTPREFIX QTPREFIXES - -if ( "${path}" !~ *$QTDIR/bin* ) then - set path = ( $QTDIR/bin $path ) -endif - -setenv QTINC $QTDIR/include -setenv QTLIB $QTDIR/lib diff --git a/redhat/dependencies/tqt3/qt.sh b/redhat/dependencies/tqt3/qt.sh deleted file mode 100755 index 88b3e0cea..000000000 --- a/redhat/dependencies/tqt3/qt.sh +++ /dev/null @@ -1,32 +0,0 @@ -# Qt initialization script (sh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# When a conflict is found between two packages corresponding with different arches, -# the installed file is the one from the preferred arch. This is very common for executables -# in /usr/bin, for example. If the file /usr/bin/foo is found in an x86_64 package and in an -# i386 package, the executable from x86_64 will be installe - -if [ -z "${QTDIR}" ]; then - -case `uname -m` in - x86_64 | ia64 | s390x | ppc64 ) - QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; - * ) - QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; -esac - -for QTDIR in ${QT_PREFIXES} ; do - test -d "${QTDIR}" && break -done -unset QT_PREFIXES - -if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then - PATH=$QTDIR/bin:${PATH} -fi - -QTINC="$QTDIR/include" -QTLIB="$QTDIR/lib" - -export QTDIR QTINC QTLIB PATH - -fi diff --git a/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch deleted file mode 120000 index 06a4852dc..000000000 --- a/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch +++ /dev/null @@ -1 +0,0 @@ -../qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
\ No newline at end of file diff --git a/redhat/dependencies/tqt3/qtconfig3.desktop b/redhat/dependencies/tqt3/qtconfig3.desktop deleted file mode 100644 index 11df0abab..000000000 --- a/redhat/dependencies/tqt3/qtconfig3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Config -Comment=Configure Qt3 behavior, styles, fonts -Exec=qtconfig -Icon=qtconfig3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch new file mode 100644 index 000000000..38c729d60 --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch @@ -0,0 +1,18 @@ +--- ./tools/qvfb/qanimationwriter.cpp.ori 2013-06-25 20:52:34.636153035 +0200 ++++ ./tools/qvfb/qanimationwriter.cpp 2013-06-25 20:52:59.673642835 +0200 +@@ -101,7 +101,15 @@ + + void writePNG(const TQImage& image) + { ++#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 ) ++#warning XXXtnn not too sure about this ++/* ++according to png.h, channels is only used on read, not writes, so we ++should be able to comment this out. ++*/ ++#else /* LIBPNG 1.5 */ + info_ptr->channels = 4; ++#endif + png_set_sig_bytes(png_ptr, 8); // Pretend we already wrote the sig + png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), + 8, image.hasAlphaBuffer() diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch new file mode 100644 index 000000000..d9b98985f --- /dev/null +++ b/redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch @@ -0,0 +1,35 @@ +--- ./tools/assistant/lib/lib.pro.ori 2013-06-25 20:20:21.576374929 +0200 ++++ ./tools/assistant/lib/lib.pro 2013-06-25 20:20:36.008078008 +0200 +@@ -3,8 +3,7 @@ + VERSION = 1.0 + + CONFIG += qt warn_on release +-CONFIG += staticlib +-CONFIG -= dll ++CONFIG += dll + + SOURCES = qassistantclient.cpp + HEADERS += $$QT_SOURCE_TREE/include/ntqassistantclient.h +--- ./tools/designer/editor/editor.pro.ori 2013-06-25 20:21:49.469566420 +0200 ++++ ./tools/designer/editor/editor.pro 2013-06-25 20:21:59.535359278 +0200 +@@ -1,6 +1,6 @@ + TEMPLATE = lib +-CONFIG += qt warn_on staticlib +-CONFIG -= dll ++CONFIG += qt warn_on ++CONFIG += dll + HEADERS = editor.h \ + parenmatcher.h \ + completion.h \ +--- ./tools/designer/designer/designer.pro.ori 2013-06-25 20:22:39.279541337 +0200 ++++ ./tools/designer/designer/designer.pro 2013-06-25 20:23:08.892943751 +0200 +@@ -1,7 +1,7 @@ + TEMPLATE = lib + +-CONFIG += qt warn_on staticlib qmake_cache +-CONFIG -= dll ++CONFIG += qt warn_on qmake_cache ++CONFIG += dll + !force_static:!win32:contains(QT_PRODUCT,qt-internal) { + CONFIG -= staticlib + CONFIG += dll diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-compositing-properties.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-compositing-properties.patch deleted file mode 100644 index 8edfd996f..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-compositing-properties.patch +++ /dev/null @@ -1,80 +0,0 @@ -qt-bugs@ issue : none -bugs.kde.org number : none -applied: no -author: Lubos Lunak <l.lunak@kde.org> - -This patch makes override-redirect windows (popup menu, dropdown menu, -tooltip, combobox, etc.) also have more window properties like WM_CLASS, -so they can be used when compositing. - ---- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200 -+++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200 -@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i - wsa.save_under = True; - XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder, - &wsa ); -- x11SetWindowType(); -+ XClassHint class_hint; -+ class_hint.res_name = (char *) tqAppName(); // application name -+ class_hint.res_class = (char *) tqAppClass(); // application class -+ XSetClassHint( dpy, id, &class_hint ); - } else if ( topLevel && !desktop ) { // top-level widget - QWidget *p = parentWidget(); // real parent - if (p) -@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_xa_motif_wm_hints); - -- x11SetWindowType(); -- - // set _NET_WM_WINDOW_STATE - if (curr_winstate > 0) - XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace, -@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i - else - XDeleteProperty(dpy, id, qt_net_wm_state); - -- // set _NET_WM_PID -- long curr_pid = getpid(); -- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -- (unsigned char *) &curr_pid, 1); -- - #ifndef QT_NO_XSYNC - // set _NET_WM_SYNC_COUNTER - createSyncCounter(); -@@ -729,19 +725,31 @@ void QWidget::create( WId window, bool i - // when we create a toplevel widget, the frame strut should be dirty - fstrut_dirty = 1; - -+ } else { -+ // non-toplevel widgets don't have a frame, so no need to -+ // update the strut -+ fstrut_dirty = 0; -+ } -+ -+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows -+ x11SetWindowType(); -+ -+ // set _NET_WM_PID -+ long curr_pid = getpid(); -+ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace, -+ (unsigned char *) &curr_pid, 1); -+ - // declare the widget's object name as window role - XChangeProperty( dpy, id, - tqt_window_role, XA_STRING, 8, PropModeReplace, - (unsigned char *)name(), tqstrlen( name() ) ); - - // set client leader property -+ if ( !qt_x11_wm_client_leader ) -+ qt_x11_create_wm_client_leader(); - XChangeProperty( dpy, id, qt_wm_client_leader, - XA_WINDOW, 32, PropModeReplace, - (unsigned char *)&qt_x11_wm_client_leader, 1 ); -- } else { -- // non-toplevel widgets don't have a frame, so no need to -- // update the strut -- fstrut_dirty = 0; - } - - if ( initializeWindow ) { diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch deleted file mode 100644 index 10d7704ae..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tqt3/tools/qembed/qembed.pro.qembed 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/tools/qembed/qembed.pro 2012-02-13 21:26:57.417973392 +0100 -@@ -3,5 +3,7 @@ - TARGET = qembed - REQUIRES=full-config nocrosscompiler - -+DESTDIR = ../../bin - target.path = $$bins.path - INSTALLS += target -+ diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch deleted file mode 100644 index 77ca43101..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-#214570 2012-02-13 21:41:17.792005290 +0100 -+++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:42:38.785202528 +0100 -@@ -1243,7 +1243,7 @@ - int script = item->script; - Q_ASSERT(script >= TQFont::Devanagari && script <= TQFont::Sinhala); - const unsigned short script_base = 0x0900 + 0x80*(script-TQFont::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; - -@@ -1291,6 +1291,11 @@ - } - #endif - -+ unsigned short *chkAssamese=reordered.data(); -+ if((script == TQFont::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/tqt3/tqt3-3.4.0-fontrendering-214371.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch deleted file mode 100644 index 9dca7998d..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch deleted file mode 100644 index cdb543b25..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- tqt3/src/kernel/qscriptengine_x11.cpp.fontrendering-ml_IN-bz#209097 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/kernel/qscriptengine_x11.cpp 2012-02-13 21:36:07.227917886 +0100 -@@ -871,7 +871,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, -@@ -1274,6 +1274,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++) { -@@ -1550,6 +1560,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 TQChar *)reordered.data(), len, item->glyphs, item->advances, - &item->num_glyphs, item->flags & TQTextEngine::RightToLeft) != TQFontEngine::NoError) - return FALSE; -@@ -1661,6 +1680,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/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch deleted file mode 100644 index 276441c22..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tqt3/src/kernel/qfont_x11.cpp.fontrendering-ml_IN-217657 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/kernel/qfont_x11.cpp 2012-02-13 21:45:39.903520249 +0100 -@@ -712,7 +712,7 @@ - if ( script >= TQFont::Arabic && script <= TQFont::Khmer ) { - // complex script shaping. Have to do some hard work - int from = TQMAX( 0, pos - 8 ); -- int to = TQMIN( (int)str.length(), pos + 8 ); -+ int to = str.length(); - TQConstString cstr( str.unicode()+from, to-from); - TQTextEngine layout( cstr.string(), d ); - layout.itemize( TQTextEngine::WidthOnly ); diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch deleted file mode 100644 index e50277e1a..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- tqt3/src/tools/qgpluginmanager.cpp.ndebug 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/tools/qgpluginmanager.cpp 2012-02-13 19:25:05.653477747 +0100 -@@ -506,10 +506,12 @@ - (*f).latin1(), - (const char*) TQFile::encodeName( old->library() ) ); - } else { -+/* - tqWarning("%s: Feature %s already defined in %s!", - (const char*) TQFile::encodeName( old->library() ), - (*f).latin1(), - (const char*) TQFile::encodeName( plugin->library() ) ); -+*/ - } - } - } diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch deleted file mode 100644 index 3a5aea885..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- tqt3/src/sql/drivers/odbc/qsql_odbc.cpp.odbc 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/sql/drivers/odbc/qsql_odbc.cpp 2012-02-13 21:47:25.232367854 +0100 -@@ -61,13 +61,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define TQSQLLEN SQLLEN - #else - # define TQSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define TQSQLULEN SQLULEN - #else - # define TQSQLULEN SQLUINTEGER diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch deleted file mode 100644 index 88e066aa9..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 -+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 -@@ -1906,9 +1906,6 @@ - - void TQTextEdit::removeSelectedText( int selNum ) - { -- if(selNum != 0) -- resetInputContext(); -- - TQTextCursor c1 = doc->selectionStartCursor( selNum ); - c1.restoreState(); - TQTextCursor c2 = doc->selectionEndCursor( selNum ); -@@ -3171,7 +3168,6 @@ - return; - } - #endif -- resetInputContext(); - TQTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3198,7 +3194,6 @@ - return; - } - #endif -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3240,7 +3235,6 @@ - if ( d->optimMode ) - return; - #endif -- resetInputContext(); - TQTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3285,7 +3279,6 @@ - if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3336,7 +3329,6 @@ - if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3450,7 +3442,6 @@ - { - if ( isReadOnly() ) - return; -- resetInputContext(); - normalCopy(); - removeSelectedText(); - updateMicroFocusHint(); -@@ -3938,7 +3929,6 @@ - return; - } - #endif -- resetInputContext(); - if ( !isModified() && isReadOnly() && - this->context() == context && this->text() == text ) - return; -@@ -4112,7 +4102,6 @@ - if ( !p ) - return; - -- resetInputContext(); - if ( index > p->length() - 1 ) - index = p->length() - 1; - -@@ -4169,7 +4158,6 @@ - return; - } - #endif -- resetInputContext(); - if ( doc->hasSelection( selNum ) ) { - doc->removeSelection( selNum ); - repaintChanged(); -@@ -5072,7 +5060,6 @@ - { - if ( dc == doc ) - return; -- resetInputContext(); - doc = dc; - delete cursor; - cursor = new QTextCursor( doc ); diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch deleted file mode 100644 index 101838fad..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- tqt3/src/kernel/qpixmap_x11.cpp.quiet 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/kernel/qpixmap_x11.cpp 2012-02-13 21:24:08.190653338 +0100 -@@ -394,8 +394,8 @@ - { - #if defined(QT_CHECK_STATE) - if ( tqApp->type() == TQApplication::Tty ) { -- tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " -- "is being used" ); -+// tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " -+// "is being used" ); - } - #endif - diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch deleted file mode 100644 index 39a42e6f5..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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") { -+ TQStringList x; -+ TQApplication::setLibraryPaths(x); - } else if ( opt == "L" ) { - if ( !(n < argc-1) ) { - error = "Missing plugin path."; diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch deleted file mode 100644 index 9c24f9903..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- tqt3/src/tools/qsettings.cpp.umask 2012-02-13 19:10:01.000000000 +0100 -+++ tqt3/src/tools/qsettings.cpp 2012-02-13 19:28:00.802555882 +0100 -@@ -997,7 +997,10 @@ - #endif - - TQFile 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("TQSettings::sync: failed to open '%s' for writing", diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0.spec b/redhat/dependencies/tqt3/tqt3-3.4.0.spec deleted file mode 100644 index 4353bb06e..000000000 --- a/redhat/dependencies/tqt3/tqt3-3.4.0.spec +++ /dev/null @@ -1,661 +0,0 @@ -# Always install under standard prefix -%define _prefix /usr - -# This allows the legacy RHEL/Fedora patches to apply in TDE version. -%define _default_patch_fuzz 2 - -# The following QT4 packages should NOT be installed to -# allow QT3 compilation (please uninstall them prior to compile) -# qt -# qt-sqlite -# qt-mysql -# qt-x11 -# qt-devel -# ...maybe others !!!! - -Summary: The shared library for the Qt 3 GUI toolkit -Version: 3.4.0 -Release: 1%{?dist} -Name: tqt3 - -#Obsoletes: qt < 1:%{version}-%{release} -#Provides: qt = 1:%{version}-%{release} -#Obsoletes: qt3 < 1:%{version}-%{release} -#Provides: qt3 = 1:%{version}-%{release} - -License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Url: http://www.troll.no -Source0: %{name}-%{version}.tar.gz -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -Patch1: qt-3.3.4-print-CJK.patch -Patch2: tqt3-3.4.0-nodebug.patch -Patch3: qt-3.1.0-makefile.patch -Patch4: tqt3-3.4.0-umask.patch -Patch5: qt-x11-free-3.3.6-strip.patch -Patch7: tqt3-3.4.0-quiet.patch -Patch8: tqt3-3.4.0-embed.patch -Patch12: tqt3-3.4.0-uic-nostdlib.patch -Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch -Patch27: tqt3-3.4.0-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: tqt3-3.4.0-fontrendering-214371.patch -Patch33: tqt3-3.4.0-fontrendering-#214570.patch -Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch -Patch35: tqt3-3.4.0-fontrendering-ml_IN-217657.patch -Patch37: qt-3.3.6-fontrendering-gu-228452.patch -Patch38: tqt3-3.4.0-odbc.patch -Patch39: qt-x11-free-3.3.7-arm.patch -Patch40: qt-x11-free-3.3.8b-typo.patch - -# immodule patches -Patch53: tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch - -# qt-copy patches -Patch110: tqt3-3.4.0-compositing-properties.patch - -# upstream patches -Patch200: qt-x11-free-3.3.4-fullscreen.patch - -# TDE 3.5.13 patches -Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch - -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: coreutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d - -BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: glibc-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: giflib-devel -BuildRequires: perl -BuildRequires: sed -BuildRequires: findutils -BuildRequires: cups-devel -BuildRequires: tar -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: libXrender-devel -BuildRequires: libXrandr-devel -BuildRequires: libXcursor-devel -BuildRequires: libXinerama-devel -BuildRequires: libXft-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXt-devel -BuildRequires: libXmu-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: desktop-file-utils -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel -BuildRequires: sqlite-devel - - -%package config -Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -#Obsoletes: qt-config < 1:%{version}-%{release} -#Provides: qt-config = 1:%{version}-%{release} -#Obsoletes: qt3-config < 1:%{version}-%{release} -#Provides: qt3-config = 1:%{version}-%{release} - - -%package devel -Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: freetype-devel -Requires: fontconfig-devel -Requires: libXrender-devel -Requires: libXrandr-devel -Requires: libXcursor-devel -Requires: libXinerama-devel -Requires: libXft-devel -Requires: libXext-devel -Requires: libX11-devel -Requires: libSM-devel -Requires: libICE-devel -Requires: libXt-devel -Requires: xorg-x11-proto-devel -Requires: libpng-devel -Requires: libjpeg-devel -Requires: libmng-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel - -#Obsoletes: qt-devel < 1:%{version}-%{release} -#Provides: qt-devel = 1:%{version}-%{release} -#Obsoletes: qt3-devel < 1:%{version}-%{release} -#Provides: qt3-devel = 1:%{version}-%{release} - - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -#Obsoletes: qt-devel-docs < 1:%{version}-%{release} -#Provides: qt-devel-docs = 1:%{version}-%{release} -#Obsoletes: qt3-devel-docs < 1:%{version}-%{release} -#Provides: qt3-devel-docs = 1:%{version}-%{release} - - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -#Obsoletes: qt-ODBC < 1:%{version}-%{release} -#Provides: qt-ODBC = 1:%{version}-%{release} -#Obsoletes: qt3-ODBC < 1:%{version}-%{release} -#Provides: qt3-ODBC = 1:%{version}-%{release} - - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -#Obsoletes: qt-MySQL < 1:%{version}-%{release} -#Provides: qt-MySQL = 1:%{version}-%{release} -#Obsoletes: qt3-MySQL < 1:%{version}-%{release} -#Provides: qt3-MySQL = 1:%{version}-%{release} - - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -#Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} -#Provides: qt-PostgreSQL = 1:%{version}-%{release} -#Obsoletes: qt3-PostgreSQL < 1:%{version}-%{release} -#Provides: qt3-PostgreSQL = 1:%{version}-%{release} - - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -#Obsoletes: qt-sqlite < 1:%{version}-%{release} -#Provides: qt-sqlite = 1:%{version}-%{release} -#Obsoletes: qt3-sqlite < 1:%{version}-%{release} -#Provides: qt3-sqlite = 1:%{version}-%{release} - - -%package designer -Summary: In3erface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -#Obsoletes: qt-designer < 1:%{version}-%{release} -#Provides: qt-designer = 1:%{version}-%{release} -#Obsoletes: qt3-designer < 1:%{version}-%{release} -#Provides: qt3-designer = 1:%{version}-%{release} - - -%description -TQt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -TQt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run TQt 3 -applications, as well as the README files for TQt 3. - - -%description config -TQt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -TQt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using TQt 3. - - -%description devel -The %{name}-devel package contains the files necessary to develop -applications using the TQt GUI toolkit: the header files, the TQt meta -object compiler. - -Install %{name}-devel if you want to develop GUI applications using the TQt 3 -toolkit. - - -%description devel-docs -The %{name}-devel-docs package contains the man pages, the HTML documentation and -example programs for TQt 3. - - -%description ODBC -ODBC driver for TQt 3's SQL classes (QSQL) - - -%description MySQL -MySQL driver for TQt 3's SQL classes (QSQL) - - -%description PostgreSQL -PostgreSQL driver for TQt 3's SQL classes (QSQL) - - -%description sqlite -sqlite driver for TQt 3's SQL classes (QSQL) - - -%description designer -The %{name}-designer package contains an User Interface designer tool -for the TQt 3 toolkit. - - -%prep -%setup -q -n dependencies/%{name} -%patch1 -p1 -b .cjk -%patch2 -p1 -b .ndebug -%patch3 -p1 -b .makefile -%patch4 -p1 -b .umask -%patch5 -p1 -%patch7 -p1 -b .quiet -%patch8 -p1 -b .qembed -%patch12 -p1 -b .nostdlib -%patch13 -p1 -b .fonts -%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 -%patch38 -p1 -b .odbc -# 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 - -# qt-copy patches -%patch110 -p0 -b .0084-compositing-properties - -# upstream patches -%patch200 -p1 -b .fullscreen - -# TDE 3.5.13 patches -%patch300 -p1 - -# convert to UTF-8 -iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ -mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt - -%build -%if %{immodule} - sh ./make-symlinks.sh -%endif - -# set correct X11 prefix -perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf - -# don't use rpath -perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf - -perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf - -# set correct lib path -if [ "%{_lib}" == "lib64" ] ; then - perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test - perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test -fi - -# build shared, threaded (default) libraries -echo yes | ./configure \ - -prefix "%{_prefix}" \ - -libdir "%{_libdir}" \ - -docdir "%{_docdir}/%{name}-%{version}" \ - -sysconfdir "%{_sysconfdir}/%{name}" \ - -datadir "%{_datadir}/%{name}" \ - -headerdir "%{_includedir}/%{name}" \ - -plugindir "%{_libdir}/%{name}/plugins" \ - -translationdir "%{_datadir}/%{name}/translations" \ -%if %{_lib} == lib64 - -platform linux-g++-64 \ -%else - -platform linux-g++ \ -%endif -%if %{debug} - -debug \ -%else - -release \ -%endif - -shared \ - -largefile \ - -qt-gif \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -no-exceptions \ - -enable-styles \ - -enable-tools \ - -enable-kernel \ - -enable-widgets \ - -enable-dialogs \ - -enable-iconview \ - -enable-workspace \ - -enable-network \ - -enable-canvas \ - -enable-table \ - -enable-xml \ - -enable-opengl \ - -enable-sql \ - -qt-style-motif \ - %{plugins} \ - -stl \ - -thread \ - -cups \ - -sm \ - -xinerama \ - -xrender \ - -xkb \ - -ipv6 \ - -dlopen-opengl \ - -xft \ - -tablet - -QTDIR="${PWD}" -QTLIB="${QTDIR}/lib" -QTINC="${QTDIR}/include" -LD_LIBRARY_PATH="${QTLIB}:${LD_LIBRARY_PATH}" -PATH="${QTDIR}/bin:${PATH}" -export QTDIR QTLIB QTINC LD_LIBRARY_PATH PATH - -%__make %{?_smp_mflags} src-qmake - - -# build sqlite plugin -pushd plugins/src/sqldrivers/sqlite -qmake -o Makefile sqlite.pro -popd - -# build psql plugin -pushd plugins/src/sqldrivers/psql -qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro -popd - -# build mysql plugin -pushd plugins/src/sqldrivers/mysql -qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro -popd - -# build odbc plugin -pushd plugins/src/sqldrivers/odbc -qmake -o Makefile "LIBS+=-lodbc" odbc.pro -popd - -%__make %{?_smp_mflags} src-moc -%__make %{?_smp_mflags} sub-src -%__make %{?_smp_mflags} sub-tools - -%install -%__rm -rf %{buildroot} -%__make install INSTALL_ROOT=%{buildroot} - -for i in findtr qt20fix qtrename140 lrelease lupdate ; do - %__install bin/$i %{buildroot}%{_bindir} -done - -# install man pages -%__mkdir_p %{buildroot}%{_mandir} -%__cp -fR doc/man/* %{buildroot}%{_mandir}/ - -# clean up -%__make -C tutorial clean -%__make -C examples clean - -# Make sure the examples can be built outside the source tree. -# Our binaries fulfill all requirements, so... -perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` - -# don't include Makefiles of qt examples/tutorials -find examples -name "Makefile" | xargs rm -f -find examples -name "*.obj" | xargs rm -rf -find examples -name "*.moc" | xargs rm -rf -find tutorial -name "Makefile" | xargs rm -f - -for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{_bindir}/moc|' < $a > ${a}.2 - mv -v ${a}.2 $a -done - -# Add desktop files -%__mkdir_p %{buildroot}%{_datadir}/applications -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - --vendor="qt" \ - %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} - -# Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{_datadir}/%{name}/mkspecs/*/qmake.conf - -# remove broken links -%__rm -f %{buildroot}%{_datadir}/%{name}/mkspecs/default/linux-g++* -%__rm -f %{buildroot}%{_libdir}/*.la - -# install icons -%__mkdir_p %{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 - -# own style directory -%__mkdir_p %{buildroot}%{_libdir}/%{name}/plugins/styles - -# rename some binaries to make tqt3/4 installations possible -for b in designer uic moc lupdate lrelease qmake qtconfig assistant linguist; do - %__mv -f %{buildroot}%{_bindir}/${b} %{buildroot}%{_bindir}/${b}-%{name} -done - -%clean -%__rm -rf %{buildroot} - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{_libdir}/%{name}/plugins -%dir %{_libdir}/%{name}/plugins/sqldrivers -%dir %{_libdir}/%{name}/plugins/styles -%{_datadir}/%{name}/translations -%{_libdir}/%{name}/plugins/designer/ -%if %{immodule} -%{_libdir}/%{name}/plugins/inputmethods -%endif -%{_libdir}/libtqui.so.* -%{_libdir}/libtqt*.so.* - -# TQT 3.4.0: WTF is this file ?? -%exclude %{_mandir}/README - -%files config -%defattr(-,root,root,-) -%{_bindir}/qtconfig-%{name} -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -%files devel -%defattr(-,root,root,-) -%{_docdir}/%{name}-%{version} -%{_bindir}/moc-%{name} -%{_bindir}/uic-%{name} -%{_bindir}/findtr -%{_bindir}/qt20fix -%{_bindir}/qtrename140 -%{_bindir}/assistant-%{name} -%{_bindir}/qm2ts -%{_bindir}/qmake-%{name} -%{_bindir}/qembed -%{_bindir}/linguist-%{name} -%{_bindir}/lupdate-%{name} -%{_bindir}/lrelease-%{name} -%{_includedir}/%{name} -%{_datadir}/%{name}/mkspecs -%{_libdir}/libtqt*.so -%{_libdir}/libtqui.so -%{_libdir}/libeditor.a -%{_libdir}/libdesigner*.a -%{_libdir}/libqassistantclient.a -%{_libdir}/*.prl -%{_datadir}/%{name}/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 -%{_bindir}/createcw -%{_bindir}/makeqpf -%{_bindir}/mergetr -%{_bindir}/msg2qm - -# QT 3.3.8.D (TDE): removes lots of unnecessary include files -# (where do they come from ??? They were not in 3.3.8b !) -%exclude %{_includedir}/%{name}/btree.h -%exclude %{_includedir}/%{name}/crc32.h -%exclude %{_includedir}/%{name}/debian_qsql_odbc.h -%exclude %{_includedir}/%{name}/deflate.h -%exclude %{_includedir}/%{name}/ftglue.h -%exclude %{_includedir}/%{name}/ftxgdef.h -%exclude %{_includedir}/%{name}/ftxgpos.h -%exclude %{_includedir}/%{name}/ftxgsub.h -%exclude %{_includedir}/%{name}/ftxopen.h -%exclude %{_includedir}/%{name}/ftxopenf.h -%exclude %{_includedir}/%{name}/hash.h -%exclude %{_includedir}/%{name}/inffast.h -%exclude %{_includedir}/%{name}/inffixed.h -%exclude %{_includedir}/%{name}/inflate.h -%exclude %{_includedir}/%{name}/inftrees.h -%exclude %{_includedir}/%{name}/jchuff.h -%exclude %{_includedir}/%{name}/jconfig.h -%exclude %{_includedir}/%{name}/jdct.h -%exclude %{_includedir}/%{name}/jdhuff.h -%exclude %{_includedir}/%{name}/jerror.h -%exclude %{_includedir}/%{name}/jinclude.h -%exclude %{_includedir}/%{name}/jmemsys.h -%exclude %{_includedir}/%{name}/jmorecfg.h -%exclude %{_includedir}/%{name}/jversion.h -%exclude %{_includedir}/%{name}/moc_yacc.h -%exclude %{_includedir}/%{name}/opcodes.h -%exclude %{_includedir}/%{name}/os.h -%exclude %{_includedir}/%{name}/otlbuffer.h -%exclude %{_includedir}/%{name}/pager.h -%exclude %{_includedir}/%{name}/parse.h -%exclude %{_includedir}/%{name}/pngasmrd.h -%exclude %{_includedir}/%{name}/pngconf.h -%exclude %{_includedir}/%{name}/sqlite.h -%exclude %{_includedir}/%{name}/sqliteInt.h -%exclude %{_includedir}/%{name}/trees.h -%exclude %{_includedir}/%{name}/vdbe.h -%exclude %{_includedir}/%{name}/vdbeInt.h -%exclude %{_datadir}/%{name}/mkspecs/linux-g++-sparc - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -%files sqlite -%defattr(-,root,root,-) -%{_libdir}/%{name}/plugins/sqldrivers/libqsqlite.so - -%files ODBC -%defattr(-,root,root,-) -%{_libdir}/%{name}/plugins/sqldrivers/libqsqlodbc.so - -%files PostgreSQL -%defattr(-,root,root,-) -%{_libdir}/%{name}/plugins/sqldrivers/libqsqlpsql.so - -%files MySQL -%defattr(-,root,root,-) -%{_libdir}/%{name}/plugins/sqldrivers/libqsqlmysql.so - -%files designer -%defattr(-,root,root,-) -%{_datadir}/%{name}/templates -%{_bindir}/designer-%{name} -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - - -%changelog -* Mon Feb 13 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1 -- Initial build for TDE R14 -- Renames 'qt3' to 'tqt3' -- Spec file based on 'qt3-3.3.8b-30' from RHEL 6 - -* 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 build 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/tqt3/trinity-tqt3-14.0.0.spec b/redhat/dependencies/tqt3/trinity-tqt3-14.0.0.spec new file mode 100644 index 000000000..76b227b0f --- /dev/null +++ b/redhat/dependencies/tqt3/trinity-tqt3-14.0.0.spec @@ -0,0 +1,577 @@ +%define tde_version 14.0.0 + +# Always install under standard prefix +%define tde_prefix /usr +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} + +# The following QT4 packages should NOT be installed to +# allow QT3 compilation (please uninstall them prior to compile) +# qt +# qt-sqlite +# qt-mysql +# qt-x11 +# qt-devel +# ...maybe others !!!! + +Name: trinity-tqt3 +Version: 14.0.0%{?preversion:_%{preversion}} +Release: 1%{?dist} +Summary: The shared library for the Trinity Qt 3 GUI toolkit + +License: QPL or GPLv2 or GPLv3 +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n) +Url: http://www.trinitydesktop.org + +Prefix: %{tde_prefix} + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +# [tqt3] Build shared libraries +Patch1: tqt3-14.0.0-shared_lib.patch +# [tqt3] Fix FTBFS +Patch2: tqt3-14.0.0-fix_ftbfs.patch + +BuildRequires: desktop-file-utils +BuildRequires: libmng-devel +BuildRequires: glibc-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel +BuildRequires: giflib-devel +BuildRequires: perl +BuildRequires: sed +BuildRequires: findutils +BuildRequires: cups-devel +BuildRequires: tar +BuildRequires: freetype-devel +BuildRequires: fontconfig-devel + +# Xrender support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXrender-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libxrender-devel +%endif + +# Xrandr support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXrandr-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libxrandr-devel +%endif + +# Xcursor support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXcursor-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libxcursor-devel +%endif + +# Xinerama support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXinerama-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libxinerama-devel +%endif + +# Xft support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXft-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libxft-devel +%endif + +# Xext support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXext-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libxext-devel +%endif + +# X11 support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libX11-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libx11-devel +%endif + +# SM support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libSM-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libsm-devel +%endif + +# ICE support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libICE-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libice-devel +%endif + +# XT support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXt-devel +%endif + +# XMU support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXmu-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: libxmu-devel +%endif + +# XI support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: libXi-devel +%endif + +# Xorg support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: xorg-x11-proto-devel +%endif + +# MESA support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: mesaglu-devel +%endif + +BuildRequires: desktop-file-utils +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel +BuildRequires: sqlite-devel + +# Firebird support +%if 0%{?mdkversion} || 0%{?mgaversion} +%define with_ibase 1 +BuildRequires: firebird-devel +%endif + +# x86_64 specific stuff +%if "%{_lib}" != "lib" +%if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2) +BuildRequires: linux32 +%else +BuildRequires: util-linux +%endif +%endif + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires: coreutils +Requires: fontconfig >= 2.0 +Requires: /etc/ld.so.conf.d + +%if 0%{?mdkversion} || 0%{?mgaversion} +Obsoletes: %{_lib}qt3 +Provides: %{_lib}qt3 = 3.3.8.d +%endif + + +%description +TQt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +TQt is written in C++ and is fully object-oriented. + +This package contains the shared library needed to run TQt 3 +applications, as well as the README files for TQt 3. + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%doc FAQ LICENSE* README* changes* +%dir %{tde_libdir}/tqt3/plugins +%dir %{tde_libdir}/tqt3/plugins/sqldrivers +#%dir %{tde_libdir}/tqt3/plugins/styles +%{tde_datadir}/tqt3/translations/ +%dir %{tde_libdir}/tqt3/plugins/designer +%{tde_libdir}/tqt3/plugins/designer/libcppeditor.so +%{tde_libdir}/tqt3/plugins/designer/libdlgplugin.so +%{tde_libdir}/tqt3/plugins/designer/libgladeplugin.so +%{tde_libdir}/tqt3/plugins/designer/libkdevdlgplugin.so +%{tde_libdir}/tqt3/plugins/designer/librcplugin.so +%{tde_libdir}/tqt3/plugins/designer/libwizards.so +%dir %{tde_libdir}/tqt3/plugins/imageformats +%{tde_libdir}/tqt3/plugins/imageformats/libqmng.so +%dir %{tde_libdir}/tqt3/plugins/inputmethods +%{tde_libdir}/tqt3/plugins/inputmethods/libqimsw-multi.so +%{tde_libdir}/tqt3/plugins/inputmethods/libqimsw-none.so +%{tde_libdir}/tqt3/plugins/inputmethods/libqsimple.so +%{tde_libdir}/tqt3/plugins/inputmethods/libqxim.so +%{tde_libdir}/libtqt-mt.so.3 +%{tde_libdir}/libtqt-mt.so.3.3 +%{tde_libdir}/libtqt-mt.so.3.3.8 +%{tde_libdir}/libtqt-mt.la +%{tde_libdir}/libtqui.so.1 +%{tde_libdir}/libtqui.so.1.0 +%{tde_libdir}/libtqui.so.1.0.0 +%{tde_libdir}/libdesignercore.so.1 +%{tde_libdir}/libdesignercore.so.1.0 +%{tde_libdir}/libdesignercore.so.1.0.0 +%{tde_libdir}/libeditor.so.1 +%{tde_libdir}/libeditor.so.1.0 +%{tde_libdir}/libeditor.so.1.0.0 +%{tde_libdir}/libqassistantclient.so.1 +%{tde_libdir}/libqassistantclient.so.1.0 +%{tde_libdir}/libqassistantclient.so.1.0.0 + +########## + +%package config +Summary: Graphical configuration tool for programs using Qt 3 +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} + +%description config +TQt is a GUI software toolkit which simplifies the task of writing and +maintaining GUI (Graphical User Interface) applications +for the X Window System. + +TQt is written in C++ and is fully object-oriented. + +This package contains a graphical configuration tool for programs using TQt 3. + +%files config +%defattr(-,root,root,-) +%{tde_bindir}/tqtconfig + +########## + +%package devel +Summary: Development files for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains the files necessary to develop +applications using the TQt GUI toolkit: the header files, the TQt meta +object compiler. + +Install %{name}-devel if you want to develop GUI applications using the TQt 3 +toolkit. + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/conv2ui +%{tde_bindir}/qvfb +%{tde_bindir}/tqmoc +%{tde_bindir}/tquic +%{tde_bindir}/findtr +%{tde_bindir}/qt20fix +%{tde_bindir}/qtrename140 +%{tde_bindir}/tqassistant +%{tde_bindir}/qm2ts +%{tde_bindir}/tqmake +%{tde_bindir}/tqembed +%{tde_bindir}/tqlinguist +%{tde_bindir}/tqlupdate +%{tde_bindir}/tqlrelease +%{tde_bindir}/createcw +%{tde_bindir}/makeqpf +%{tde_bindir}/mergetr +%{tde_bindir}/msg2qm +%{tde_datadir}/tqt3/mkspecs/ +%{tde_datadir}/tqt3/phrasebooks/ +%{tde_includedir}/tqt3/ +%{tde_libdir}/libdesignercore.prl +%{tde_libdir}/libdesignercore.so +%{tde_libdir}/libeditor.prl +%{tde_libdir}/libeditor.so +%{tde_libdir}/libqassistantclient.prl +%{tde_libdir}/libqassistantclient.so +%{tde_libdir}/libtqt-mt.so +%{tde_libdir}/libtqt-mt.prl +%{tde_libdir}/libtqui.so +%{tde_libdir}/libtqui.prl +%{tde_libdir}/pkgconfig/tqt-mt.pc + + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +########## + +%package devel-docs +Summary: Documentation for the TQt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description devel-docs +The %{name}-devel-docs package contains the man pages, the HTML documentation and +example programs for TQt 3. + +%files devel-docs +%defattr(-,root,root,-) +%doc examples +%doc tutorial +%{tde_datadir}/tqt3/doc/html/ + +########## + +%package ODBC +Summary: ODBC drivers for TQt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description ODBC +ODBC driver for TQt 3's SQL classes (QSQL) + +%files ODBC +%defattr(-,root,root,-) +%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlodbc.so + +########## + +%package MySQL +Summary: MySQL drivers for TQt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description MySQL +MySQL driver for TQt 3's SQL classes (QSQL) + +%files MySQL +%defattr(-,root,root,-) +%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlmysql.so + +########## + +%package PostgreSQL +Summary: PostgreSQL drivers for TQt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description PostgreSQL +PostgreSQL driver for TQt 3's SQL classes (QSQL) + +%files PostgreSQL +%defattr(-,root,root,-) +%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlpsql.so + +########## + +%package sqlite +Summary: sqlite drivers for TQt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description sqlite +sqlite driver for TQt 3's SQL classes (QSQL) + +%files sqlite +%defattr(-,root,root,-) +%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlite.so + +########## + +%if %{?with_ibase} +%package ibase +Summary: ibase drivers for TQt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description ibase +ibase driver for TQt 3's SQL classes (QSQL) + +%files ibase +%defattr(-,root,root,-) +%{tde_libdir}/tqt3/plugins/sqldrivers/libqsqlibase.so +%endif + +########## + +%package designer +Summary: In3erface designer (IDE) for the Qt 3 toolkit +Group: Development/Tools +Requires: %{name}-devel = %{version}-%{release} + +%description designer +The %{name}-designer package contains an User Interface designer tool +for the TQt 3 toolkit. + +%files designer +%defattr(-,root,root,-) +%{tde_bindir}/tqdesigner +%{tde_datadir}/tqt3/templates/ + +########## + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .sharedlibs +%patch2 -p1 -b .ftbfs + +%build +unset QTDIR QTINC QTLIB +export QTDIR=$(pwd) +export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH +export MANPATH=${QTDIR}/doc/man:$MANPATH +export LD_LIBRARY_PATH=${QTDIR}/lib:$LD_LIBRARY_PATH + +# Checks for supplementary include dir +INCDIRS="" +for d in \ + /usr/include/fontconfig \ + /usr/include/pgsql/server \ + /usr/include/postgresql/server \ + /usr/include/Xft2 \ + /usr/include/Xft2/X11/Xft \ + /usr/include/mysql \ + /usr/include/libpng15 \ +; do + if [ -d "${d}" ]; then + INCDIRS="${INCDIRS} -I${d}" + fi +done + +# Checks for supplementary library dirs +LIBDIRS="" +for d in \ + %{_libdir}/mysql \ + %{_libdir}/pgsql \ +; do + if [ -d "${d}" ]; then + LIBDIRS="${LIBDIRS} -L${d}" + fi +done + +# build shared, threaded (default) libraries +echo yes | ./configure \ + ${INCDIRS} \ + ${LIBDIRS} \ + -L%{_libdir} \ + -prefix "%{tde_prefix}" \ + -libdir "%{tde_libdir}" \ + -sysconfdir "%{_sysconfdir}/tqt3" \ + -datadir "%{tde_datadir}/tqt3" \ + -headerdir "%{tde_includedir}/tqt3" \ + -docdir "%{tde_datadir}/tqt3/doc" \ + -plugindir "%{tde_libdir}/tqt3/plugins" \ + -translationdir "%{tde_datadir}/tqt3/translations" \ + \ + -thread \ + -shared \ + -fast \ + -no-exceptions \ +%if "%{_lib}" == "lib64" + -platform linux-g++-64 \ +%else + -platform linux-g++ \ +%endif + \ + -nis \ + -no-pch \ + -cups \ + -stl \ + -ipv6 \ + \ + -sm \ + -xshape \ + -xinerama \ + -xcursor \ + -xrandr \ + -xrender \ + -xft \ + -tablet \ + -xkb \ + \ + -system-zlib \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -system-nas-sound \ + \ + -enable-opengl \ + -dlopen-opengl \ + \ + -qt-gif \ + -qt-imgfmt-png \ + -qt-imgfmt-jpeg \ + -plugin-imgfmt-mng \ + \ + -plugin-sql-odbc \ + -plugin-sql-psql \ + -plugin-sql-mysql \ + %{?with_ibase:-plugin-sql-ibase} \ + -plugin-sql-sqlite \ + \ + -lfontconfig \ + -inputmethod \ + -glibmainloop + + +# Fix bad headers +rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h +ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h +ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h +ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h + +# proceed +#%__make %{?_smp_mflags} symlinks src-qmake src-moc +%__make %{?_smp_mflags} sub-src sub-plugins sub-tools + +# build conv2ui +%__make -C tools/designer/tools/conv2ui + +# build qvfb +%__make -C tools/qvfb + +# fix .prl files +%__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g" + + +%install +%__rm -rf %{buildroot} + +%__make -C src INSTALL_ROOT=%{?buildroot} install_target +%__make INSTALL_ROOT=%{?buildroot} install +%__make INSTALL_ROOT=%{?buildroot} plugins-install + +%__install -m755 bin/qtrename140 %{?buildroot}%{_bindir} +%__install -m755 bin/qt20fix %{?buildroot}%{_bindir} +%__install -m755 bin/findtr %{?buildroot}%{_bindir} + +# install conv2ui +%__install -m755 bin/conv2ui %{?buildroot}%{_bindir}/conv2ui + +# install qvfb +%__install -m755 tools/qvfb/qvfb %{?buildroot}%{_bindir}/qvfb + + +%clean +%__rm -rf %{buildroot} + + +%changelog +* Mon Feb 13 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build 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 new file mode 100755 index 000000000..5a86f514a --- /dev/null +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -0,0 +1,170 @@ +# Always build under "/usr" +%define tde_prefix /usr +%define cmake_modules_dir %{_datadir}/cmake/Modules + +# TQT include files may conflict with QT4 includes, so we move them to a subdirectory. +# Later compiled Trinity products should be aware of that ! +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} + +Name: trinity-tqtinterface +Version: 14.0.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +License: GPL +Summary: Trinity QT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +URL: http://www.trinitydesktop.org/ +Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tqt3-devel >= 14.0.0 +Requires: trinity-tqt3 >= 14.0.0 + +BuildRequires: gcc-c++ + +# PTHREAD support +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +BuildRequires: pth-devel +%endif + +# X11 libraries +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}xi-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 + +Obsoletes: tqtinterface < %{version}-%{release} +Provides: tqtinterface = %{version}-%{release} + + +%description +Trinity QT Interface + +%package devel +Group: Development/Libraries +Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} +Requires: trinity-tqt3-devel >= 14.0.0 + +Obsoletes: tqtinterface-devel < %{version}-%{release} +Provides: tqtinterface-devel = %{version}-%{release} + +%description devel +Development files for %{name} + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} + +%build +unset QTDIR + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \ + -DCMAKE_LIBRARY_PATH="%{tde_libdir}" \ + -DCMAKE_INCLUDE_PATH="%{tde_includedir}" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DWITH_QT3="ON" \ + -DQTDIR="%{tde_datadir}/tqt3" \ + -DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \ + -DQT_LIBRARY_DIRS="%{tde_libdir}" \ + -DBUILD_ALL="ON" \ + -DUSE_QT3="ON" \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +# RHEL 5: add newline at end of include files to avoid warnings +%if 0%{?rhel} && 0%{?rhel} <= 5 +for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do + echo "" >>${i} +done +%endif + +# Install 'cmake' modules for development use +%__mkdir_p %{?buildroot}%{cmake_modules_dir} +for i in cmake/modules/*.cmake; do + %__install -m 644 $i %{?buildroot}%{cmake_modules_dir} +done + +%clean +%__rm -rf %{?buildroot} + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files +%defattr(-,root,root,-) +%{tde_bindir}/convert_qt_tqt1 +%{tde_bindir}/convert_qt_tqt2 +%{tde_bindir}/convert_qt_tqt3 +%{tde_bindir}/dcopidl-tqt +%{tde_bindir}/dcopidl2cpp-tqt +%{tde_bindir}/dcopidlng-tqt +%{tde_bindir}/mcopidl-tqt +%{tde_bindir}/moc-tqt +%{tde_bindir}/tmoc +%{tde_bindir}/tqt-replace +%{tde_bindir}/tqt-replace-stream +%{tde_bindir}/uic-tqt +%{tde_libdir}/libtqassistantclient.so.4 +%{tde_libdir}/libtqassistantclient.so.4.2.0 +%{tde_libdir}/libtqt.so.4 +%{tde_libdir}/libtqt.so.4.2.0 + +%files devel +%defattr(-,root,root,-) +%{tde_includedir}/tqt/ +%{tde_libdir}/libtqassistantclient.la +%{tde_libdir}/libtqassistantclient.so +%{tde_libdir}/libtqt.la +%{tde_libdir}/libtqt.so +%{tde_libdir}/pkgconfig/tqt.pc +%{tde_libdir}/pkgconfig/tqtqui.pc +%{cmake_modules_dir}/*.cmake + + +%changelog +* Tue Feb 14 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14, using 'tqt3' instead of 'qt3' diff --git a/redhat/dependencies/tqtinterface/tqtinterface-r14.spec b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec deleted file mode 100755 index 18c9c463b..000000000 --- a/redhat/dependencies/tqtinterface/tqtinterface-r14.spec +++ /dev/null @@ -1,91 +0,0 @@ -# Always build under "/usr" -%define _prefix /usr -%define cmake_modules_dir %{_datadir}/cmake/Modules - -Name: tqtinterface -Version: r14 -Release: 1%{?dist} -License: GPL -Summary: Trinity QT Interface -Group: System Environment/Libraries - -Vendor: Trinity Project -URL: http://www.trinitydesktop.org/ -Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz - - -BuildRequires: cmake >= 2.8 -BuildRequires: tqt3-devel >= 3.4.0 -BuildRequires: gcc-c++ -BuildRequires: libXi-devel -BuildRequires: pth-devel - -Requires: tqt3 >= 3.4.0 - -%description -Trinity QT Interface - -%package devel -Group: Development/Libraries -Summary: %{name} - Development files -Requires: %{name} = %{version}-%{release} -Requires: tqt3-devel >= 3.4.0 - -%description devel -Development files for %{name} - -%prep -%setup -q -n dependencies/%{name} - -%build -%__mkdir build -cd build -%cmake \ - -DQT_VERSION=3 \ - -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \ - -DMOC_EXECUTABLE=/usr/bin/moc-tqt3 \ - -DUIC_EXECUTABLE=/usr/bin/uic-tqt3 \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - -# RHEL 5: add newline at end of include files to avoid warnings -%if 0%{?rhel} && 0%{?rhel} <= 5 -for i in %{?buildroot}%{_includedir}/tqt/*.h; do - echo "" >>${i} -done -%endif - -# Install 'cmake' modules for development use -%__mkdir_p %{?buildroot}%{cmake_modules_dir} -for i in cmake/modules/*.cmake; do - %__install -m 644 $i %{?buildroot}%{cmake_modules_dir} -done - -%clean -%__rm -rf %{?buildroot} - -%files -%{_bindir}/* -%{_libdir}/*.so.* - -%files devel -%{_includedir}/tqt/ -%{_libdir}/*.so -%{_libdir}/*.la -%{_libdir}/pkgconfig/*.pc -%{cmake_modules_dir}/*.cmake - - -%changelog -* Tue Feb 14 2012 Francois Andriot <francois.andriot@free.fr> - r14-1 -- Initial build for TDE R14, using 'tqt3' instead of 'qt3' |