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: 19-Nov-2003 15:54:03
Branch: HEAD Handle: 2003111914540102
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Add support for Xft and Xrender X11 library extensions
Summary:
Revision Changes Path
1.92 +18 -7 openpkg-src/qt/qt.spec
1.7473 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.91 -r1.92 qt.spec
--- openpkg-src/qt/qt.spec 15 Nov 2003 19:55:32 -0000 1.91
+++ openpkg-src/qt/qt.spec 19 Nov 2003 14:54:03 -0000 1.92
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.2.3
-Release: 20031115
+Release: 20031119
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -46,12 +46,13 @@
# list of sources
Source0: ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.bz2
+Patch0: qt.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030909, X11, freetype, gcc, sed
-PreReq: OpenPKG, openpkg >= 20030909, X11, freetype
+BuildPreReq: OpenPKG, openpkg >= 20030909, X11, gcc, sed, xrender, xft
+PreReq: OpenPKG, openpkg >= 20030909, X11
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
@@ -78,6 +79,7 @@
%prep
%setup -q -n qt-x11-free-%{version}
+ %patch -p1
# avoid dependencies external to OpenPKG instance
cp -rp mkspecs mkspecs.fresh
@@ -92,6 +94,15 @@
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' \
@@ -146,7 +157,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -shared -stl -sm \
+ -release -shared -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -179,7 +190,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -shared -stl -sm \
+ -release -shared -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -218,7 +229,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -static -stl -sm \
+ -release -static -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -257,7 +268,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -static -stl -sm \
+ -release -static -stl -sm -xrender -xft \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7472 -r1.7473 news.txt
--- openpkg-web/news.txt 19 Nov 2003 14:05:51 -0000 1.7472
+++ openpkg-web/news.txt 19 Nov 2003 14:54:01 -0000 1.7473
@@ -1,3 +1,4 @@
+19-Nov-2003: Upgraded package: P<qt-3.2.3-20031119>
19-Nov-2003: New package: P<pan-0.14.2-20031119>
19-Nov-2003: Upgraded package: P<xmame-0.77.1-20031119>
19-Nov-2003: Upgraded package: P<openpkg-20031119-20031119>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
