parent
bb94b933be
commit
a4937b110c
@ -1,14 +0,0 @@
|
||||
#!/bin/bash
|
||||
# This script is called automatically during autobuild checkin.
|
||||
|
||||
cp -fl qt3.changes qt3-extensions.changes
|
||||
cp -fl qt3.changes qt3-devel-doc.changes
|
||||
|
||||
for spec in qt3-extensions.spec qt3-devel-doc.spec; do
|
||||
{ sed -n -e '1,/COMMON-BEGIN/p' $spec.in
|
||||
sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' qt3.spec
|
||||
sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && perl update_spec.pl $spec.tmp attributes > $spec && rm $spec.tmp
|
||||
done
|
||||
|
||||
|
||||
osc service localrun format_spec_file
|
||||
@ -1,53 +0,0 @@
|
||||
Index: src/kernel/qapplication.cpp
|
||||
===================================================================
|
||||
--- src/kernel/qapplication.cpp.orig
|
||||
+++ src/kernel/qapplication.cpp
|
||||
@@ -320,6 +320,7 @@ void qt_init( int *, char **, QApplicati
|
||||
void qt_cleanup();
|
||||
#if defined(Q_WS_X11)
|
||||
void qt_init( Display* dpy, Qt::HANDLE, Qt::HANDLE );
|
||||
+void qt_init( int *, char **, Display* dpy, Qt::HANDLE, Qt::HANDLE );
|
||||
#endif
|
||||
Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop );
|
||||
|
||||
@@ -908,7 +909,7 @@ QApplication::QApplication(Display *dpy,
|
||||
|
||||
qt_init( &argc, argv, GuiClient );
|
||||
} else {
|
||||
- qt_init(dpy, visual, colormap);
|
||||
+ qt_init( &argc, argv, dpy, visual, colormap);
|
||||
}
|
||||
|
||||
process_cmdline( &argc, argv );
|
||||
Index: src/kernel/qapplication_x11.cpp
|
||||
===================================================================
|
||||
--- src/kernel/qapplication_x11.cpp.orig
|
||||
+++ src/kernel/qapplication_x11.cpp
|
||||
@@ -201,6 +201,7 @@ static bool mwIconic = FALSE; // main wi
|
||||
static Display *appDpy = 0; // X11 application display
|
||||
static char *appDpyName = 0; // X11 display name
|
||||
static bool appForeignDpy = FALSE; // we didn't create display
|
||||
+Q_EXPORT bool qt_no_foreign_hack = false;
|
||||
static bool appSync = FALSE; // X11 synchronization
|
||||
#if defined(QT_DEBUG)
|
||||
static bool appNoGrab = FALSE; // X11 grabbing enabled
|
||||
@@ -1651,7 +1652,7 @@ void qt_init_internal( int *argcptr, cha
|
||||
}
|
||||
#endif
|
||||
|
||||
- if ( display ) {
|
||||
+ if ( display && ! qt_no_foreign_hack ) {
|
||||
// Qt part of other application
|
||||
|
||||
appForeignDpy = TRUE;
|
||||
@@ -2464,6 +2465,10 @@ void qt_init( Display *display, Qt::HAND
|
||||
qt_init_internal( 0, 0, display, visual, colormap );
|
||||
}
|
||||
|
||||
+void qt_init( int *argcptr, char **argv, Display *display, Qt::HANDLE visual, Qt::HANDLE colormap )
|
||||
+{
|
||||
+ qt_init_internal( argcptr, argv, display, visual, colormap );
|
||||
+}
|
||||
|
||||
/*****************************************************************************
|
||||
qt_cleanup() - cleans up when the application is finished
|
||||
@ -1,366 +0,0 @@
|
||||
#
|
||||
# spec file for package qt3
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: qt3
|
||||
#Remember also to modify Requires in -devel package
|
||||
BuildRequires: Mesa-devel
|
||||
BuildRequires: c++_compiler
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libmng-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: tar
|
||||
Url: http://www.trolltech.com/
|
||||
%if %suse_version > 1220
|
||||
BuildRequires: libpng15-compat-devel
|
||||
%else
|
||||
BuildRequires: libpng14-compat-devel
|
||||
%endif
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: qt3-64bit
|
||||
%endif
|
||||
#
|
||||
Summary: A library for developing applications with graphical user interfaces
|
||||
License: GPL-2.0 or GPL-3.0 or QPL-1.0
|
||||
Group: System/Libraries
|
||||
Version: 3.3.8d
|
||||
Release: 1
|
||||
Provides: qt_library_%version
|
||||
Recommends: kdelibs3-default-style
|
||||
PreReq: /bin/grep
|
||||
# COMMON-BEGIN
|
||||
%define x11_free -x11-free-
|
||||
%define rversion 3.3.8b
|
||||
Source0: qt3-3.5.13.1.tar.gz
|
||||
Source1: build_script.sh
|
||||
Source2: qtconfig3.desktop
|
||||
Source3: qtrc
|
||||
Source4: assistant3.png
|
||||
Source6: assistant3.desktop
|
||||
Source7: designer.desktop
|
||||
Source8: designer.png
|
||||
Source9: linguist.desktop
|
||||
Source5: linguist.png
|
||||
Source10: qt3.sh
|
||||
Source11: qt3.csh
|
||||
# Translations did not change at 3.3.8c
|
||||
Source12: qt3-3.3.8b-translations.tar.bz2
|
||||
Source100: qtkdeintegration_x11.cpp
|
||||
Source101: qtkdeintegration_x11_p.h
|
||||
Source102: baselibs.conf
|
||||
Source200: attributes
|
||||
Source201: update_spec.pl
|
||||
Patch1: aliasing.diff
|
||||
Patch2: head.diff
|
||||
Patch4: qt3-never-strip.diff
|
||||
Patch5: external-libs.diff
|
||||
Patch12: qtrc-path.diff
|
||||
Patch14: lib64-plugin-support.diff
|
||||
Patch15: pluginmanager-fix.diff
|
||||
Patch18: no-rpath.dif
|
||||
Patch19: shut-up.diff
|
||||
Patch23: fix-accessible.diff
|
||||
# From http://www.freedesktop.org/wiki/Software_2fImmoduleQtDownload
|
||||
# Current version from http://freedesktop.org/~daisuke/qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2
|
||||
Patch31: limit-image-size.diff
|
||||
Patch35: qt-transparency.patch
|
||||
Patch37: 0055-qtextedit_zoom.patch
|
||||
Patch39: fix-qtranslator-crash.diff
|
||||
Patch42: add_qexport_visibility.patch
|
||||
Patch54: kmenu-search-fix.diff
|
||||
Patch113: fix-assistant-path.patch
|
||||
Patch117: qtimer-debug.diff
|
||||
Patch121: qt3-warnings.diff
|
||||
Patch125: qcstring-format-warnings.diff
|
||||
Patch127: mng-reading-fix.patch
|
||||
Patch134: fix-xinput-clash.diff
|
||||
Patch135: parseFontName.diff
|
||||
Patch136: qt3-no-date.diff
|
||||
Patch139: gcc46.diff
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Qt is a program library for developing applications with graphical user
|
||||
interfaces. It allows you to rapidly develop professional programs. The
|
||||
Qt library is available not only for Linux but for a great number of
|
||||
Unices and even for Windows. Thus it is possible to write programs that
|
||||
may be easily ported to those platforms.
|
||||
|
||||
You need a license for using Qt with a non-GPL application, which can
|
||||
be acquired from sales@trolltech.com.
|
||||
|
||||
See /usr/share/doc/packages/qt3 for details about the new features of
|
||||
the current Qt library!
|
||||
|
||||
%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
|
||||
|
||||
%prep
|
||||
%setup -q -n qt3-3.5.13.1
|
||||
%patch1
|
||||
%patch2
|
||||
%patch4
|
||||
%patch5
|
||||
%patch12
|
||||
if [ "%_lib" = "lib64" ]; then
|
||||
%patch14
|
||||
fi
|
||||
%patch15
|
||||
%patch18
|
||||
%patch19
|
||||
%patch23
|
||||
%patch31
|
||||
%patch35
|
||||
%patch37
|
||||
%patch39
|
||||
%patch42
|
||||
%patch54
|
||||
%patch113
|
||||
%patch117
|
||||
%patch121
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontext.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
|
||||
ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/
|
||||
%patch125
|
||||
%patch127
|
||||
%patch134
|
||||
%patch135
|
||||
%patch136
|
||||
%patch139
|
||||
# copy qt kde integration files
|
||||
cp %SOURCE100 %SOURCE101 src/kernel/
|
||||
cp %SOURCE101 include/private/
|
||||
cd translations
|
||||
tar xvjf %SOURCE12
|
||||
cd ..
|
||||
# COMMON-END
|
||||
|
||||
%package devel
|
||||
Summary: Include Files and Libraries mandatory for Development
|
||||
Group: Development/Libraries/X11
|
||||
Requires: c++_compiler
|
||||
Requires: cups-devel
|
||||
Requires: freetype2-devel
|
||||
Requires: libjpeg-devel
|
||||
Requires: libmng-devel
|
||||
Requires: pkgconfig
|
||||
Requires: qt3 = %version
|
||||
Requires: xorg-x11-devel
|
||||
%if %suse_version > 1120
|
||||
Recommends: libpng14-compat-devel
|
||||
Requires: libpng-devel
|
||||
%else
|
||||
Requires: libpng-devel
|
||||
%endif
|
||||
%if %suse_version > 1000
|
||||
Requires: Mesa-devel
|
||||
%else
|
||||
Requires: xorg-x11-Mesa
|
||||
Requires: xorg-x11-Mesa-devel
|
||||
%endif
|
||||
%ifnarch x86_64 s390x sparc64 ppc64 mips64
|
||||
Conflicts: devel_libs-32bit
|
||||
%endif
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: qt3-devel-64bit
|
||||
%endif
|
||||
#
|
||||
|
||||
%description devel
|
||||
You need this package if you want to compile programs with Qt 3. It
|
||||
contains the "Qt Crossplatform Development Kit 2". Under /usr/lib/qt3
|
||||
you will find include files.
|
||||
|
||||
You need a license for using Qt with a non-GPL application. A license
|
||||
can be acquired at sales@trolltech.com.
|
||||
|
||||
%build
|
||||
export VERSION=%suse_version
|
||||
source %SOURCE1 %{version}
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
if [ %_lib == "lib64" ]; then
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DUSE_LIB64_PATHES"
|
||||
fi
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
#
|
||||
# call build from build_script.rpmrc for threaded Qt library
|
||||
# only really needed tools will be builded here, all extra tools will be
|
||||
# builded in qt3.spec
|
||||
#
|
||||
call_configure -v -thread -shared -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite $OPTIONS
|
||||
for i in %build_sub_dirs ; do
|
||||
cd $i
|
||||
make %{?jobs:-j%jobs}
|
||||
cd -
|
||||
done
|
||||
|
||||
%install
|
||||
export VERSION=%suse_version
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
source %SOURCE1 %{version}
|
||||
for i in %build_sub_dirs ; do
|
||||
cd $i
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||
cd -
|
||||
done
|
||||
post_install $RPM_BUILD_ROOT/usr/lib/qt3/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||
sed -i -e 's, on: .*,,' $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.la
|
||||
#
|
||||
# copy additional files
|
||||
#
|
||||
install -m 0755 bin/qmake bin/moc ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/
|
||||
install -m 0755 -d ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/
|
||||
install -m 0644 translations/*.qm ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/
|
||||
if [ %_lib = lib64 ]; then
|
||||
for i in $RPM_BUILD_ROOT/usr/lib/qt3/plugins/*/*.so; do
|
||||
mv "$i" "${i%.so}.lib64.so"
|
||||
done
|
||||
fi
|
||||
#
|
||||
# move pkgconfig files
|
||||
#
|
||||
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
|
||||
mv $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/pkgconfig/*.pc \
|
||||
$RPM_BUILD_ROOT/%_libdir/pkgconfig
|
||||
rmdir $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/pkgconfig
|
||||
#
|
||||
# move docs in doc dir
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||
cp -a mkspecs/* ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||
if [ %_lib == "lib64" ]; then
|
||||
ln -sf linux-g++-64 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/default
|
||||
else
|
||||
ln -sf linux-g++ ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/default
|
||||
fi
|
||||
find ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs -type f -perm /111 -print0 | xargs -0 chmod a-x
|
||||
#
|
||||
# create links in ld.so.conf path
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}
|
||||
ln -sf ../lib/qt3/%{_lib}/libqt-mt.so.3 ${RPM_BUILD_ROOT}/%{_libdir}/libqt-mt.so.3
|
||||
ln -sf ../lib/qt3/%{_lib}/libqui.so.1 ${RPM_BUILD_ROOT}/%{_libdir}/libqui.so.1
|
||||
[ "lib" != "%{_lib}" ] && \
|
||||
ln -sf ../lib/qt3 ${RPM_BUILD_ROOT}/%{_libdir}/qt3
|
||||
mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
|
||||
install -m 644 %SOURCE10 %SOURCE11 ${RPM_BUILD_ROOT}/etc/profile.d
|
||||
#
|
||||
# default qt settings
|
||||
#
|
||||
mkdir -p ${RPM_BUILD_ROOT}/etc/X11
|
||||
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/qt3/etc/
|
||||
ln -sf /etc/X11/ ${RPM_BUILD_ROOT}/usr/lib/qt3/etc/settings
|
||||
install -m 0644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/X11/qtrc
|
||||
#
|
||||
# clean broken links
|
||||
#
|
||||
if [ %_lib == "lib64" ]; then
|
||||
rm ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/linux-g++-64/linux-g++-64
|
||||
else
|
||||
rm ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/linux-g++/linux-g++
|
||||
fi
|
||||
rm -rf ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/html
|
||||
|
||||
%pre
|
||||
if test -L usr/lib/qt3; then
|
||||
rm usr/lib/qt3
|
||||
fi
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
if ! grep -q '^\[3.3\]' etc/X11/qtrc ; then
|
||||
echo "" >> etc/X11/qtrc
|
||||
echo "[3.3]" >> etc/X11/qtrc
|
||||
echo "libraryPath=/opt/kde3/lib64/kde3/plugins/:/opt/kde3/lib/kde3/plugins/" >> etc/X11/qtrc
|
||||
fi
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,755)
|
||||
# FIXME provide new changelog if kb9vqf will give one
|
||||
%doc changes-3.3.8b README* LICENSE* MANIFEST FAQ
|
||||
%dir /usr/lib/qt3/translations
|
||||
%dir /usr/lib/qt3
|
||||
%dir /usr/lib/qt3/bin
|
||||
%dir /usr/lib/qt3/%{_lib}
|
||||
%{_libdir}/libqt-mt.so.*
|
||||
%{_libdir}/libqui.so.*
|
||||
/usr/lib/qt3/bin/qtconfig
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.so.*
|
||||
/usr/lib/qt3/%{_lib}/libqui.so.*
|
||||
%dir /usr/lib/qt3/etc
|
||||
/usr/lib/qt3/etc/settings
|
||||
/usr/lib/qt3/plugins
|
||||
/usr/lib/qt3/bin/assistant
|
||||
%lang(de) /usr/lib/qt3/translations/assistant_de.qm
|
||||
%lang(ar) /usr/lib/qt3/translations/qt_ar.qm
|
||||
%lang(ca) /usr/lib/qt3/translations/qt_ca.qm
|
||||
%lang(cs) /usr/lib/qt3/translations/qt_cs.qm
|
||||
%lang(de) /usr/lib/qt3/translations/qt_de.qm
|
||||
%lang(es) /usr/lib/qt3/translations/qt_es.qm
|
||||
%lang(fr) /usr/lib/qt3/translations/qt_fr.qm
|
||||
%lang(he) /usr/lib/qt3/translations/qt_he.qm
|
||||
%lang(ru) /usr/lib/qt3/translations/qt_ru.qm
|
||||
%lang(sk) /usr/lib/qt3/translations/qt_sk.qm
|
||||
%lang(it) /usr/lib/qt3/translations/qt_it.qm
|
||||
%lang(ja) /usr/lib/qt3/translations/qt_ja.qm
|
||||
%lang(nb) /usr/lib/qt3/translations/qt_nb.qm
|
||||
%lang(pl) /usr/lib/qt3/translations/qt_pl.qm
|
||||
%lang(pt) /usr/lib/qt3/translations/qt_pt-br.qm
|
||||
%lang(pt) /usr/lib/qt3/translations/qt_pt.qm
|
||||
%lang(zh) /usr/lib/qt3/translations/qt_zh-cn.qm
|
||||
%lang(zh) /usr/lib/qt3/translations/qt_zh-tw.qm
|
||||
%config(noreplace) /etc/X11/qtrc
|
||||
%ifarch s390x sparc64 x86_64 ppc64 mips64
|
||||
%dir %{_libdir}/qt3
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,755)
|
||||
# FIXME provide new changelog if kb9vqf will give one
|
||||
%doc changes-3.3.8b
|
||||
/usr/lib/qt3/bin/moc
|
||||
/usr/lib/qt3/bin/qmake
|
||||
/usr/lib/qt3/bin/uic
|
||||
/usr/lib/qt3/include
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.la
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.so
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.prl
|
||||
/usr/lib/qt3/%{_lib}/libqui.so
|
||||
/usr/lib/qt3/%{_lib}/libqui.prl
|
||||
/usr/lib/qt3/mkspecs
|
||||
/%_libdir/pkgconfig/qt-mt.pc
|
||||
/usr/lib/qt3/%_lib/libqassistantclient.*
|
||||
%config /etc/profile.d/qt3.*
|
||||
|
||||
%changelog
|
||||
* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
|
||||
- Initial build for TDE 3.5.13.1
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,197 +0,0 @@
|
||||
#
|
||||
# spec file for package qt3-devel-doc
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: qt3-devel-doc
|
||||
BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ pkgconfig qt3-devel update-desktop-files
|
||||
%if %suse_version < 1130
|
||||
BuildRequires: libpng-devel
|
||||
%else
|
||||
BuildRequires: libpng14-devel
|
||||
%endif
|
||||
Url: http://www.trolltech.com/
|
||||
License: GPL, QPL
|
||||
AutoReqProv: on
|
||||
Summary: Documentation for the Qt 3 Development Kit
|
||||
Group: Documentation/HTML
|
||||
Version: 3.4.0
|
||||
Release: 1
|
||||
PreReq: /bin/grep
|
||||
BuildArch: noarch
|
||||
Provides: qt3-devel-tutorial
|
||||
Obsoletes: qt3-devel-tutorial
|
||||
Requires: qt3-devel
|
||||
# COMMON-BEGIN
|
||||
# COMMON-BEGIN
|
||||
Source0: qt3-%{version}.tar.bz2
|
||||
Source1: build_script.sh
|
||||
Source2: qtconfig3.desktop
|
||||
Source3: qtrc
|
||||
Source4: assistant3.png
|
||||
Source6: assistant3.desktop
|
||||
Source7: designer.desktop
|
||||
Source8: designer.png
|
||||
Source9: linguist.desktop
|
||||
Source5: linguist.png
|
||||
Source10: qt3.sh
|
||||
Source11: qt3.csh
|
||||
# Translations did not change
|
||||
Source12: qt3-3.3.8b-translations.tar.bz2
|
||||
Source102: baselibs.conf
|
||||
Source200: attributes
|
||||
Source201: update_spec.pl
|
||||
Patch1: aliasing.diff
|
||||
Patch2: head.diff
|
||||
Patch4: qt3-never-strip.diff
|
||||
Patch5: external-libs.diff
|
||||
Patch12: qtrc-path.diff
|
||||
Patch14: lib64-plugin-support.diff
|
||||
Patch15: pluginmanager-fix.diff
|
||||
Patch18: no-rpath.dif
|
||||
Patch19: shut-up.diff
|
||||
Patch23: fix-accessible.diff
|
||||
Patch31: limit-image-size.diff
|
||||
Patch35: qt-transparency.patch
|
||||
Patch37: 0055-qtextedit_zoom.patch
|
||||
Patch39: fix-qtranslator-crash.diff
|
||||
Patch54: kmenu-search-fix.diff
|
||||
Patch113: fix-assistant-path.patch
|
||||
Patch117: qtimer-debug.diff
|
||||
Patch127: mng-reading-fix.patch
|
||||
Patch134: fix-xinput-clash.diff
|
||||
Patch135: parseFontName.diff
|
||||
Patch136: qt3-no-date.diff
|
||||
Patch139: gcc46.diff
|
||||
Patch140: revert-iodbc-to-uodbc.diff
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
This package contains the documentation for the Qt 3 Development Kit.
|
||||
|
||||
You will find documentation, precompiled examples, and a tutorial for
|
||||
getting started with Qt in /usr/lib/qt3/doc.
|
||||
|
||||
This package contains the documentation for the Qt 3 Development Kit.
|
||||
|
||||
You will find documentation, precompiled examples, and a tutorial for
|
||||
getting started with Qt in /usr/lib/qt3/doc.
|
||||
|
||||
%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2
|
||||
%patch4
|
||||
%patch5
|
||||
%patch12
|
||||
if [ "%_lib" = "lib64" ]; then
|
||||
%patch14
|
||||
fi
|
||||
%patch15
|
||||
%patch18
|
||||
%patch19
|
||||
%patch23
|
||||
%patch31
|
||||
%patch35
|
||||
%patch37
|
||||
%patch39
|
||||
%patch54
|
||||
%patch113
|
||||
%patch117
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontext.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
|
||||
ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/
|
||||
%patch127
|
||||
%patch134
|
||||
%patch135
|
||||
%patch136
|
||||
%patch139
|
||||
%patch140
|
||||
cd translations
|
||||
tar xvjf %SOURCE12
|
||||
cd ..
|
||||
# COMMON-END
|
||||
# COMMON-END
|
||||
|
||||
%description
|
||||
This package contains the documentation for the Qt 3 Development Kit.
|
||||
|
||||
You will find documentation, precompiled examples, and a tutorial for
|
||||
getting started with Qt in /usr/lib/qt3/doc.
|
||||
|
||||
This package contains the documentation for the Qt 3 Development Kit.
|
||||
|
||||
You will find documentation, precompiled examples, and a tutorial for
|
||||
getting started with Qt in /usr/lib/qt3/doc.
|
||||
|
||||
%build
|
||||
export VERSION=%suse_version
|
||||
source %SOURCE1 %{version}
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
if [ %_lib == "lib64" ]; then
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DUSE_LIB64_PATHES"
|
||||
fi
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
#
|
||||
# call build from build_script.rpmrc for threaded Qt library
|
||||
# only really needed tools will be builded here, all extra tools will be
|
||||
# builded in qt3.spec
|
||||
#
|
||||
call_configure -thread -shared -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite $OPTIONS
|
||||
cd src
|
||||
make %{?jobs:-j%jobs}
|
||||
cd ..
|
||||
|
||||
%install
|
||||
export VERSION=%suse_version
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
source %SOURCE1 %{version}
|
||||
cd src
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs
|
||||
cd ..
|
||||
#
|
||||
# install menu entries
|
||||
#
|
||||
%suse_update_desktop_file -i -u qtconfig3 Qt Utility DesktopSettings
|
||||
%suse_update_desktop_file -i assistant3 Qt Development Documentation
|
||||
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||
ln -sf /usr/lib/qt3/doc/html ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||
install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/doc
|
||||
%doc /usr/lib/qt3/doc/html
|
||||
%{_docdir}/qt3/html
|
||||
/usr/share/applications/qtconfig3.desktop
|
||||
/usr/share/applications/assistant3.desktop
|
||||
/usr/share/pixmaps/assistant3.png
|
||||
|
||||
%changelog
|
||||
@ -1,104 +0,0 @@
|
||||
#
|
||||
# spec file for package qt3-devel-doc
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: qt3-devel-doc
|
||||
BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ pkgconfig update-desktop-files qt3-devel
|
||||
%if %suse_version < 1130
|
||||
BuildRequires: libpng-devel
|
||||
%else
|
||||
BuildRequires: libpng14-devel
|
||||
%endif
|
||||
URL: http://www.trolltech.com/
|
||||
License: GPL, QPL
|
||||
Autoreqprov: on
|
||||
Summary: Documentation for the Qt 3 Development Kit
|
||||
Group: Documentation/HTML
|
||||
Version: 3.4.0
|
||||
Release: 1
|
||||
PreReq: /bin/grep
|
||||
BuildArch: noarch
|
||||
Provides: qt3-devel-tutorial
|
||||
Obsoletes: qt3-devel-tutorial
|
||||
Requires: qt3-devel
|
||||
# COMMON-BEGIN
|
||||
# COMMON-END
|
||||
|
||||
%description
|
||||
This package contains the documentation for the Qt 3 Development Kit.
|
||||
|
||||
You will find documentation, precompiled examples, and a tutorial for
|
||||
getting started with Qt in /usr/lib/qt3/doc.
|
||||
|
||||
This package contains the documentation for the Qt 3 Development Kit.
|
||||
|
||||
You will find documentation, precompiled examples, and a tutorial for
|
||||
getting started with Qt in /usr/lib/qt3/doc.
|
||||
|
||||
%build
|
||||
export VERSION=%suse_version
|
||||
source %SOURCE1 %{version}
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
if [ %_lib == "lib64" ]; then
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DUSE_LIB64_PATHES"
|
||||
fi
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
#
|
||||
# call build from build_script.rpmrc for threaded Qt library
|
||||
# only really needed tools will be builded here, all extra tools will be
|
||||
# builded in qt3.spec
|
||||
#
|
||||
call_configure -thread -shared -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite $OPTIONS
|
||||
cd src
|
||||
make %{?jobs:-j%jobs}
|
||||
cd ..
|
||||
|
||||
%install
|
||||
export VERSION=%suse_version
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
source %SOURCE1 %{version}
|
||||
cd src
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs
|
||||
cd ..
|
||||
#
|
||||
# install menu entries
|
||||
#
|
||||
%suse_update_desktop_file -i -u qtconfig3 Qt Utility DesktopSettings
|
||||
%suse_update_desktop_file -i assistant3 Qt Development Documentation
|
||||
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||
ln -sf /usr/lib/qt3/doc/html ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||
install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/doc
|
||||
%doc /usr/lib/qt3/doc/html
|
||||
%{_docdir}/qt3/html
|
||||
/usr/share/applications/qtconfig3.desktop
|
||||
/usr/share/applications/assistant3.desktop
|
||||
/usr/share/pixmaps/assistant3.png
|
||||
|
||||
%changelog
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,389 +0,0 @@
|
||||
#
|
||||
# spec file for package qt3-extensions
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: qt3-extensions
|
||||
BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
|
||||
%if %suse_version > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
License: GPL, QPL
|
||||
Version: 3.4.0
|
||||
Release: 1
|
||||
AutoReqProv: on
|
||||
Requires: qt3 = %version
|
||||
Group: Development/Tools/Other
|
||||
Summary: Qt3 Extensions
|
||||
# COMMON-BEGIN
|
||||
# COMMON-BEGIN
|
||||
Source0: qt3-%{version}.tar.bz2
|
||||
Source1: build_script.sh
|
||||
Source2: qtconfig3.desktop
|
||||
Source3: qtrc
|
||||
Source4: assistant3.png
|
||||
Source6: assistant3.desktop
|
||||
Source7: designer.desktop
|
||||
Source8: designer.png
|
||||
Source9: linguist.desktop
|
||||
Source5: linguist.png
|
||||
Source10: qt3.sh
|
||||
Source11: qt3.csh
|
||||
# Translations did not change
|
||||
Source12: qt3-3.3.8b-translations.tar.bz2
|
||||
Source102: baselibs.conf
|
||||
Source200: attributes
|
||||
Source201: update_spec.pl
|
||||
Patch1: aliasing.diff
|
||||
Patch2: head.diff
|
||||
Patch4: qt3-never-strip.diff
|
||||
Patch5: external-libs.diff
|
||||
Patch12: qtrc-path.diff
|
||||
Patch14: lib64-plugin-support.diff
|
||||
Patch15: pluginmanager-fix.diff
|
||||
Patch18: no-rpath.dif
|
||||
Patch19: shut-up.diff
|
||||
Patch23: fix-accessible.diff
|
||||
Patch31: limit-image-size.diff
|
||||
Patch35: qt-transparency.patch
|
||||
Patch37: 0055-qtextedit_zoom.patch
|
||||
Patch39: fix-qtranslator-crash.diff
|
||||
Patch54: kmenu-search-fix.diff
|
||||
Patch113: fix-assistant-path.patch
|
||||
Patch117: qtimer-debug.diff
|
||||
Patch127: mng-reading-fix.patch
|
||||
Patch134: fix-xinput-clash.diff
|
||||
Patch135: parseFontName.diff
|
||||
Patch136: qt3-no-date.diff
|
||||
Patch139: gcc46.diff
|
||||
Patch140: revert-iodbc-to-uodbc.diff
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
This package contains extension libraries for Qt 3, such as the
|
||||
Netscape plug-in modules.
|
||||
|
||||
This package contains extension libraries for Qt 3, such as the
|
||||
Netscape plug-in modules.
|
||||
|
||||
%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2
|
||||
%patch4
|
||||
%patch5
|
||||
%patch12
|
||||
if [ "%_lib" = "lib64" ]; then
|
||||
%patch14
|
||||
fi
|
||||
%patch15
|
||||
%patch18
|
||||
%patch19
|
||||
%patch23
|
||||
%patch31
|
||||
%patch35
|
||||
%patch37
|
||||
%patch39
|
||||
%patch54
|
||||
%patch113
|
||||
%patch117
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontext.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
|
||||
ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/
|
||||
%patch127
|
||||
%patch134
|
||||
%patch135
|
||||
%patch136
|
||||
%patch139
|
||||
%patch140
|
||||
cd translations
|
||||
tar xvjf %SOURCE12
|
||||
cd ..
|
||||
# COMMON-END
|
||||
# COMMON-END
|
||||
|
||||
%description
|
||||
This package contains extension libraries for Qt 3, such as the
|
||||
Netscape plug-in modules.
|
||||
|
||||
This package contains extension libraries for Qt 3, such as the
|
||||
Netscape plug-in modules.
|
||||
|
||||
%package -n qt3-devel-examples
|
||||
Summary: Programming Examples for Qt 3
|
||||
AutoReqProv: on
|
||||
Group: Development/Sources
|
||||
Provides: qt3-examples
|
||||
Obsoletes: qt3-examples
|
||||
|
||||
%description -n qt3-devel-examples
|
||||
This package contains small executables with code to demonstrate Qt
|
||||
programming.
|
||||
|
||||
Have a look in /usr/share/doc/packages/qt3/examples/.
|
||||
|
||||
%package -n qt3-mysql
|
||||
Summary: MySQL Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Productivity/Databases/Clients
|
||||
|
||||
%description -n qt3-mysql
|
||||
Plug-in for using the MySQL database with the generic Qt database
|
||||
interface.
|
||||
|
||||
%package -n qt3-unixODBC
|
||||
Summary: A UnixODBC Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Productivity/Databases/Clients
|
||||
|
||||
%description -n qt3-unixODBC
|
||||
A plug-in for using UnixODBC supported databases with the generic Qt
|
||||
database interface.
|
||||
|
||||
%package -n qt3-postgresql
|
||||
Summary: A PostgreSQL Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Productivity/Databases/Clients
|
||||
|
||||
%description -n qt3-postgresql
|
||||
A Plug-in for using the PostgreSQL database with the generic Qt
|
||||
database interface.
|
||||
|
||||
%package -n qt3-sqlite
|
||||
Summary: SQLite Database Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Development/Tools/Other
|
||||
|
||||
%description -n qt3-sqlite
|
||||
The Qt database supports SQLite with this plug-in. (No configured and
|
||||
running daemon is required.)
|
||||
|
||||
%package -n qt3-devel-tools
|
||||
Summary: User Interface Builder and other tools (designer, assistant, linguist)
|
||||
AutoReqProv: on
|
||||
Requires: qt3-devel = %version
|
||||
Provides: qt3-designer
|
||||
Obsoletes: qt3-designer
|
||||
Group: Development/Tools/GUI Builders
|
||||
|
||||
%description -n qt3-devel-tools
|
||||
The designer creates .ui files. The uic generates C++ code from these
|
||||
files. The package also contains the Qt Assistant (Qt documentation
|
||||
browser) and the Qt Linguist (for translations).
|
||||
|
||||
%package -n qt3-man
|
||||
Summary: Qt 3 Man Pages
|
||||
AutoReqProv: on
|
||||
Requires: qt3-devel = %version
|
||||
Conflicts: qtman qt-man
|
||||
Group: Documentation/Man
|
||||
|
||||
%description -n qt3-man
|
||||
This package contains all the man pages for all the Qt 3 classes.
|
||||
|
||||
%build
|
||||
export QTDIR=/usr/lib/qt3/
|
||||
export WLIB=%_lib
|
||||
export VERSION=%suse_version
|
||||
source %{SOURCE1} %{version}
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
#
|
||||
# compile threaded version to build all tools.
|
||||
# the lib itself becomes packaged from qt3.spec
|
||||
#
|
||||
call_configure -thread -shared -L$PWD/%_lib $OPTIONS
|
||||
ln -sf /usr/lib/qt3/%_lib/* lib/
|
||||
ln -sf /usr/lib/qt3/bin/* bin/
|
||||
cd plugins/src
|
||||
make %{?jobs:-j%jobs}
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||
cd -
|
||||
#
|
||||
# build examples
|
||||
#
|
||||
cd tools/assistant/lib
|
||||
make %{?jobs:-j%jobs}
|
||||
cd -
|
||||
cd examples
|
||||
make %{?jobs:-j%jobs}
|
||||
cd -
|
||||
#
|
||||
# build extra tools
|
||||
#
|
||||
cd tools
|
||||
make %{?jobs:-j%jobs}
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||
for i in qvfb qembed qconfig msg2qm mergetr ; do
|
||||
cd "$i" && make %{?jobs:-j%jobs} && install -m 0755 $i ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ && cd -
|
||||
done
|
||||
cd ..
|
||||
install -m 0755 bin/findtr bin/qt20fix bin/qtrename140 ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/
|
||||
if [ %_lib = lib64 ]; then
|
||||
for i in $RPM_BUILD_ROOT/usr/lib/qt3/plugins/*/*.so; do
|
||||
mv "$i" "${i%.so}.lib64.so"
|
||||
done
|
||||
fi
|
||||
|
||||
%install
|
||||
export WLIB=%_lib
|
||||
export VERSION=%suse_version
|
||||
source %{SOURCE1}
|
||||
post_install $RPM_BUILD_ROOT/usr/lib/qt3/
|
||||
#
|
||||
# create default doc dir
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||
#
|
||||
# create links in ld.so.conf path
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}
|
||||
#install -d -m 0755 ${RPM_BUILD_ROOT}/usr/bin/
|
||||
#ln -sf ../lib/qt3/bin/designer ${RPM_BUILD_ROOT}/usr/bin/designer
|
||||
#ln -sf ../lib/qt3/bin/linguist ${RPM_BUILD_ROOT}/usr/bin/linguist
|
||||
%suse_update_desktop_file -i designer Qt Development GUIDesigner
|
||||
%suse_update_desktop_file -i linguist Qt Development Translation
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||
perl -pi -e 's,Exec=designer,Exec=/usr/lib/qt3/bin/designer,' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||
mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop
|
||||
install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png
|
||||
rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png
|
||||
perl -pi -e 's,Exec=linguist,Exec=/usr/lib/qt3/bin/linguist,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||
perl -pi -e 's,Icon=linguist,Icon=linguist3,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||
mv ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist3.png
|
||||
|
||||
##### these files are not getting installed by "make install" ... bug ?
|
||||
#
|
||||
#
|
||||
# install manpages
|
||||
#
|
||||
rm -rf $RPM_BUILD_ROOT/%{_mandir}
|
||||
install -d $RPM_BUILD_ROOT/%{_mandir}
|
||||
cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/
|
||||
#
|
||||
# install examples
|
||||
#
|
||||
install -d ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||
find ./examples/ \
|
||||
-name \*.o -o -name .obj -o -name .moc -o -name Makefile \
|
||||
| xargs rm -rf
|
||||
cp -a examples ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||
ln -sf /usr/lib/qt3/doc/examples ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||
#
|
||||
# to be sure we do not package files which are packaged in other qt3 packages
|
||||
#
|
||||
rpm -ql qt3 qt3-devel qt3-devel-doc \
|
||||
| while read i ; do
|
||||
[ -d "$i" ] || rm -f $RPM_BUILD_ROOT/"$i"
|
||||
done
|
||||
#
|
||||
# we do have them in qt3-devel-doc already
|
||||
#
|
||||
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/bin/assistant
|
||||
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/libqassistantclient.*
|
||||
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/translations/assistant_de.qm
|
||||
|
||||
for l in $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.a; do
|
||||
strip --strip-unneeded $l
|
||||
done
|
||||
|
||||
%if %suse_version > 1020
|
||||
%fdupes -s $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%pre
|
||||
if test -L usr/lib/qt3; then
|
||||
rm usr/lib/qt3
|
||||
fi
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
|
||||
%post -n qt3-devel-tools
|
||||
%run_ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/usr/lib/qt3/bin/qembed
|
||||
/usr/lib/qt3/bin/qvfb
|
||||
|
||||
%files -n qt3-mysql
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlmysql*.so
|
||||
|
||||
%files -n qt3-postgresql
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlpsql*.so
|
||||
|
||||
%files -n qt3-unixODBC
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlodbc*.so
|
||||
|
||||
%files -n qt3-sqlite
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlite*.so
|
||||
|
||||
%files -n qt3-devel-tools
|
||||
%defattr(-,root,root)
|
||||
#/usr/bin/designer
|
||||
#/usr/bin/linguist
|
||||
/usr/lib/qt3/bin/createcw
|
||||
/usr/lib/qt3/bin/makeqpf
|
||||
/usr/lib/qt3/bin/qconfig
|
||||
/usr/lib/qt3/bin/findtr
|
||||
/usr/lib/qt3/bin/qt20fix
|
||||
/usr/lib/qt3/bin/qtrename140
|
||||
/usr/lib/qt3/bin/msg2qm
|
||||
/usr/lib/qt3/bin/mergetr
|
||||
/usr/lib/qt3/bin/designer
|
||||
/usr/lib/qt3/bin/linguist
|
||||
/usr/lib/qt3/bin/qm2ts
|
||||
/usr/lib/qt3/bin/lrelease
|
||||
/usr/lib/qt3/bin/lupdate
|
||||
/usr/lib/qt3/templates
|
||||
/usr/lib/qt3/plugins/designer
|
||||
/usr/lib/qt3/phrasebooks
|
||||
/usr/lib/qt3/%_lib/libdesignercore.*
|
||||
/usr/lib/qt3/%_lib/libeditor.*
|
||||
/usr/share/applications/*
|
||||
/usr/share/pixmaps/designer3.png
|
||||
/usr/share/pixmaps/linguist3.png
|
||||
|
||||
%files -n qt3-devel-examples
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/doc
|
||||
/%{_docdir}/qt3/examples
|
||||
/usr/lib/qt3/doc/examples
|
||||
|
||||
%files -n qt3-man
|
||||
%defattr(-,root,root)
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%changelog
|
||||
@ -1,297 +0,0 @@
|
||||
#
|
||||
# spec file for package qt3-extensions
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: qt3-extensions
|
||||
BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
|
||||
%if %suse_version > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
License: GPL, QPL
|
||||
Version: 3.4.0
|
||||
Release: 1
|
||||
Autoreqprov: on
|
||||
Requires: qt3 = %version
|
||||
Group: Development/Tools/Other
|
||||
Summary: Qt3 Extensions
|
||||
# COMMON-BEGIN
|
||||
# COMMON-END
|
||||
|
||||
%description
|
||||
This package contains extension libraries for Qt 3, such as the
|
||||
Netscape plug-in modules.
|
||||
|
||||
%package -n qt3-devel-examples
|
||||
Summary: Programming Examples for Qt 3
|
||||
Autoreqprov: on
|
||||
Group: Development/Sources
|
||||
Provides: qt3-examples
|
||||
Obsoletes: qt3-examples
|
||||
|
||||
%description -n qt3-devel-examples
|
||||
This package contains small executables with code to demonstrate Qt
|
||||
programming.
|
||||
|
||||
Have a look in /usr/share/doc/packages/qt3/examples/.
|
||||
|
||||
%package -n qt3-mysql
|
||||
Summary: MySQL Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Productivity/Databases/Clients
|
||||
|
||||
%description -n qt3-mysql
|
||||
Plug-in for using the MySQL database with the generic Qt database
|
||||
interface.
|
||||
|
||||
%package -n qt3-unixODBC
|
||||
Summary: A UnixODBC Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Productivity/Databases/Clients
|
||||
|
||||
%description -n qt3-unixODBC
|
||||
A plug-in for using UnixODBC supported databases with the generic Qt
|
||||
database interface.
|
||||
|
||||
%package -n qt3-postgresql
|
||||
Summary: A PostgreSQL Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Productivity/Databases/Clients
|
||||
|
||||
%description -n qt3-postgresql
|
||||
A Plug-in for using the PostgreSQL database with the generic Qt
|
||||
database interface.
|
||||
|
||||
%package -n qt3-sqlite
|
||||
Summary: SQLite Database Plug-In for Qt
|
||||
Provides: qt3_database_plugin
|
||||
Group: Development/Tools/Other
|
||||
|
||||
%description -n qt3-sqlite
|
||||
The Qt database supports SQLite with this plug-in. (No configured and
|
||||
running daemon is required.)
|
||||
|
||||
%package -n qt3-devel-tools
|
||||
Summary: User Interface Builder and other tools (designer, assistant, linguist)
|
||||
Autoreqprov: on
|
||||
Requires: qt3-devel = %version
|
||||
Provides: qt3-designer
|
||||
Obsoletes: qt3-designer
|
||||
Group: Development/Tools/GUI Builders
|
||||
|
||||
%description -n qt3-devel-tools
|
||||
The designer creates .ui files. The uic generates C++ code from these
|
||||
files. The package also contains the Qt Assistant (Qt documentation
|
||||
browser) and the Qt Linguist (for translations).
|
||||
|
||||
%package -n qt3-man
|
||||
Summary: Qt 3 Man Pages
|
||||
Autoreqprov: on
|
||||
Requires: qt3-devel = %version
|
||||
Conflicts: qtman qt-man
|
||||
Group: Documentation/Man
|
||||
|
||||
%description -n qt3-man
|
||||
This package contains all the man pages for all the Qt 3 classes.
|
||||
%build
|
||||
export QTDIR=/usr/lib/qt3/
|
||||
export WLIB=%_lib
|
||||
export VERSION=%suse_version
|
||||
source %{SOURCE1} %{version}
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
#
|
||||
# compile threaded version to build all tools.
|
||||
# the lib itself becomes packaged from qt3.spec
|
||||
#
|
||||
call_configure -thread -shared -L$PWD/%_lib $OPTIONS
|
||||
ln -sf /usr/lib/qt3/%_lib/* lib/
|
||||
ln -sf /usr/lib/qt3/bin/* bin/
|
||||
cd plugins/src
|
||||
make %{?jobs:-j%jobs}
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||
cd -
|
||||
#
|
||||
# build examples
|
||||
#
|
||||
cd tools/assistant/lib
|
||||
make %{?jobs:-j%jobs}
|
||||
cd -
|
||||
cd examples
|
||||
make %{?jobs:-j%jobs}
|
||||
cd -
|
||||
#
|
||||
# build extra tools
|
||||
#
|
||||
cd tools
|
||||
make %{?jobs:-j%jobs}
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||
for i in qvfb qembed qconfig msg2qm mergetr ; do
|
||||
cd "$i" && make %{?jobs:-j%jobs} && install -m 0755 $i ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ && cd -
|
||||
done
|
||||
cd ..
|
||||
install -m 0755 bin/findtr bin/qt20fix bin/qtrename140 ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/
|
||||
if [ %_lib = lib64 ]; then
|
||||
for i in $RPM_BUILD_ROOT/usr/lib/qt3/plugins/*/*.so; do
|
||||
mv "$i" "${i%.so}.lib64.so"
|
||||
done
|
||||
fi
|
||||
|
||||
%install
|
||||
export WLIB=%_lib
|
||||
export VERSION=%suse_version
|
||||
source %{SOURCE1}
|
||||
post_install $RPM_BUILD_ROOT/usr/lib/qt3/
|
||||
#
|
||||
# create default doc dir
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||
#
|
||||
# create links in ld.so.conf path
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}
|
||||
#install -d -m 0755 ${RPM_BUILD_ROOT}/usr/bin/
|
||||
#ln -sf ../lib/qt3/bin/designer ${RPM_BUILD_ROOT}/usr/bin/designer
|
||||
#ln -sf ../lib/qt3/bin/linguist ${RPM_BUILD_ROOT}/usr/bin/linguist
|
||||
%suse_update_desktop_file -i designer Qt Development GUIDesigner
|
||||
%suse_update_desktop_file -i linguist Qt Development Translation
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||
perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||
perl -pi -e 's,Exec=designer,Exec=/usr/lib/qt3/bin/designer,' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||
mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop
|
||||
install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png
|
||||
rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png
|
||||
perl -pi -e 's,Exec=linguist,Exec=/usr/lib/qt3/bin/linguist,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||
perl -pi -e 's,Icon=linguist,Icon=linguist3,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||
mv ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist3.png
|
||||
|
||||
##### these files are not getting installed by "make install" ... bug ?
|
||||
#
|
||||
#
|
||||
# install manpages
|
||||
#
|
||||
rm -rf $RPM_BUILD_ROOT/%{_mandir}
|
||||
install -d $RPM_BUILD_ROOT/%{_mandir}
|
||||
cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/
|
||||
#
|
||||
# install examples
|
||||
#
|
||||
install -d ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||
find ./examples/ \
|
||||
-name \*.o -o -name .obj -o -name .moc -o -name Makefile \
|
||||
| xargs rm -rf
|
||||
cp -a examples ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||
ln -sf /usr/lib/qt3/doc/examples ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||
#
|
||||
# to be sure we do not package files which are packaged in other qt3 packages
|
||||
#
|
||||
rpm -ql qt3 qt3-devel qt3-devel-doc \
|
||||
| while read i ; do
|
||||
[ -d "$i" ] || rm -f $RPM_BUILD_ROOT/"$i"
|
||||
done
|
||||
#
|
||||
# we do have them in qt3-devel-doc already
|
||||
#
|
||||
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/bin/assistant
|
||||
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/libqassistantclient.*
|
||||
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/translations/assistant_de.qm
|
||||
|
||||
for l in $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.a; do
|
||||
strip --strip-unneeded $l
|
||||
done
|
||||
|
||||
%if %suse_version > 1020
|
||||
%fdupes -s $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
|
||||
%pre
|
||||
if test -L usr/lib/qt3; then
|
||||
rm usr/lib/qt3
|
||||
fi
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
|
||||
%post -n qt3-devel-tools
|
||||
%run_ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/usr/lib/qt3/bin/qembed
|
||||
/usr/lib/qt3/bin/qvfb
|
||||
|
||||
%files -n qt3-mysql
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlmysql*.so
|
||||
|
||||
%files -n qt3-postgresql
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlpsql*.so
|
||||
|
||||
%files -n qt3-unixODBC
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlodbc*.so
|
||||
|
||||
%files -n qt3-sqlite
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||
/usr/lib/qt3/plugins/sqldrivers/libqsqlite*.so
|
||||
|
||||
%files -n qt3-devel-tools
|
||||
%defattr(-,root,root)
|
||||
#/usr/bin/designer
|
||||
#/usr/bin/linguist
|
||||
/usr/lib/qt3/bin/createcw
|
||||
/usr/lib/qt3/bin/makeqpf
|
||||
/usr/lib/qt3/bin/qconfig
|
||||
/usr/lib/qt3/bin/findtr
|
||||
/usr/lib/qt3/bin/qt20fix
|
||||
/usr/lib/qt3/bin/qtrename140
|
||||
/usr/lib/qt3/bin/msg2qm
|
||||
/usr/lib/qt3/bin/mergetr
|
||||
/usr/lib/qt3/bin/designer
|
||||
/usr/lib/qt3/bin/linguist
|
||||
/usr/lib/qt3/bin/qm2ts
|
||||
/usr/lib/qt3/bin/lrelease
|
||||
/usr/lib/qt3/bin/lupdate
|
||||
/usr/lib/qt3/templates
|
||||
/usr/lib/qt3/plugins/designer
|
||||
/usr/lib/qt3/phrasebooks
|
||||
/usr/lib/qt3/%_lib/libdesignercore.*
|
||||
/usr/lib/qt3/%_lib/libeditor.*
|
||||
/usr/share/applications/*
|
||||
/usr/share/pixmaps/designer3.png
|
||||
/usr/share/pixmaps/linguist3.png
|
||||
|
||||
%files -n qt3-devel-examples
|
||||
%defattr(-,root,root)
|
||||
%dir /usr/lib/qt3/doc
|
||||
/%{_docdir}/qt3/examples
|
||||
/usr/lib/qt3/doc/examples
|
||||
|
||||
%files -n qt3-man
|
||||
%defattr(-,root,root)
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%changelog
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,338 +0,0 @@
|
||||
#
|
||||
# spec file for package qt3
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: qt3
|
||||
#Remember also to modify Requires in -devel package
|
||||
BuildRequires: Mesa-devel c++_compiler cups-devel freetype2-devel libjpeg-devel libmng-devel pkgconfig update-desktop-files xorg-x11-devel
|
||||
Url: http://www.trolltech.com/
|
||||
License: GPLv2 ; GPLv3 ; QPL ..
|
||||
%if %suse_version > 1120
|
||||
BuildRequires: libpng14-compat-devel
|
||||
%else
|
||||
BuildRequires: libpng-devel
|
||||
%endif
|
||||
Group: System/Libraries
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: qt3-64bit
|
||||
%endif
|
||||
#
|
||||
Summary: A library for developing applications with graphical user interfaces
|
||||
Version: 3.4.0
|
||||
Release: 1
|
||||
Provides: qt_library_%version
|
||||
Recommends: kdelibs3-default-style
|
||||
PreReq: /bin/grep
|
||||
# COMMON-BEGIN
|
||||
Source0: qt3-%{version}.tar.bz2
|
||||
Source1: build_script.sh
|
||||
Source2: qtconfig3.desktop
|
||||
Source3: qtrc
|
||||
Source4: assistant3.png
|
||||
Source6: assistant3.desktop
|
||||
Source7: designer.desktop
|
||||
Source8: designer.png
|
||||
Source9: linguist.desktop
|
||||
Source5: linguist.png
|
||||
Source10: qt3.sh
|
||||
Source11: qt3.csh
|
||||
# Translations did not change
|
||||
Source12: qt3-3.3.8b-translations.tar.bz2
|
||||
Source102: baselibs.conf
|
||||
Source200: attributes
|
||||
Source201: update_spec.pl
|
||||
Patch1: aliasing.diff
|
||||
Patch2: head.diff
|
||||
Patch4: qt3-never-strip.diff
|
||||
Patch5: external-libs.diff
|
||||
Patch12: qtrc-path.diff
|
||||
Patch14: lib64-plugin-support.diff
|
||||
Patch15: pluginmanager-fix.diff
|
||||
Patch18: no-rpath.dif
|
||||
Patch19: shut-up.diff
|
||||
Patch23: fix-accessible.diff
|
||||
Patch31: limit-image-size.diff
|
||||
Patch35: qt-transparency.patch
|
||||
Patch37: 0055-qtextedit_zoom.patch
|
||||
Patch39: fix-qtranslator-crash.diff
|
||||
Patch54: kmenu-search-fix.diff
|
||||
Patch113: fix-assistant-path.patch
|
||||
Patch117: qtimer-debug.diff
|
||||
Patch127: mng-reading-fix.patch
|
||||
Patch134: fix-xinput-clash.diff
|
||||
Patch135: parseFontName.diff
|
||||
#Patch136: qt3-no-date.diff
|
||||
Patch139: gcc46.diff
|
||||
#Patch140: revert-iodbc-to-uodbc.diff
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Qt is a program library for developing applications with graphical user
|
||||
interfaces. It allows you to rapidly develop professional programs. The
|
||||
Qt library is available not only for Linux but for a great number of
|
||||
Unices and even for Windows. Thus it is possible to write programs that
|
||||
may be easily ported to those platforms.
|
||||
|
||||
You need a license for using Qt with a non-GPL application, which can
|
||||
be acquired from sales@trolltech.com.
|
||||
|
||||
See /usr/share/doc/packages/qt3 for details about the new features of
|
||||
the current Qt library!
|
||||
|
||||
%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2
|
||||
%patch4
|
||||
%patch5
|
||||
%patch12
|
||||
if [ "%_lib" = "lib64" ]; then
|
||||
%patch14
|
||||
fi
|
||||
%patch15
|
||||
%patch18
|
||||
%patch19
|
||||
%patch23
|
||||
%patch31
|
||||
%patch35
|
||||
%patch37
|
||||
%patch39
|
||||
%patch54
|
||||
%patch113
|
||||
%patch117
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
|
||||
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontext.h include/
|
||||
ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
|
||||
ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/
|
||||
%patch127
|
||||
%patch134
|
||||
%patch135
|
||||
#%patch136
|
||||
%patch139
|
||||
#%patch140
|
||||
cd translations
|
||||
tar xvjf %SOURCE12
|
||||
cd ..
|
||||
# COMMON-END
|
||||
|
||||
%package devel
|
||||
License: GPLv2 ; GPLv3 ; QPL ..
|
||||
Summary: Include Files and Libraries mandatory for Development
|
||||
Requires: qt3 = %version
|
||||
Requires: pkgconfig cups-devel freetype2-devel libmng-devel libjpeg-devel c++_compiler xorg-x11-devel
|
||||
%if %suse_version > 1120
|
||||
Recommends: libpng14-compat-devel
|
||||
Requires: libpng-devel
|
||||
%else
|
||||
Requires: libpng-devel
|
||||
%endif
|
||||
%if %suse_version > 1000
|
||||
Requires: Mesa-devel
|
||||
%else
|
||||
Requires: xorg-x11-Mesa xorg-x11-Mesa-devel
|
||||
%endif
|
||||
%ifnarch x86_64 s390x sparc64 ppc64 mips64
|
||||
Conflicts: devel_libs-32bit
|
||||
%endif
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: qt3-devel-64bit
|
||||
%endif
|
||||
#
|
||||
Group: Development/Libraries/X11
|
||||
|
||||
%description devel
|
||||
You need this package if you want to compile programs with Qt 3. It
|
||||
contains the "Qt Crossplatform Development Kit 2". Under /usr/lib/qt3
|
||||
you will find include files.
|
||||
|
||||
You need a license for using Qt with a non-GPL application. A license
|
||||
can be acquired at sales@trolltech.com.
|
||||
|
||||
|
||||
%build
|
||||
export VERSION=%suse_version
|
||||
source %SOURCE1 %{version}
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
if [ %_lib == "lib64" ]; then
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DUSE_LIB64_PATHES"
|
||||
fi
|
||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
#
|
||||
# call build from build_script.rpmrc for threaded Qt library
|
||||
# only really needed tools will be builded here, all extra tools will be
|
||||
# builded in qt3.spec
|
||||
#
|
||||
call_configure -v -thread -shared -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite $OPTIONS
|
||||
for i in %build_sub_dirs ; do
|
||||
cd $i
|
||||
make %{?jobs:-j%jobs}
|
||||
cd -
|
||||
done
|
||||
|
||||
%install
|
||||
export VERSION=%suse_version
|
||||
export WLIB=%_lib
|
||||
export QTDIR=`pwd`
|
||||
source %SOURCE1 %{version}
|
||||
for i in %build_sub_dirs ; do
|
||||
cd $i
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||
cd -
|
||||
done
|
||||
post_install $RPM_BUILD_ROOT/usr/lib/qt3/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||
sed -i -e 's, on: .*,,' $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.la
|
||||
#
|
||||
# copy additional files
|
||||
#
|
||||
install -m 0755 bin/qmake bin/moc ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/
|
||||
install -m 0755 -d ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/
|
||||
install -m 0644 translations/*.qm ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/
|
||||
if [ %_lib = lib64 ]; then
|
||||
for i in $RPM_BUILD_ROOT/usr/lib/qt3/plugins/*/*.so; do
|
||||
mv "$i" "${i%.so}.lib64.so"
|
||||
done
|
||||
fi
|
||||
#
|
||||
# move pkgconfig files
|
||||
#
|
||||
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
|
||||
mv $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/pkgconfig/*.pc \
|
||||
$RPM_BUILD_ROOT/%_libdir/pkgconfig
|
||||
rmdir $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/pkgconfig
|
||||
#
|
||||
# move docs in doc dir
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||
cp -a mkspecs/* ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||
if [ %_lib == "lib64" ]; then
|
||||
ln -sf linux-g++-64 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/default
|
||||
else
|
||||
ln -sf linux-g++ ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/default
|
||||
fi
|
||||
find ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs -type f -perm /111 -print0 | xargs -0 chmod a-x
|
||||
#
|
||||
# create links in ld.so.conf path
|
||||
#
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}
|
||||
ln -sf ../lib/qt3/%{_lib}/libqt-mt.so.3 ${RPM_BUILD_ROOT}/%{_libdir}/libqt-mt.so.3
|
||||
ln -sf ../lib/qt3/%{_lib}/libqui.so.1 ${RPM_BUILD_ROOT}/%{_libdir}/libqui.so.1
|
||||
[ "lib" != "%{_lib}" ] && \
|
||||
ln -sf ../lib/qt3 ${RPM_BUILD_ROOT}/%{_libdir}/qt3
|
||||
mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
|
||||
install -m 644 %SOURCE10 %SOURCE11 ${RPM_BUILD_ROOT}/etc/profile.d
|
||||
#
|
||||
# default qt settings
|
||||
#
|
||||
mkdir -p ${RPM_BUILD_ROOT}/etc/X11
|
||||
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/qt3/etc/
|
||||
ln -sf /etc/X11/ ${RPM_BUILD_ROOT}/usr/lib/qt3/etc/settings
|
||||
install -m 0644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/X11/qtrc
|
||||
#
|
||||
# clean broken links
|
||||
#
|
||||
if [ %_lib == "lib64" ]; then
|
||||
rm ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/linux-g++-64/linux-g++-64
|
||||
else
|
||||
rm ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/linux-g++/linux-g++
|
||||
fi
|
||||
rm -rf ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/html
|
||||
|
||||
%pre
|
||||
if test -L usr/lib/qt3; then
|
||||
rm usr/lib/qt3
|
||||
fi
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
if ! grep -q '^\[3.3\]' etc/X11/qtrc ; then
|
||||
echo "" >> etc/X11/qtrc
|
||||
echo "[3.3]" >> etc/X11/qtrc
|
||||
echo "libraryPath=/opt/kde3/lib64/kde3/plugins/:/opt/kde3/lib/kde3/plugins/" >> etc/X11/qtrc
|
||||
fi
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,755)
|
||||
# FIXME provide new changelog if kb9vqf will give one
|
||||
%doc changes-3.3.8d README* LICENSE* MANIFEST FAQ
|
||||
%dir /usr/lib/qt3/translations
|
||||
%dir /usr/lib/qt3
|
||||
%dir /usr/lib/qt3/bin
|
||||
%dir /usr/lib/qt3/%{_lib}
|
||||
%{_libdir}/libqt-mt.so.*
|
||||
%{_libdir}/libqui.so.*
|
||||
/usr/lib/qt3/bin/qtconfig
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.so.*
|
||||
/usr/lib/qt3/%{_lib}/libqui.so.*
|
||||
%dir /usr/lib/qt3/etc
|
||||
/usr/lib/qt3/etc/settings
|
||||
/usr/lib/qt3/plugins
|
||||
/usr/lib/qt3/bin/assistant
|
||||
%lang(de) /usr/lib/qt3/translations/assistant_de.qm
|
||||
%lang(ar) /usr/lib/qt3/translations/qt_ar.qm
|
||||
%lang(ca) /usr/lib/qt3/translations/qt_ca.qm
|
||||
%lang(cs) /usr/lib/qt3/translations/qt_cs.qm
|
||||
%lang(de) /usr/lib/qt3/translations/qt_de.qm
|
||||
%lang(es) /usr/lib/qt3/translations/qt_es.qm
|
||||
%lang(fr) /usr/lib/qt3/translations/qt_fr.qm
|
||||
%lang(he) /usr/lib/qt3/translations/qt_he.qm
|
||||
%lang(ru) /usr/lib/qt3/translations/qt_ru.qm
|
||||
%lang(sk) /usr/lib/qt3/translations/qt_sk.qm
|
||||
%lang(it) /usr/lib/qt3/translations/qt_it.qm
|
||||
%lang(ja) /usr/lib/qt3/translations/qt_ja.qm
|
||||
%lang(nb) /usr/lib/qt3/translations/qt_nb.qm
|
||||
%lang(pl) /usr/lib/qt3/translations/qt_pl.qm
|
||||
%lang(pt) /usr/lib/qt3/translations/qt_pt-br.qm
|
||||
%lang(pt) /usr/lib/qt3/translations/qt_pt.qm
|
||||
%lang(zh) /usr/lib/qt3/translations/qt_zh-cn.qm
|
||||
%lang(zh) /usr/lib/qt3/translations/qt_zh-tw.qm
|
||||
%config(noreplace) /etc/X11/qtrc
|
||||
%ifarch s390x sparc64 x86_64 ppc64 mips64
|
||||
%dir %{_libdir}/qt3
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,755)
|
||||
# FIXME provide new changelog if kb9vqf will give one
|
||||
%doc changes-3.3.8b
|
||||
/usr/lib/qt3/bin/moc
|
||||
/usr/lib/qt3/bin/qmake
|
||||
/usr/lib/qt3/bin/uic
|
||||
/usr/lib/qt3/include
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.la
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.so
|
||||
/usr/lib/qt3/%{_lib}/libqt-mt.prl
|
||||
/usr/lib/qt3/%{_lib}/libqui.so
|
||||
/usr/lib/qt3/%{_lib}/libqui.prl
|
||||
/usr/lib/qt3/mkspecs
|
||||
/%_libdir/pkgconfig/qt-mt.pc
|
||||
/usr/lib/qt3/%_lib/libqassistantclient.*
|
||||
%config /etc/profile.d/qt3.*
|
||||
|
||||
%changelog
|
||||
@ -1,10 +0,0 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 27 20:45:24 UTC 2012 - robxu9@gmail.com
|
||||
|
||||
- update qt3 for suse12.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 27 20:30:25 UTC 2012 - robxu9@gmail.com
|
||||
|
||||
- update
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- src/sql/qt_sql.pri 2011-10-30 19:55:58.000000000 +0100
|
||||
+++ src/sql/qt_sql.pri 2008-01-15 20:09:13.000000000 +0100
|
||||
@@ -116,7 +116,7 @@
|
||||
|
||||
unix {
|
||||
!contains( LIBS, .*odbc.* ) {
|
||||
- LIBS *= -liodbc
|
||||
+ LIBS *= -lodbc
|
||||
}
|
||||
}
|
||||
|
||||
--- plugins/src/sqldrivers/odbc/odbc.pro 2011-10-30 19:55:57.000000000 +0100
|
||||
+++ plugins/src/sqldrivers/odbc/odbc.pro 2008-01-15 20:09:17.000000000 +0100
|
||||
@@ -17,7 +17,7 @@
|
||||
unix {
|
||||
OBJECTS_DIR = .obj
|
||||
!contains( LIBS, .*odbc.* ) {
|
||||
- LIBS *= -liodbc
|
||||
+ LIBS *= -lodbc
|
||||
}
|
||||
}
|
||||
|
||||
@ -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 *) qAppName(); // application name
|
||||
+ class_hint.res_class = (char *) qAppClass(); // 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();
|
||||
@@ -645,19 +641,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,
|
||||
qt_window_role, XA_STRING, 8, PropModeReplace,
|
||||
(unsigned char *)name(), qstrlen( 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 ) {
|
||||
@ -1,19 +0,0 @@
|
||||
diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
|
||||
--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100
|
||||
+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100
|
||||
@@ -57,13 +57,13 @@
|
||||
#endif
|
||||
|
||||
// newer platform SDKs use SQLLEN instead of SQLINTEGER
|
||||
-#ifdef SQLLEN
|
||||
+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
|
||||
# define QSQLLEN SQLLEN
|
||||
#else
|
||||
# define QSQLLEN SQLINTEGER
|
||||
#endif
|
||||
|
||||
-#ifdef SQLULEN
|
||||
+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
|
||||
# define QSQLULEN SQLULEN
|
||||
#else
|
||||
# define QSQLULEN SQLUINTEGER
|
||||
@ -1,276 +0,0 @@
|
||||
commit e278b858739babff5cc19ca81a661e1256d162e7
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1326063972 -0600
|
||||
|
||||
Fix Qt3 builds with libpng15
|
||||
This partially closes Bug 683
|
||||
|
||||
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
|
||||
index 25ce927..58e6e7e 100644
|
||||
--- a/src/kernel/qpngio.cpp
|
||||
+++ b/src/kernel/qpngio.cpp
|
||||
@@ -46,6 +46,9 @@
|
||||
#include "qiodevice.h"
|
||||
|
||||
#include <png.h>
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+#include <zlib.h>
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
|
||||
|
||||
#ifdef Q_OS_TEMP
|
||||
@@ -126,9 +129,29 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
|
||||
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
|
||||
0, 0, 0);
|
||||
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ png_colorp info_ptr_palette = NULL;
|
||||
+ int info_ptr_num_palette = 0;
|
||||
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
|
||||
+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
|
||||
+ }
|
||||
+
|
||||
+ png_bytep info_ptr_trans_alpha = NULL;
|
||||
+ int info_ptr_num_trans = 0;
|
||||
+ png_color_16p info_ptr_trans_color = NULL;
|
||||
+
|
||||
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
|
||||
+ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
|
||||
+ }
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
+
|
||||
if ( color_type == PNG_COLOR_TYPE_GRAY ) {
|
||||
// Black & White or 8-bit grayscale
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
|
||||
+#else /* LIBPNG 1.5 */
|
||||
if ( bit_depth == 1 && info_ptr->channels == 1 ) {
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
png_set_invert_mono( png_ptr );
|
||||
png_read_update_info( png_ptr, info_ptr );
|
||||
if (!image.create( width, height, 1, 2, QImage::BigEndian ))
|
||||
@@ -162,7 +185,9 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
|
||||
image.setColor( i, qRgba(c,c,c,0xff) );
|
||||
}
|
||||
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
|
||||
-#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ const int g = info_ptr_trans_color->gray;
|
||||
+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
|
||||
const int g = info_ptr->trans_color.gray;
|
||||
#else
|
||||
const int g = info_ptr->trans_values.gray;
|
||||
@@ -175,7 +200,11 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
|
||||
}
|
||||
} else if ( color_type == PNG_COLOR_TYPE_PALETTE
|
||||
&& png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ && info_ptr_num_palette <= 256 )
|
||||
+#else /* LIBPNG 1.5 */
|
||||
&& info_ptr->num_palette <= 256 )
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
{
|
||||
// 1-bit and 8-bit color
|
||||
if ( bit_depth != 1 )
|
||||
@@ -183,18 +212,33 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
|
||||
png_read_update_info( png_ptr, info_ptr );
|
||||
png_get_IHDR(png_ptr, info_ptr,
|
||||
&width, &height, &bit_depth, &color_type, 0, 0, 0);
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ if (!image.create(width, height, bit_depth, info_ptr_num_palette,
|
||||
+#else /* LIBPNG 1.5 */
|
||||
if (!image.create(width, height, bit_depth, info_ptr->num_palette,
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
QImage::BigEndian))
|
||||
return;
|
||||
int i = 0;
|
||||
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
|
||||
image.setAlphaBuffer( TRUE );
|
||||
+
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ while ( i < info_ptr_num_trans ) {
|
||||
+ image.setColor(i, qRgba(
|
||||
+ info_ptr_palette[i].red,
|
||||
+ info_ptr_palette[i].green,
|
||||
+ info_ptr_palette[i].blue,
|
||||
+#else /* LIBPNG 1.5 */
|
||||
while ( i < info_ptr->num_trans ) {
|
||||
image.setColor(i, qRgba(
|
||||
info_ptr->palette[i].red,
|
||||
info_ptr->palette[i].green,
|
||||
info_ptr->palette[i].blue,
|
||||
-#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ info_ptr_trans_alpha[i]
|
||||
+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
|
||||
info_ptr->trans_alpha[i]
|
||||
#else
|
||||
info_ptr->trans[i]
|
||||
@@ -204,11 +248,19 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
|
||||
i++;
|
||||
}
|
||||
}
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ while ( i < info_ptr_num_palette ) {
|
||||
+ image.setColor(i, qRgba(
|
||||
+ info_ptr_palette[i].red,
|
||||
+ info_ptr_palette[i].green,
|
||||
+ info_ptr_palette[i].blue,
|
||||
+#else /* LIBPNG 1.5 */
|
||||
while ( i < info_ptr->num_palette ) {
|
||||
image.setColor(i, qRgba(
|
||||
info_ptr->palette[i].red,
|
||||
info_ptr->palette[i].green,
|
||||
info_ptr->palette[i].blue,
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
0xff
|
||||
)
|
||||
);
|
||||
@@ -295,7 +347,11 @@ void read_png_image(QImageIO* iio)
|
||||
return;
|
||||
}
|
||||
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
||||
+#else /* LIBPNG 1.5 */
|
||||
if (setjmp(png_ptr->jmpbuf)) {
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
|
||||
iio->setStatus(-4);
|
||||
return;
|
||||
@@ -486,7 +542,11 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
||||
+#else /* LIBPNG 1.5 */
|
||||
if (setjmp(png_ptr->jmpbuf)) {
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
png_destroy_write_struct(&png_ptr, &info_ptr);
|
||||
return FALSE;
|
||||
}
|
||||
@@ -508,10 +568,18 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
|
||||
|
||||
png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
|
||||
|
||||
+#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 =
|
||||
(image.depth() == 32)
|
||||
? (image.hasAlphaBuffer() ? 4 : 3)
|
||||
: 1;
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
|
||||
png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
|
||||
image.depth() == 1 ? 1 : 8 /* per channel */,
|
||||
@@ -521,11 +589,18 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
|
||||
: PNG_COLOR_TYPE_RGB
|
||||
: PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
|
||||
|
||||
-
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ png_color_8 sig_bit;
|
||||
+ sig_bit.red = 8;
|
||||
+ sig_bit.green = 8;
|
||||
+ sig_bit.blue = 8;
|
||||
+ png_set_sBIT(png_ptr, info_ptr, &sig_bit);
|
||||
+#else /* LIBPNG 1.5 */
|
||||
//png_set_sBIT(png_ptr, info_ptr, 8);
|
||||
info_ptr->sig_bit.red = 8;
|
||||
info_ptr->sig_bit.green = 8;
|
||||
info_ptr->sig_bit.blue = 8;
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
|
||||
if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian)
|
||||
png_set_packswap(png_ptr);
|
||||
@@ -539,11 +614,22 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
|
||||
png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
|
||||
int* trans = new int[num_palette];
|
||||
int num_trans = 0;
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ png_colorp info_ptr_palette = NULL;
|
||||
+ int tmp;
|
||||
+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
for (int i=0; i<num_palette; i++) {
|
||||
QRgb rgb=image.color(i);
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ info_ptr_palette[i].red = qRed(rgb);
|
||||
+ info_ptr_palette[i].green = qGreen(rgb);
|
||||
+ info_ptr_palette[i].blue = qBlue(rgb);
|
||||
+#else /* LIBPNG 1.5 */
|
||||
info_ptr->palette[i].red = qRed(rgb);
|
||||
info_ptr->palette[i].green = qGreen(rgb);
|
||||
info_ptr->palette[i].blue = qBlue(rgb);
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
if (image.hasAlphaBuffer()) {
|
||||
trans[i] = rgb >> 24;
|
||||
if (trans[i] < 255) {
|
||||
@@ -551,6 +637,9 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
|
||||
}
|
||||
}
|
||||
}
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
if (num_trans) {
|
||||
copy_trans = new png_byte[num_trans];
|
||||
for (int i=0; i<num_trans; i++)
|
||||
@@ -561,7 +650,14 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
|
||||
}
|
||||
|
||||
if ( image.hasAlphaBuffer() ) {
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ png_color_8p sig_bit;
|
||||
+ png_get_sBIT(png_ptr, info_ptr, &sig_bit);
|
||||
+ sig_bit->alpha = 8;
|
||||
+ png_set_sBIT(png_ptr, info_ptr, sig_bit);
|
||||
+#else /* LIBPNG 1.5 */
|
||||
info_ptr->sig_bit.alpha = 8;
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
}
|
||||
|
||||
// Swap ARGB to RGBA (normal PNG format) before saving on
|
||||
@@ -1047,7 +1143,11 @@ int QPNGFormat::decode(QImage& img, QImageConsumer* cons,
|
||||
return -1;
|
||||
}
|
||||
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
||||
+#else /* LIBPNG 1.5 */
|
||||
if (setjmp((png_ptr)->jmpbuf)) {
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, 0);
|
||||
image = 0;
|
||||
return -1;
|
||||
@@ -1074,7 +1174,11 @@ int QPNGFormat::decode(QImage& img, QImageConsumer* cons,
|
||||
|
||||
if ( !png_ptr ) return 0;
|
||||
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
||||
+#else /* LIBPNG 1.5 */
|
||||
if (setjmp(png_ptr->jmpbuf)) {
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, 0);
|
||||
image = 0;
|
||||
state = MovieStart;
|
||||
@@ -1134,7 +1238,11 @@ void QPNGFormat::end(png_structp png, png_infop info)
|
||||
consumer->frameDone(QPoint(offx,offy),r);
|
||||
consumer->end();
|
||||
state = FrameStart;
|
||||
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
|
||||
+ unused_data = png_process_data_pause(png, 0);
|
||||
+#else /* LIBPNG 1.5 */
|
||||
unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
|
||||
+#endif /* LIBPNG 1.5 */
|
||||
}
|
||||
|
||||
#ifdef PNG_USER_CHUNKS_SUPPORTED
|
||||
@ -1,702 +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 !!!!
|
||||
|
||||
Name: qt3
|
||||
Epoch: 1
|
||||
Version: 3.3.8.d
|
||||
Release: 8%{?dist}
|
||||
Summary: The shared library for the Qt 3 GUI toolkit
|
||||
|
||||
License: QPL or GPLv2 or GPLv3
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: qt3-3.3.8.d.tar.gz
|
||||
Source2: qt.sh
|
||||
Source3: qt.csh
|
||||
Source4: designer3.desktop
|
||||
Source5: assistant3.desktop
|
||||
Source6: linguist3.desktop
|
||||
Source7: qtconfig3.desktop
|
||||
|
||||
Patch1: qt-3.3.4-print-CJK.patch
|
||||
Patch2: qt-3.0.5-nodebug.patch
|
||||
Patch3: qt-3.1.0-makefile.patch
|
||||
Patch4: qt-x11-free-3.3.7-umask.patch
|
||||
Patch5: qt-x11-free-3.3.6-strip.patch
|
||||
Patch7: qt-x11-free-3.3.2-quiet.patch
|
||||
Patch12: qt-uic-nostdlib.patch
|
||||
Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
|
||||
Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
|
||||
Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
|
||||
Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
|
||||
Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
|
||||
Patch32: qt-3.3.6-fontrendering-214371.patch
|
||||
Patch33: qt-3.3.8-fontrendering-#214570.patch
|
||||
Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
|
||||
Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
|
||||
Patch37: qt-3.3.6-fontrendering-gu-228452.patch
|
||||
Patch38: qt-x11-free-3.3.8-odbc.patch
|
||||
Patch39: qt-x11-free-3.3.7-arm.patch
|
||||
Patch40: qt-x11-free-3.3.8b-typo.patch
|
||||
|
||||
# immodule patches
|
||||
Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
|
||||
|
||||
# qt-copy patches
|
||||
Patch110: 0084-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
|
||||
|
||||
## [qt3] Fix Qt3 builds with libpng15. [Bug #683]
|
||||
Patch301: qt3-3.3.8.d-fix_png15_support.patch
|
||||
|
||||
%define qt_dirname qt-3.3
|
||||
%define qtdir %{_libdir}/%{qt_dirname}
|
||||
%define qt_docdir %{_docdir}/qt-devel-%{version}
|
||||
|
||||
%define smp 1
|
||||
%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: perl
|
||||
BuildRequires: sed
|
||||
BuildRequires: findutils
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: tar
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: make
|
||||
|
||||
%if 0%{?rhel} == 4
|
||||
BuildRequires: libungif-devel
|
||||
BuildRequires: xorg-x11-devel
|
||||
%else
|
||||
BuildRequires: giflib-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
|
||||
%endif
|
||||
|
||||
|
||||
%package config
|
||||
Summary: Graphical configuration tool for programs using Qt 3
|
||||
Group: User Interface/Desktops
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-config = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
|
||||
%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: libpng-devel
|
||||
Requires: libjpeg-devel
|
||||
Requires: libmng-devel
|
||||
%if 0%{?rhel} == 4
|
||||
BuildRequires: xorg-x11-devel
|
||||
%else
|
||||
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: mesa-libGL-devel
|
||||
Requires: mesa-libGLU-devel
|
||||
%endif
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package devel-docs
|
||||
Summary: Documentation for the Qt 3 GUI toolkit
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package ODBC
|
||||
Summary: ODBC drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package MySQL
|
||||
Summary: MySQL drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package PostgreSQL
|
||||
Summary: PostgreSQL drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package sqlite
|
||||
Summary: sqlite drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
|
||||
%package designer
|
||||
Summary: Interface designer (IDE) for the Qt 3 toolkit
|
||||
Group: Development/Tools
|
||||
Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-designer = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
Qt is a GUI software toolkit which simplifies the task of writing and
|
||||
maintaining GUI (Graphical User Interface) applications
|
||||
for the X Window System.
|
||||
|
||||
Qt is written in C++ and is fully object-oriented.
|
||||
|
||||
This package contains the shared library needed to run Qt 3
|
||||
applications, as well as the README files for Qt 3.
|
||||
|
||||
|
||||
%description config
|
||||
Qt is a GUI software toolkit which simplifies the task of writing and
|
||||
maintaining GUI (Graphical User Interface) applications
|
||||
for the X Window System.
|
||||
|
||||
Qt is written in C++ and is fully object-oriented.
|
||||
|
||||
This package contains a graphical configuration tool for programs using Qt 3.
|
||||
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains the files necessary to develop
|
||||
applications using the Qt GUI toolkit: the header files, the Qt meta
|
||||
object compiler.
|
||||
|
||||
Install %{name}-devel if you want to develop GUI applications using the Qt 3
|
||||
toolkit.
|
||||
|
||||
|
||||
%description devel-docs
|
||||
The %{name}-devel-docs package contains the man pages, the HTML documentation and
|
||||
example programs for Qt 3.
|
||||
|
||||
|
||||
%description ODBC
|
||||
ODBC driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description MySQL
|
||||
MySQL driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description PostgreSQL
|
||||
PostgreSQL driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description sqlite
|
||||
sqlite driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description designer
|
||||
The %{name}-designer package contains an User Interface designer tool
|
||||
for the Qt 3 toolkit.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n qt3
|
||||
%patch1 -p1 -b .cjk
|
||||
%patch2 -p1 -b .ndebug
|
||||
%patch3 -p1 -b .makefile
|
||||
%patch4 -p1 -b .umask
|
||||
%patch5 -p1
|
||||
%patch7 -p1 -b .quiet
|
||||
%patch12 -p1 -b .nostdlib
|
||||
%patch13 -p1 -b .fonts
|
||||
%patch25 -p1 -b .uic-multilib
|
||||
%patch27 -p1 -b .fontrendering-ml_IN-bz#209097
|
||||
%patch29 -p1 -b .fontrendering-as_IN-bz#209972
|
||||
%patch31 -p1 -b .fontrendering-te_IN-bz#211259
|
||||
%patch32 -p1 -b .fontrendering-bz#214371
|
||||
%patch33 -p1 -b .fontrendering-#214570
|
||||
%patch34 -p1 -b .fontrendering-#209974
|
||||
%patch35 -p1 -b .fontrendering-ml_IN-217657
|
||||
%patch37 -p1 -b .fontrendering-gu-228452
|
||||
%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
|
||||
%patch301 -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
|
||||
export QTDIR=`/bin/pwd`
|
||||
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
|
||||
export PATH="$QTDIR/bin:$PATH"
|
||||
export QTDEST=%{qtdir}
|
||||
|
||||
# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
|
||||
%if 0%{?rhel} == 4
|
||||
%__sed -i plugins/src/inputmethods/xim/xim.pro \
|
||||
-e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
|
||||
%endif
|
||||
|
||||
%if %{smp}
|
||||
export SMP_MFLAGS="%{?_smp_mflags}"
|
||||
%endif
|
||||
|
||||
%if %{immodule}
|
||||
sh ./make-symlinks.sh
|
||||
%endif
|
||||
|
||||
# set correct X11 prefix
|
||||
if [ -d /usr/X11R6 ]; then
|
||||
perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
|
||||
perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
|
||||
else
|
||||
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
|
||||
fi
|
||||
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 $QTDEST \
|
||||
-docdir %{qt_docdir} \
|
||||
%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 \
|
||||
%if 0%{?rhel} == 4
|
||||
-no-xinerama \
|
||||
-no-xrandr \
|
||||
%else
|
||||
-xinerama \
|
||||
-xrandr \
|
||||
%endif
|
||||
-xrender \
|
||||
-xkb \
|
||||
-ipv6 \
|
||||
-dlopen-opengl \
|
||||
-xft \
|
||||
-tablet -v
|
||||
|
||||
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 UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
export QTDIR=`/bin/pwd`
|
||||
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
|
||||
export PATH="$QTDIR/bin:$PATH"
|
||||
export QTDEST=%{qtdir}
|
||||
|
||||
make install INSTALL_ROOT=%{buildroot}
|
||||
|
||||
for i in findtr qt20fix qtrename140 lrelease lupdate ; do
|
||||
install bin/$i %{buildroot}%{qtdir}/bin/
|
||||
done
|
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
|
||||
mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
|
||||
|
||||
# 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 = %{qtdir}/bin/moc|' < $a > ${a}.2
|
||||
mv -v ${a}.2 $a
|
||||
done
|
||||
|
||||
mkdir -p %{buildroot}/etc/profile.d
|
||||
install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
|
||||
|
||||
# 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}%{qtdir}/mkspecs/*/qmake.conf
|
||||
|
||||
# remove broken links
|
||||
rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++*
|
||||
rm -f %{buildroot}%{qtdir}/lib/*.la
|
||||
|
||||
mkdir -p %{buildroot}/etc/ld.so.conf.d
|
||||
echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
|
||||
|
||||
# install icons
|
||||
mkdir %{buildroot}%{_datadir}/pixmaps
|
||||
install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png
|
||||
install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png
|
||||
install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png
|
||||
install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png
|
||||
|
||||
# own style directory
|
||||
mkdir -p %{buildroot}%{qtdir}/plugins/styles
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc FAQ LICENSE* README* changes*
|
||||
%dir %{qtdir}
|
||||
%dir %{qtdir}/bin
|
||||
%dir %{qtdir}/lib
|
||||
%dir %{qtdir}/plugins
|
||||
%dir %{qtdir}/plugins/sqldrivers
|
||||
%dir %{qtdir}/plugins/styles
|
||||
%{qtdir}/translations
|
||||
%{qtdir}/plugins/designer/
|
||||
%if %{immodule}
|
||||
%{qtdir}/plugins/inputmethods
|
||||
%endif
|
||||
%config /etc/profile.d/*
|
||||
/etc/ld.so.conf.d/*
|
||||
%{qtdir}/lib/libqui.so.*
|
||||
%{qtdir}/lib/libqt*.so.*
|
||||
|
||||
%files config
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/bin/qtconfig
|
||||
%{_datadir}/applications/*qtconfig*.desktop
|
||||
%{_datadir}/pixmaps/qtconfig3.png
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{qt_docdir}/
|
||||
%{qtdir}/bin/moc
|
||||
%{qtdir}/bin/uic
|
||||
%{qtdir}/bin/findtr
|
||||
%{qtdir}/bin/qt20fix
|
||||
%{qtdir}/bin/qtrename140
|
||||
%{qtdir}/bin/assistant
|
||||
%{qtdir}/bin/qm2ts
|
||||
%{qtdir}/bin/qmake
|
||||
%{qtdir}/bin/qembed
|
||||
%{qtdir}/bin/linguist
|
||||
%{qtdir}/bin/lupdate
|
||||
%{qtdir}/bin/lrelease
|
||||
%{qtdir}/include
|
||||
%{qtdir}/mkspecs
|
||||
%{qtdir}/lib/libqt*.so
|
||||
%{qtdir}/lib/libqui.so
|
||||
%{qtdir}/lib/libeditor.a
|
||||
%{qtdir}/lib/libdesigner*.a
|
||||
%{qtdir}/lib/libqassistantclient.a
|
||||
%{qtdir}/lib/*.prl
|
||||
%{qtdir}/phrasebooks
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_datadir}/applications/*linguist*.desktop
|
||||
%{_datadir}/applications/*assistant*.desktop
|
||||
%{_datadir}/pixmaps/linguist3.png
|
||||
%{_datadir}/pixmaps/assistant3.png
|
||||
|
||||
# QT 3.3.8.D (TDE): 4 binaries have appeared
|
||||
%{qtdir}/bin/createcw
|
||||
%{qtdir}/bin/makeqpf
|
||||
%{qtdir}/bin/mergetr
|
||||
%{qtdir}/bin/msg2qm
|
||||
|
||||
# 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 %{qtdir}/include/btree.h
|
||||
%exclude %{qtdir}/include/crc32.h
|
||||
%exclude %{qtdir}/include/debian_qsql_odbc.h
|
||||
%exclude %{qtdir}/include/deflate.h
|
||||
%exclude %{qtdir}/include/ftglue.h
|
||||
%exclude %{qtdir}/include/ftxgdef.h
|
||||
%exclude %{qtdir}/include/ftxgpos.h
|
||||
%exclude %{qtdir}/include/ftxgsub.h
|
||||
%exclude %{qtdir}/include/ftxopen.h
|
||||
%exclude %{qtdir}/include/ftxopenf.h
|
||||
%exclude %{qtdir}/include/hash.h
|
||||
%exclude %{qtdir}/include/inffast.h
|
||||
%exclude %{qtdir}/include/inffixed.h
|
||||
%exclude %{qtdir}/include/inflate.h
|
||||
%exclude %{qtdir}/include/inftrees.h
|
||||
%exclude %{qtdir}/include/moc_yacc.h
|
||||
%exclude %{qtdir}/include/opcodes.h
|
||||
%exclude %{qtdir}/include/os.h
|
||||
%exclude %{qtdir}/include/otlbuffer.h
|
||||
%exclude %{qtdir}/include/pager.h
|
||||
%exclude %{qtdir}/include/parse.h
|
||||
%exclude %{qtdir}/include/pngasmrd.h
|
||||
%exclude %{qtdir}/include/pngconf.h
|
||||
%exclude %{qtdir}/include/sqlite.h
|
||||
%exclude %{qtdir}/include/sqliteInt.h
|
||||
%exclude %{qtdir}/include/trees.h
|
||||
%exclude %{qtdir}/include/vdbe.h
|
||||
%exclude %{qtdir}/include/vdbeInt.h
|
||||
%exclude %{qtdir}/mkspecs/linux-g++-sparc
|
||||
|
||||
|
||||
|
||||
%files devel-docs
|
||||
%defattr(-,root,root,-)
|
||||
%doc examples
|
||||
%doc tutorial
|
||||
%{_mandir}/*/*
|
||||
|
||||
%files sqlite
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlite.so
|
||||
|
||||
%files ODBC
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
|
||||
|
||||
%files PostgreSQL
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
|
||||
|
||||
%files MySQL
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
|
||||
|
||||
%files designer
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/templates
|
||||
%{qtdir}/bin/designer
|
||||
%{_datadir}/applications/*designer*.desktop
|
||||
%{_datadir}/pixmaps/designer3.png
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
|
||||
- Fix Provides and Obsoletes, again and again ...
|
||||
|
||||
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7
|
||||
- Fix Provides and Obsoletes. Now only for RHEL 5.
|
||||
|
||||
* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6
|
||||
- Fix Qt3 builds with libpng15. [Bug #683]
|
||||
|
||||
* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5
|
||||
- Fix 'Provides' AGAIN !! [Bug #823]
|
||||
|
||||
* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4
|
||||
- Fix 'Provides' [Bug #823]
|
||||
|
||||
* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3
|
||||
- Updates zh_TW translations, thanks to Wei-Lun Chao .
|
||||
|
||||
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2
|
||||
- Add missing BuildRequires
|
||||
|
||||
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
|
||||
- Initial release for RHEL 6, RHEL 5, and Fedora 15
|
||||
- Switch to Trinity Version
|
||||
- Spec file based on RHEL 6 'qt3-3.3.8b-29'
|
||||
@ -1,699 +0,0 @@
|
||||
# Always install under standard prefix
|
||||
%define _prefix /usr
|
||||
|
||||
# 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: qt3
|
||||
Epoch: 1
|
||||
Version: 3.3.8.d
|
||||
Release: 9%{?dist}
|
||||
Summary: The shared library for the Qt 3 GUI toolkit
|
||||
|
||||
License: QPL or GPLv2 or GPLv3
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: qt3-3.5.13.1.tar.gz
|
||||
Source2: qt.sh
|
||||
Source3: qt.csh
|
||||
Source4: designer3.desktop
|
||||
Source5: assistant3.desktop
|
||||
Source6: linguist3.desktop
|
||||
Source7: qtconfig3.desktop
|
||||
|
||||
Patch1: qt-3.3.4-print-CJK.patch
|
||||
Patch2: qt-3.0.5-nodebug.patch
|
||||
Patch3: qt-3.1.0-makefile.patch
|
||||
Patch4: qt-x11-free-3.3.7-umask.patch
|
||||
Patch5: qt-x11-free-3.3.6-strip.patch
|
||||
Patch7: qt-x11-free-3.3.2-quiet.patch
|
||||
Patch12: qt-uic-nostdlib.patch
|
||||
Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
|
||||
Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
|
||||
Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
|
||||
Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
|
||||
Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
|
||||
Patch32: qt-3.3.6-fontrendering-214371.patch
|
||||
Patch33: qt-3.3.8-fontrendering-#214570.patch
|
||||
Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
|
||||
Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
|
||||
Patch37: qt-3.3.6-fontrendering-gu-228452.patch
|
||||
Patch38: qt-x11-free-3.3.8-odbc.patch
|
||||
Patch39: qt-x11-free-3.3.7-arm.patch
|
||||
Patch40: qt-x11-free-3.3.8b-typo.patch
|
||||
|
||||
# immodule patches
|
||||
Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
|
||||
|
||||
# qt-copy patches
|
||||
Patch110: 0084-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 qt_dirname qt-3.3
|
||||
%define qtdir %{_libdir}/%{qt_dirname}
|
||||
%define qt_docdir %{_docdir}/qt-devel-%{version}
|
||||
|
||||
%define smp 1
|
||||
%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: perl
|
||||
BuildRequires: sed
|
||||
BuildRequires: findutils
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: tar
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: make
|
||||
|
||||
%if 0%{?rhel} == 4
|
||||
BuildRequires: libungif-devel
|
||||
BuildRequires: xorg-x11-devel
|
||||
%else
|
||||
BuildRequires: giflib-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
|
||||
%endif
|
||||
|
||||
|
||||
%package config
|
||||
Summary: Graphical configuration tool for programs using Qt 3
|
||||
Group: User Interface/Desktops
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-config = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
|
||||
%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: libpng-devel
|
||||
Requires: libjpeg-devel
|
||||
Requires: libmng-devel
|
||||
%if 0%{?rhel} == 4
|
||||
BuildRequires: xorg-x11-devel
|
||||
%else
|
||||
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: mesa-libGL-devel
|
||||
Requires: mesa-libGLU-devel
|
||||
%endif
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package devel-docs
|
||||
Summary: Documentation for the Qt 3 GUI toolkit
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package ODBC
|
||||
Summary: ODBC drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package MySQL
|
||||
Summary: MySQL drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package PostgreSQL
|
||||
Summary: PostgreSQL drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%package sqlite
|
||||
Summary: sqlite drivers for Qt 3's SQL classes
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
|
||||
%package designer
|
||||
Summary: Interface designer (IDE) for the Qt 3 toolkit
|
||||
Group: Development/Tools
|
||||
Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
|
||||
Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: qt-designer = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
Qt is a GUI software toolkit which simplifies the task of writing and
|
||||
maintaining GUI (Graphical User Interface) applications
|
||||
for the X Window System.
|
||||
|
||||
Qt is written in C++ and is fully object-oriented.
|
||||
|
||||
This package contains the shared library needed to run Qt 3
|
||||
applications, as well as the README files for Qt 3.
|
||||
|
||||
|
||||
%description config
|
||||
Qt is a GUI software toolkit which simplifies the task of writing and
|
||||
maintaining GUI (Graphical User Interface) applications
|
||||
for the X Window System.
|
||||
|
||||
Qt is written in C++ and is fully object-oriented.
|
||||
|
||||
This package contains a graphical configuration tool for programs using Qt 3.
|
||||
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains the files necessary to develop
|
||||
applications using the Qt GUI toolkit: the header files, the Qt meta
|
||||
object compiler.
|
||||
|
||||
Install %{name}-devel if you want to develop GUI applications using the Qt 3
|
||||
toolkit.
|
||||
|
||||
|
||||
%description devel-docs
|
||||
The %{name}-devel-docs package contains the man pages, the HTML documentation and
|
||||
example programs for Qt 3.
|
||||
|
||||
|
||||
%description ODBC
|
||||
ODBC driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description MySQL
|
||||
MySQL driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description PostgreSQL
|
||||
PostgreSQL driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description sqlite
|
||||
sqlite driver for Qt 3's SQL classes (QSQL)
|
||||
|
||||
|
||||
%description designer
|
||||
The %{name}-designer package contains an User Interface designer tool
|
||||
for the Qt 3 toolkit.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n qt3-3.5.13.1
|
||||
|
||||
%patch1 -p1 -b .cjk
|
||||
%patch2 -p1 -b .ndebug
|
||||
%patch3 -p1 -b .makefile
|
||||
%patch4 -p1 -b .umask
|
||||
%patch5 -p1
|
||||
%patch7 -p1 -b .quiet
|
||||
%patch12 -p1 -b .nostdlib
|
||||
%patch13 -p1 -b .fonts
|
||||
%patch25 -p1 -b .uic-multilib
|
||||
%patch27 -p1 -b .fontrendering-ml_IN-bz#209097
|
||||
%patch29 -p1 -b .fontrendering-as_IN-bz#209972
|
||||
%patch31 -p1 -b .fontrendering-te_IN-bz#211259
|
||||
%patch32 -p1 -b .fontrendering-bz#214371
|
||||
%patch33 -p1 -b .fontrendering-#214570
|
||||
%patch34 -p1 -b .fontrendering-#209974
|
||||
%patch35 -p1 -b .fontrendering-ml_IN-217657
|
||||
%patch37 -p1 -b .fontrendering-gu-228452
|
||||
%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
|
||||
export QTDIR=`/bin/pwd`
|
||||
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
|
||||
export PATH="$QTDIR/bin:$PATH"
|
||||
export QTDEST=%{qtdir}
|
||||
|
||||
# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
|
||||
%if 0%{?rhel} == 4
|
||||
%__sed -i plugins/src/inputmethods/xim/xim.pro \
|
||||
-e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
|
||||
%endif
|
||||
|
||||
%if %{smp}
|
||||
export SMP_MFLAGS="%{?_smp_mflags}"
|
||||
%endif
|
||||
|
||||
%if %{immodule}
|
||||
sh ./make-symlinks.sh
|
||||
%endif
|
||||
|
||||
# set correct X11 prefix
|
||||
if [ -d /usr/X11R6 ]; then
|
||||
perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
|
||||
perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
|
||||
else
|
||||
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
|
||||
fi
|
||||
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 $QTDEST \
|
||||
-docdir %{qt_docdir} \
|
||||
%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 \
|
||||
%if 0%{?rhel} == 4
|
||||
-no-xinerama \
|
||||
-no-xrandr \
|
||||
%else
|
||||
-xinerama \
|
||||
-xrandr \
|
||||
%endif
|
||||
-xrender \
|
||||
-xkb \
|
||||
-ipv6 \
|
||||
-dlopen-opengl \
|
||||
-xft \
|
||||
-tablet -v
|
||||
|
||||
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 UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
export QTDIR=`/bin/pwd`
|
||||
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
|
||||
export PATH="$QTDIR/bin:$PATH"
|
||||
export QTDEST=%{qtdir}
|
||||
|
||||
make install INSTALL_ROOT=%{buildroot}
|
||||
|
||||
for i in findtr qt20fix qtrename140 lrelease lupdate ; do
|
||||
install bin/$i %{buildroot}%{qtdir}/bin/
|
||||
done
|
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
|
||||
mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
|
||||
|
||||
# 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 = %{qtdir}/bin/moc|' < $a > ${a}.2
|
||||
mv -v ${a}.2 $a
|
||||
done
|
||||
|
||||
install -D -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/qt3.sh
|
||||
install -D -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/qt3.csh
|
||||
|
||||
# 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}%{qtdir}/mkspecs/*/qmake.conf
|
||||
|
||||
# remove broken links
|
||||
rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++*
|
||||
rm -f %{buildroot}%{qtdir}/lib/*.la
|
||||
|
||||
mkdir -p %{buildroot}/etc/ld.so.conf.d
|
||||
echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
|
||||
|
||||
# install icons
|
||||
mkdir %{buildroot}%{_datadir}/pixmaps
|
||||
install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png
|
||||
install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png
|
||||
install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png
|
||||
install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png
|
||||
|
||||
# own style directory
|
||||
mkdir -p %{buildroot}%{qtdir}/plugins/styles
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc FAQ LICENSE* README* changes*
|
||||
%dir %{qtdir}
|
||||
%dir %{qtdir}/bin
|
||||
%dir %{qtdir}/lib
|
||||
%dir %{qtdir}/plugins
|
||||
%dir %{qtdir}/plugins/sqldrivers
|
||||
%dir %{qtdir}/plugins/styles
|
||||
%{qtdir}/translations
|
||||
%{qtdir}/plugins/designer/
|
||||
%if %{immodule}
|
||||
%{qtdir}/plugins/inputmethods
|
||||
%endif
|
||||
%config /etc/profile.d/*
|
||||
/etc/ld.so.conf.d/*
|
||||
%{qtdir}/lib/libqui.so.*
|
||||
%{qtdir}/lib/libqt*.so.*
|
||||
|
||||
%files config
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/bin/qtconfig
|
||||
%{_datadir}/applications/*qtconfig*.desktop
|
||||
%{_datadir}/pixmaps/qtconfig3.png
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{qt_docdir}/
|
||||
%{qtdir}/bin/moc
|
||||
%{qtdir}/bin/uic
|
||||
%{qtdir}/bin/findtr
|
||||
%{qtdir}/bin/qt20fix
|
||||
%{qtdir}/bin/qtrename140
|
||||
%{qtdir}/bin/assistant
|
||||
%{qtdir}/bin/qm2ts
|
||||
%{qtdir}/bin/qmake
|
||||
%{qtdir}/bin/qembed
|
||||
%{qtdir}/bin/linguist
|
||||
%{qtdir}/bin/lupdate
|
||||
%{qtdir}/bin/lrelease
|
||||
%{qtdir}/include
|
||||
%{qtdir}/mkspecs
|
||||
%{qtdir}/lib/libqt*.so
|
||||
%{qtdir}/lib/libqui.so
|
||||
%{qtdir}/lib/libeditor.a
|
||||
%{qtdir}/lib/libdesigner*.a
|
||||
%{qtdir}/lib/libqassistantclient.a
|
||||
%{qtdir}/lib/*.prl
|
||||
%{qtdir}/phrasebooks
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_datadir}/applications/*linguist*.desktop
|
||||
%{_datadir}/applications/*assistant*.desktop
|
||||
%{_datadir}/pixmaps/linguist3.png
|
||||
%{_datadir}/pixmaps/assistant3.png
|
||||
|
||||
# QT 3.3.8.D (TDE): 4 binaries have appeared
|
||||
%{qtdir}/bin/createcw
|
||||
%{qtdir}/bin/makeqpf
|
||||
%{qtdir}/bin/mergetr
|
||||
%{qtdir}/bin/msg2qm
|
||||
|
||||
# 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 %{qtdir}/include/btree.h
|
||||
%exclude %{qtdir}/include/crc32.h
|
||||
%exclude %{qtdir}/include/debian_qsql_odbc.h
|
||||
%exclude %{qtdir}/include/deflate.h
|
||||
%exclude %{qtdir}/include/ftglue.h
|
||||
%exclude %{qtdir}/include/ftxgdef.h
|
||||
%exclude %{qtdir}/include/ftxgpos.h
|
||||
%exclude %{qtdir}/include/ftxgsub.h
|
||||
%exclude %{qtdir}/include/ftxopen.h
|
||||
%exclude %{qtdir}/include/ftxopenf.h
|
||||
%exclude %{qtdir}/include/hash.h
|
||||
%exclude %{qtdir}/include/inffast.h
|
||||
%exclude %{qtdir}/include/inffixed.h
|
||||
%exclude %{qtdir}/include/inflate.h
|
||||
%exclude %{qtdir}/include/inftrees.h
|
||||
%exclude %{qtdir}/include/moc_yacc.h
|
||||
%exclude %{qtdir}/include/opcodes.h
|
||||
%exclude %{qtdir}/include/os.h
|
||||
%exclude %{qtdir}/include/otlbuffer.h
|
||||
%exclude %{qtdir}/include/pager.h
|
||||
%exclude %{qtdir}/include/parse.h
|
||||
%exclude %{qtdir}/include/pngasmrd.h
|
||||
%exclude %{qtdir}/include/pngconf.h
|
||||
%exclude %{qtdir}/include/sqlite.h
|
||||
%exclude %{qtdir}/include/sqliteInt.h
|
||||
%exclude %{qtdir}/include/trees.h
|
||||
%exclude %{qtdir}/include/vdbe.h
|
||||
%exclude %{qtdir}/include/vdbeInt.h
|
||||
%exclude %{qtdir}/mkspecs/linux-g++-sparc
|
||||
|
||||
|
||||
|
||||
%files devel-docs
|
||||
%defattr(-,root,root,-)
|
||||
%doc examples
|
||||
%doc tutorial
|
||||
%{_mandir}/*/*
|
||||
|
||||
%files sqlite
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlite.so
|
||||
|
||||
%files ODBC
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
|
||||
|
||||
%files PostgreSQL
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
|
||||
|
||||
%files MySQL
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
|
||||
|
||||
%files designer
|
||||
%defattr(-,root,root,-)
|
||||
%{qtdir}/templates
|
||||
%{qtdir}/bin/designer
|
||||
%{_datadir}/applications/*designer*.desktop
|
||||
%{_datadir}/pixmaps/designer3.png
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9
|
||||
- Initial release for TDE 3.5.13.1
|
||||
|
||||
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
|
||||
- Fix Provides and Obsoletes, again and again ...
|
||||
|
||||
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7
|
||||
- Fix Provides and Obsoletes. Now only for RHEL 5.
|
||||
|
||||
* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6
|
||||
- Fix Qt3 builds with libpng15. [Bug #683]
|
||||
|
||||
* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5
|
||||
- Fix 'Provides' AGAIN !! [Bug #823]
|
||||
|
||||
* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4
|
||||
- Fix 'Provides' [Bug #823]
|
||||
|
||||
* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3
|
||||
- Updates zh_TW translations, thanks to Wei-Lun Chao .
|
||||
|
||||
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2
|
||||
- Add missing BuildRequires
|
||||
|
||||
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
|
||||
- Initial release for RHEL 6, RHEL 5, and Fedora 15
|
||||
- Switch to Trinity Version
|
||||
- Spec file based on RHEL 6 'qt3-3.3.8b-29'
|
||||
@ -0,0 +1,516 @@
|
||||
commit 1ee1ffbae69dc78721af139f0794628571fd35ef
|
||||
Author: Slávek Banko <slavek.banko@axis.cz>
|
||||
Date: 1386900429 +0100
|
||||
|
||||
Fix FTBFS with libfreetype6 >= 2.5.x
|
||||
This resolves Bug 1765
|
||||
|
||||
diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test
|
||||
index 5cabc32..d4cb4ba 100755
|
||||
--- a/config.tests/x11/xfreetype.test
|
||||
+++ b/config.tests/x11/xfreetype.test
|
||||
@@ -116,12 +116,15 @@ fi
|
||||
# check for freetype2 headers
|
||||
FREETYPE2_INCDIR=
|
||||
if [ "$XFT" = "yes" ]; then
|
||||
- INC="freetype2/freetype/freetype.h"
|
||||
XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
|
||||
LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
|
||||
INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
|
||||
F=
|
||||
for INCDIR in $INCDIRS; do
|
||||
+ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1
|
||||
+ if ! [ -f $INCDIR/$INC ]; then
|
||||
+ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1
|
||||
+ fi
|
||||
if [ -f $INCDIR/$INC ]; then
|
||||
# detect major version of freetype2
|
||||
FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
|
||||
--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200
|
||||
+++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200
|
||||
@@ -501,10 +501,10 @@
|
||||
(*f).latin1(),
|
||||
(const char*) QFile::encodeName( old->library() ) );
|
||||
} else {
|
||||
- qWarning("%s: Feature %s already defined in %s!",
|
||||
+/* qWarning("%s: Feature %s already defined in %s!",
|
||||
(const char*) QFile::encodeName( old->library() ),
|
||||
(*f).latin1(),
|
||||
- (const char*) QFile::encodeName( plugin->library() ) );
|
||||
+ (const char*) QFile::encodeName( plugin->library() ) ); */
|
||||
}
|
||||
}
|
||||
}
|
||||
--- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100
|
||||
+++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100
|
||||
@@ -11,7 +11,7 @@
|
||||
install: FORCE
|
||||
@$(MAKE) qt.install
|
||||
|
||||
-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
|
||||
+all: symlinks src-qmake src-moc sub-src sub-tools
|
||||
@echo
|
||||
@echo "The Qt library is now built in ./lib"
|
||||
@echo "The Qt examples are built in the directories in ./examples"
|
||||
--- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100
|
||||
+++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100
|
||||
@@ -4748,10 +4748,11 @@
|
||||
|
||||
// GB18030 fonts on Turbolinux
|
||||
static const psfont SongGBK2K [] = {
|
||||
- { "MSung-Light-GBK2K-H", 0, 100. },
|
||||
- { "MSung-Italic-GBK2K-H", 0, 100. },
|
||||
- { "MSung-Bold-GBK2K-H", 0, 100. },
|
||||
- { "MSung-BoldItalic-GBK2K-H", 0, 100. },
|
||||
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
|
||||
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
|
||||
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
|
||||
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
|
||||
+
|
||||
};
|
||||
static const psfont KaiGBK2K [] = {
|
||||
{ "MKai-Medium-GBK2K-H", 0, 100. },
|
||||
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
|
||||
--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530
|
||||
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530
|
||||
@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy
|
||||
toPos += 2;
|
||||
if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) {
|
||||
if (matra_position == Post || matra_position == Split) {
|
||||
- toPos = matra+1;
|
||||
+ if (matra_position == Post )
|
||||
+ toPos = matra;
|
||||
+ else
|
||||
+ toPos = matra+1;
|
||||
matra -= 2;
|
||||
}
|
||||
} else if (script == QFont::Kannada) {
|
||||
--- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200
|
||||
+++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200
|
||||
@@ -261,7 +261,7 @@
|
||||
Other, Other, Other, Other,
|
||||
Other, Other, Other, Other,
|
||||
|
||||
- Other, Other, Other, Other,
|
||||
+ Other, Other, VowelMark, VowelMark,
|
||||
Other, Other, Other, Other,
|
||||
Other, Other, Other, Other,
|
||||
Other, Other, Other, Other,
|
||||
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800
|
||||
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800
|
||||
@@ -868,7 +868,7 @@
|
||||
None, None, None, None,
|
||||
None, None, None, Post,
|
||||
|
||||
- Post, None, Below, None,
|
||||
+ None, None, None, None,
|
||||
None, Post, None, None,
|
||||
None, None, None, None,
|
||||
None, None, Post, Post,
|
||||
@@ -1271,6 +1271,16 @@
|
||||
int base = 0;
|
||||
int reph = -1;
|
||||
|
||||
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
|
||||
+ bool is_special_conjuction_malayalam = false;
|
||||
+
|
||||
+ if ((len == 3) &&
|
||||
+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) &&
|
||||
+ (reordered[1] == 0x0d4d) &&
|
||||
+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) {
|
||||
+ is_special_conjuction_malayalam = true;
|
||||
+ }
|
||||
+
|
||||
#ifdef INDIC_DEBUG
|
||||
IDEBUG("original:");
|
||||
for (i = 0; i < len; i++) {
|
||||
@@ -1547,6 +1557,15 @@
|
||||
reph = i;
|
||||
}
|
||||
|
||||
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
|
||||
+ if (is_special_conjuction_malayalam) {
|
||||
+ unsigned short temp;
|
||||
+
|
||||
+ temp = reordered[0];
|
||||
+ reordered[0] = reordered[2];
|
||||
+ reordered[2] = temp;
|
||||
+ }
|
||||
+
|
||||
if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances,
|
||||
&item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
|
||||
return FALSE;
|
||||
@@ -1658,6 +1677,15 @@
|
||||
|
||||
// halant always applies
|
||||
|
||||
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
|
||||
+ if (is_special_conjuction_malayalam) {
|
||||
+ unsigned int temp;
|
||||
+
|
||||
+ temp = properties[0];
|
||||
+ properties[0] = ~PreSubstProperty;
|
||||
+ properties[2] = temp;
|
||||
+ }
|
||||
+
|
||||
#ifdef INDIC_DEBUG
|
||||
{
|
||||
IDEBUG("OT properties:");
|
||||
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100
|
||||
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100
|
||||
@@ -864,7 +864,7 @@
|
||||
None, None, None, Post,
|
||||
|
||||
None, None, None, None,
|
||||
- None, Post, None, None,
|
||||
+ None, None, None, None,
|
||||
None, None, None, None,
|
||||
None, None, Post, Post,
|
||||
|
||||
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp
|
||||
--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530
|
||||
+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530
|
||||
@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri
|
||||
if ( script >= QFont::Arabic && script <= QFont::Khmer ) {
|
||||
// complex script shaping. Have to do some hard work
|
||||
int from = QMAX( 0, pos - 8 );
|
||||
- int to = QMIN( (int)str.length(), pos + 8 );
|
||||
+ int to = str.length();
|
||||
QConstString cstr( str.unicode()+from, to-from);
|
||||
QTextEngine layout( cstr.string(), d );
|
||||
layout.itemize( QTextEngine::WidthOnly );
|
||||
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800
|
||||
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800
|
||||
@@ -786,7 +786,7 @@
|
||||
Below, None, Below, Below,
|
||||
Below, Below, Below, Below,
|
||||
|
||||
- Below, None, Below, Below,
|
||||
+ Below, Below, Below, Below,
|
||||
None, Below, Below, Below,
|
||||
Below, Below, None, None,
|
||||
None, None, Post, Above,
|
||||
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200
|
||||
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200
|
||||
@@ -1240,7 +1240,7 @@
|
||||
int script = item->script;
|
||||
Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala);
|
||||
const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari);
|
||||
- const unsigned short ra = script_base + 0x30;
|
||||
+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification
|
||||
const unsigned short halant = script_base + 0x4d;
|
||||
const unsigned short nukta = script_base + 0x3c;
|
||||
|
||||
@@ -1278,6 +1278,11 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+ unsigned short *chkAssamese=reordered.data();
|
||||
+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra
|
||||
+ {
|
||||
+ ra = script_base + 0x70;
|
||||
+ }
|
||||
if (len != 1) {
|
||||
unsigned short *uc = reordered.data();
|
||||
bool beginsWithRa = FALSE;
|
||||
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200
|
||||
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200
|
||||
@@ -601,7 +601,7 @@
|
||||
None, None, None, None,
|
||||
None, None, None, None,
|
||||
|
||||
- None, None, None, None,
|
||||
+ Below, None, None, None,
|
||||
None, None, None, None,
|
||||
None, None, None, None,
|
||||
None, None, None, None,
|
||||
--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400
|
||||
+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400
|
||||
@@ -149,6 +149,9 @@
|
||||
} else {
|
||||
trmacro = &opt[1];
|
||||
}
|
||||
+ } else if ( opt == "nostdlib") {
|
||||
+ QStringList x;
|
||||
+ QApplication::setLibraryPaths(x);
|
||||
} else if ( opt == "L" ) {
|
||||
if ( !(n < argc-1) ) {
|
||||
error = "Missing plugin path.";
|
||||
--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200
|
||||
+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200
|
||||
@@ -288,8 +288,9 @@
|
||||
{
|
||||
#if defined(QT_CHECK_STATE)
|
||||
if ( qApp->type() == QApplication::Tty ) {
|
||||
- qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
|
||||
- "is being used" );
|
||||
+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
|
||||
+// "is being used" );
|
||||
+ ;
|
||||
}
|
||||
#endif
|
||||
|
||||
--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100
|
||||
+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100
|
||||
@@ -1412,7 +1412,7 @@
|
||||
False, XA_ATOM, &type, &format, &nitems, &after, &data);
|
||||
|
||||
if (type == XA_ATOM && format == 32) {
|
||||
- ts.writeBlock((const char *) data, nitems * 4);
|
||||
+ ts.writeBlock((const char *) data, nitems * sizeof(long));
|
||||
offset += nitems;
|
||||
} else
|
||||
after = 0;
|
||||
--- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200
|
||||
+++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200
|
||||
@@ -975,7 +981,7 @@
|
||||
};
|
||||
const XftDefaultFont defaults[] = {
|
||||
{ "Serif", "serif", FALSE },
|
||||
- { "Sans Serif", "sans-serif", FALSE },
|
||||
+ { "Sans", "sans-serif", FALSE },
|
||||
{ "Monospace", "monospace", TRUE },
|
||||
{ 0, 0, FALSE }
|
||||
};
|
||||
--- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200
|
||||
+++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200
|
||||
@@ -1904,9 +1904,6 @@
|
||||
|
||||
void QTextEdit::removeSelectedText( int selNum )
|
||||
{
|
||||
- if(selNum != 0)
|
||||
- resetInputContext();
|
||||
-
|
||||
QTextCursor c1 = doc->selectionStartCursor( selNum );
|
||||
c1.restoreState();
|
||||
QTextCursor c2 = doc->selectionEndCursor( selNum );
|
||||
@@ -3169,7 +3166,6 @@
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
- resetInputContext();
|
||||
QTextParagraph *p = doc->paragAt( para );
|
||||
if ( !p )
|
||||
return;
|
||||
@@ -3196,7 +3192,6 @@
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
- resetInputContext();
|
||||
for ( int i = 0; i < (int)doc->numSelections(); ++i )
|
||||
doc->removeSelection( i );
|
||||
|
||||
@@ -3238,7 +3233,6 @@
|
||||
if ( d->optimMode )
|
||||
return;
|
||||
#endif
|
||||
- resetInputContext();
|
||||
QTextParagraph *p = doc->paragAt( para );
|
||||
if ( !p )
|
||||
return;
|
||||
@@ -3283,7 +3277,6 @@
|
||||
if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled )
|
||||
return;
|
||||
|
||||
- resetInputContext();
|
||||
for ( int i = 0; i < (int)doc->numSelections(); ++i )
|
||||
doc->removeSelection( i );
|
||||
|
||||
@@ -3334,7 +3327,6 @@
|
||||
if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled )
|
||||
return;
|
||||
|
||||
- resetInputContext();
|
||||
for ( int i = 0; i < (int)doc->numSelections(); ++i )
|
||||
doc->removeSelection( i );
|
||||
|
||||
@@ -3448,7 +3440,6 @@
|
||||
{
|
||||
if ( isReadOnly() )
|
||||
return;
|
||||
- resetInputContext();
|
||||
normalCopy();
|
||||
removeSelectedText();
|
||||
updateMicroFocusHint();
|
||||
@@ -3936,7 +3927,6 @@
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
- resetInputContext();
|
||||
if ( !isModified() && isReadOnly() &&
|
||||
this->context() == context && this->text() == text )
|
||||
return;
|
||||
@@ -4110,7 +4100,6 @@
|
||||
if ( !p )
|
||||
return;
|
||||
|
||||
- resetInputContext();
|
||||
if ( index > p->length() - 1 )
|
||||
index = p->length() - 1;
|
||||
|
||||
@@ -4167,7 +4156,6 @@
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
- resetInputContext();
|
||||
if ( doc->hasSelection( selNum ) ) {
|
||||
doc->removeSelection( selNum );
|
||||
repaintChanged();
|
||||
@@ -5074,7 +5062,6 @@
|
||||
}
|
||||
if ( dc == doc )
|
||||
return;
|
||||
- resetInputContext();
|
||||
doc = dc;
|
||||
delete cursor;
|
||||
cursor = new QTextCursor( doc );
|
||||
--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200
|
||||
+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200
|
||||
@@ -84,7 +84,7 @@
|
||||
QMAKE_MOVE = mv -f
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
-QMAKE_STRIP =
|
||||
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
||||
+QMAKE_STRIP =
|
||||
+QMAKE_STRIPFLAGS_LIB +=
|
||||
QMAKE_CHK_DIR_EXISTS = test -d
|
||||
QMAKE_MKDIR = mkdir -p
|
||||
--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200
|
||||
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200
|
||||
@@ -84,7 +84,7 @@
|
||||
QMAKE_MOVE = mv -f
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
-QMAKE_STRIP = strip
|
||||
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
||||
+QMAKE_STRIP =
|
||||
+QMAKE_STRIPFLAGS_LIB +=
|
||||
QMAKE_CHK_DIR_EXISTS = test -d
|
||||
QMAKE_MKDIR = mkdir -p
|
||||
--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200
|
||||
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200
|
||||
@@ -87,7 +87,7 @@
|
||||
QMAKE_MOVE = mv -f
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
-QMAKE_STRIP = strip
|
||||
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
||||
+QMAKE_STRIP =
|
||||
+QMAKE_STRIPFLAGS_LIB +=
|
||||
QMAKE_CHK_DIR_EXISTS = test -d
|
||||
QMAKE_MKDIR = mkdir -p
|
||||
--- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100
|
||||
+++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100
|
||||
@@ -994,7 +994,10 @@
|
||||
#endif
|
||||
|
||||
QFile file( filename + ".tmp" );
|
||||
- if (! file.open(IO_WriteOnly)) {
|
||||
+ mode_t old_umask = umask(0022);
|
||||
+ bool f = file.open(IO_WriteOnly);
|
||||
+ umask(old_umask);
|
||||
+ if (! f) {
|
||||
|
||||
#ifdef QT_CHECK_STATE
|
||||
qWarning("QSettings::sync: failed to open '%s' for writing",
|
||||
--- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200
|
||||
+++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200
|
||||
@@ -817,7 +817,7 @@
|
||||
<PATHFORMAT>MacOS</PATHFORMAT>
|
||||
</FILEREF>
|
||||
</GROUP>
|
||||
- <GROUP><Name>QtGenerated</NAME>
|
||||
+ <GROUP><NAME>QtGenerated</NAME>
|
||||
$$CODEWARRIOR_QPREPROCESS_GROUP
|
||||
$$CODEWARRIOR_QPREPROCESSOUT_GROUP
|
||||
</GROUP>
|
||||
diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp
|
||||
--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100
|
||||
+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100
|
||||
@@ -320,7 +320,7 @@ int main( int argc, char * argv[] )
|
||||
out << "/****************************************************************************" << endl;
|
||||
out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
|
||||
out << "**" << endl;
|
||||
- out << "** Created: " << QDateTime::currentDateTime().toString() << endl;
|
||||
+ out << "** Created by User Interface Compiler" << endl;
|
||||
out << "**" << endl;
|
||||
out << "** WARNING! All changes made in this file will be lost!" << endl;
|
||||
out << "****************************************************************************/" << endl << endl;
|
||||
diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp
|
||||
--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100
|
||||
+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100
|
||||
@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const
|
||||
for ( it = images.begin(); it != images.end(); ++it )
|
||||
out << "** " << *it << "\n";
|
||||
out << "**\n";
|
||||
- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
|
||||
+ out << "** Created by The User Interface Compiler" << "\n";
|
||||
out << "**\n";
|
||||
out << "** WARNING! All changes made in this file will be lost!\n";
|
||||
out << "****************************************************************************/\n";
|
||||
--- a/qmake/project.cpp.orig 2015-04-10 17:15:10.731091347 +0200
|
||||
+++ b/qmake/project.cpp 2013-12-30 17:58:15.471703644 +0100
|
||||
@@ -685,7 +685,7 @@
|
||||
// fprintf(stderr,"Current QT version number: " + ver + "\n");
|
||||
if (ver != "" && ver != test_version) {
|
||||
ver = test_version;
|
||||
- fprintf(stderr,"Changed QT version number to " + test_version + "!\n");
|
||||
+ fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii());
|
||||
}
|
||||
}
|
||||
}
|
||||
--- qt3/src/tools/qgdict.cpp 2015-04-10 17:15:11.057092017 +0200
|
||||
+++ qt3/src/tools/qgdict.cpp 2013-12-30 17:58:15.516704273 +0100
|
||||
@@ -846,11 +846,11 @@
|
||||
QString line;
|
||||
line.fill( '-', 60 );
|
||||
double real, ideal;
|
||||
- qDebug( line.ascii() );
|
||||
+ qDebug( "%s", line.ascii() );
|
||||
qDebug( "DICTIONARY STATISTICS:" );
|
||||
if ( count() == 0 ) {
|
||||
qDebug( "Empty!" );
|
||||
- qDebug( line.ascii() );
|
||||
+ qDebug( "%s", line.ascii() );
|
||||
return;
|
||||
}
|
||||
real = 0.0;
|
||||
@@ -871,7 +871,7 @@
|
||||
while ( b-- )
|
||||
*pbuf++ = '*';
|
||||
*pbuf = '\0';
|
||||
- qDebug( buf );
|
||||
+ qDebug( "%s", buf );
|
||||
i++;
|
||||
}
|
||||
qDebug( "Array size = %d", size() );
|
||||
@@ -879,7 +879,7 @@
|
||||
qDebug( "Real dist = %g", real );
|
||||
qDebug( "Rand dist = %g", ideal );
|
||||
qDebug( "Real/Rand = %g", real/ideal );
|
||||
- qDebug( line.ascii() );
|
||||
+ qDebug( "%s", line.ascii() );
|
||||
#endif // QT_DEBUG
|
||||
}
|
||||
|
||||
--- a/src/tools/qgcache.cpp 2015-04-10 17:15:11.053092009 +0200
|
||||
+++ b/src/tools/qgcache.cpp 2013-12-30 17:58:15.515704259 +0100
|
||||
@@ -641,7 +641,7 @@
|
||||
#if defined(QT_DEBUG)
|
||||
QString line;
|
||||
line.fill( '*', 80 );
|
||||
- qDebug( line.ascii() );
|
||||
+ qDebug( "%s", line.ascii() );
|
||||
qDebug( "CACHE STATISTICS:" );
|
||||
qDebug( "cache contains %d item%s, with a total cost of %d",
|
||||
count(), count() != 1 ? "s" : "", tCost );
|
||||
@@ -662,7 +662,7 @@
|
||||
lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts );
|
||||
qDebug( "Statistics from internal dictionary class:" );
|
||||
dict->statistics();
|
||||
- qDebug( line.ascii() );
|
||||
+ qDebug( "%s", line.ascii() );
|
||||
#endif
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue