OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Sep-2003 19:02:14
Branch: HEAD Handle: 2003090418021201
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Organize options, link again to freetype, avoid anything in /usr/local
by hacking the qmake files in mkspecs, consolidate posix thread test
substitutions, correct warning text again, remove bashisms, add
missing local x11 paths, remove unused build flags, fix build problems
relating to wrong library path ordering
Summary:
Revision Changes Path
1.82 +51 -31 openpkg-src/qt/qt.spec
1.6400 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.81 -r1.82 qt.spec
--- openpkg-src/qt/qt.spec 1 Sep 2003 16:03:07 -0000 1.81
+++ openpkg-src/qt/qt.spec 4 Sep 2003 17:02:13 -0000 1.82
@@ -33,14 +33,16 @@
Group: XWindow
License: GPL
Version: 3.2.1
-Release: 20030901
+Release: 20030904
-# package options
+# package library options (each 'yes' builds more libraries)
+%option with_shared no
+%option with_threads yes
+
+# package extra options (additional nonlibrary components)
%option with_pgsql no
%option with_mysql no
%option with_tools no
-%option with_shared no
-%option with_threads yes
# list of sources
Source0:
ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/qt-x11-free-%{version}.tar.bz2
@@ -48,8 +50,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, gcc
-PreReq: OpenPKG, openpkg >= 20030103, X11
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, freetype, gcc
+PreReq: OpenPKG, openpkg >= 20030103, X11, freetype
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
@@ -77,29 +79,41 @@
%prep
%setup -q -n qt-x11-free-%{version}
+ # 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
+
+ # 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
# display a warning that this package is a beast
( echo "The qt package requires about 320 MB of temporary disk space"
- echo "and two to four hours (depending on options) to build on a"
+ 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
# set HOME to a writable directory for qsettings
# and set QTDIR to just the source tree directory
- export HOME=`pwd`
- export QTDIR=`pwd`
-
+ # and determine the target platform to build
+ HOME=`pwd`
+ QTDIR=`pwd`
case "%{l_target}" in
- *-freebsd* ) oscomp="freebsd-g++"
- %{l_shtool} subst \
- -e
's/defined(_POSIX_THREAD_SAFE_FUNCTIONS)/_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
- ;;
- *-linux* ) oscomp="linux-g++"
- ;;
- *-solaris* ) oscomp="solaris-g++"
- ;;
+ *-freebsd* ) oscomp="freebsd-g++" ;;
+ *-linux* ) oscomp="linux-g++" ;;
+ *-solaris* ) oscomp="solaris-g++" ;;
* ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
esac
@@ -108,14 +122,16 @@
-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`
+
%if "%{with_shared}" == "yes"
# special trolltech configuration
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -130,8 +146,11 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -static -shared -R$rflags -stl -sm \
+ -release -static -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+ -L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
+ -R$rflags \
-no-thread
# make shared libs, but tools will be built statically later
@@ -149,8 +168,6 @@
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -165,8 +182,11 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -static -shared -R$rflags -stl -sm \
+ -release -static -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+ -L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
+ -R$rflags \
-thread
# make our targets a second time to get threaded libs, too
@@ -186,8 +206,6 @@
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -204,6 +222,8 @@
-sysconfdir %{l_prefix}/etc/qt \
-release -static -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+ -L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
-no-thread
%{l_make} %{l_mflags -O} \
@@ -229,8 +249,6 @@
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
echo "yes" | ./configure \
%if "%{with_pgsql}" == "yes"
-qt-sql-psql \
@@ -247,6 +265,8 @@
-sysconfdir %{l_prefix}/etc/qt \
-release -static -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
+ -I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
+ -L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
-thread
# make our targets a second time to get threaded libs, too
@@ -302,7 +322,7 @@
$RPM_BUILD_ROOT%{l_prefix}/bin/
# copy mkspecs directory for later portable use of qmake
- cp -rp mkspecs $RPM_BUILD_ROOT%{l_prefix}/share/qt/
+ cp -rp mkspecs.fresh $RPM_BUILD_ROOT%{l_prefix}/share/qt/mkspecs
# correct man suffix
for man in doc/man/man3/*.3qt; do
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6399 -r1.6400 news.txt
--- openpkg-web/news.txt 4 Sep 2003 16:59:46 -0000 1.6399
+++ openpkg-web/news.txt 4 Sep 2003 17:02:12 -0000 1.6400
@@ -1,3 +1,4 @@
+04-Sep-2003: Upgraded package: P<qt-3.2.1-20030904>
04-Sep-2003: Upgraded package: P<radius-1.1-20030904>
04-Sep-2003: New package: P<p0f-2.0.1-20030904>
04-Sep-2003: Upgraded package: P<rt-3.0.4-20030904>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
