OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Feb-2004 13:13:17
Branch: HEAD Handle: 2004020612131402
Modified files:
openpkg-src/kde-qt kde-qt.spec
openpkg-web news.txt
Log:
cleanup for KDE 3.2 upgrade
Summary:
Revision Changes Path
1.8 +53 -19 openpkg-src/kde-qt/kde-qt.spec
1.8458 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kde-qt/kde-qt.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 kde-qt.spec
--- openpkg-src/kde-qt/kde-qt.spec 3 Feb 2004 20:02:55 -0000 1.7
+++ openpkg-src/kde-qt/kde-qt.spec 6 Feb 2004 12:13:16 -0000 1.8
@@ -34,7 +34,7 @@
Group: KDE
License: GPL
Version: 3.2.3
-Release: 20040203
+Release: 20040206
# list of sources
Source0: ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.bz2
@@ -58,13 +58,13 @@
(The major differences between this package and the standard OpenPKG
Qt package are: shared library version only, threading enabled,
- stripped down installation size, slightly older version to fullfill
- exactly the requirements of KDE, no build options, etc. So, this
- package just is for KDE internal use only.)
+ stripped down installation size, perhaps different version to
+ fullfill exactly the requirements of KDE, no build options, etc. So,
+ this package is just for KDE internal use only.)
%track
prog kde-qt = {
- version = 3.2.3
+ version = %{version}
url = ftp://ftp.trolltech.com/pub/qt/source/
regex = qt-x11-free-(3\.2\.\d+)\.tar\.gz
}
@@ -72,25 +72,46 @@
%prep
%setup -q -n qt-x11-free-%{version}
- # just checking for the definition of POSIX feature test macros
- # is a violation of the standard. The macros are allowed to
- # have values -1, 0 and >0 and especially a defined value
- # of -1 still means "feature not available". It case of
- # _POSIX_THREAD_SAFE_FUNCTIONS, SUSv3 says in particular "if this
- # symbol has a value other than -1 or 0, it shall have the value
- # 200112L".
+ # avoid dependencies external to OpenPKG instance
+ cp -rp mkspecs mkspecs.fresh
+ %{l_shtool} subst \
+ -e 's;[ \t]*-I/usr/local/include;;g' \
+ -e 's;[ \t]*/usr/local/include;;g' \
+ -e 's;[ \t]*-L/usr/local/lib;;g' \
+ -e 's;[ \t]*/usr/local/lib;;g' \
+ mkspecs/darwin-g++/qmake.conf \
+ mkspecs/freebsd-g++/qmake.conf \
+ mkspecs/netbsd-g++/qmake.conf \
+ mkspecs/macx-pbuilder/qmake.conf \
+ mkspecs/openbsd-g++/qmake.conf
+
+ # correctly detect OpenPKG xrender and xft installations
+ %{l_shtool} subst \
+ -e 's;INCDIRS=";INCDIRS="%{l_prefix}/include ;g' \
+ -e 's;LIBDIRS=";LIBDIRS="%{l_prefix}/lib ;g' \
+ -e 's;freetype2/freetype/;freetype/;g' \
+ -e 's;freetype2;freetype;g' \
+ config.tests/x11/xfreetype.test \
+ config.tests/x11/xrender.test
+
+ # repair nonstandard posix thread test macro usage
%{l_shtool} subst \
-e 's/\(defined(_POSIX_THREAD_SAFE_FUNCTIONS)\)/(\1 \&\&
_POSIX_THREAD_SAFE_FUNCTIONS-0>0)/g' \
src/dialogs/qfiledialog.cpp src/kernel/qfont_x11.cpp \
src/tools/qdatetime.cpp src/tools/qdir_unix.cpp
%build
- # set $HOME to a writable directory for qsettings
- # and set QTDIR to just the source tree directory
- export HOME=`pwd`
- export QTDIR=`pwd`
+ # display a warning that this package is a beast
+ ( echo "The qt package requires about 320 MB of temporary disk space"
+ echo "and one to five hours (depending on options) to build on a"
+ echo "800 MHz system. Therefore, please be prepared and be patient."
+ ) | %{l_rpmtool} msg -b -t notice
- # determine target platform for building
+ # set HOME to a writable directory for qsettings
+ # and set QTDIR to just the source tree directory
+ # and determine the target platform to build
+ HOME=`pwd`
+ QTDIR=`pwd`
case "%{l_platform -t}" in
*-freebsd* ) oscomp="freebsd-g++" ;;
*-linux* ) oscomp="linux-g++" ;;
@@ -98,9 +119,20 @@
* ) echo "platform %{l_platform -t} not supported" 2>&1; exit 1 ;;
esac
- # configure Qt for target platform
+ # put in proper search paths for dynamic libraries
+ rflags=`echo '%{l_ldflags}' | %{l_shtool} subst \
+ -e 's;%{l_prefix}/lib;%{l_prefix}/lib/qtdyn;g' \
+ -e 's;-L;-R;g'`
+
+ # calculate X11 paths in advance
l_x11_incdir=`%{l_prefix}/etc/rc --query x11_incdir`
l_x11_libdir=`%{l_prefix}/etc/rc --query x11_libdir`
+
+ # special trolltech configuration
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
echo "yes" | ./configure \
-platform $oscomp \
-prefix %{l_prefix} \
@@ -123,10 +155,12 @@
# build Qt (but without additional tools, the tutorial and the examples)
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
+ LD_LIBRARY_PATH="$QTDIR/lib" \
symlinks src-qmake src-moc sub-src
( cd tools/designer
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
+ LD_LIBRARY_PATH="$QTDIR/lib" \
sub-uic
) || exit $?
@@ -180,7 +214,7 @@
-e "s;@l_x11_incdir@;${l_x11_incdir};g" \
-e "s;@l_x11_libdir@;${l_x11_libdir};g" \
%{SOURCE kde-qt.pc} \
- $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
+ $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8457 -r1.8458 news.txt
--- openpkg-web/news.txt 6 Feb 2004 11:33:28 -0000 1.8457
+++ openpkg-web/news.txt 6 Feb 2004 12:13:14 -0000 1.8458
@@ -1,3 +1,4 @@
+06-Feb-2004: Upgraded package: P<kde-qt-3.2.3-20040206>
06-Feb-2004: Upgraded package: P<gettext-0.14.1-20040206>
06-Feb-2004: Upgraded package: P<python-2.3.3-20040206>
06-Feb-2004: Upgraded package: P<txt2html-2.21-20040206>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
