OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Oct-2002 11:51:14
Branch: HEAD Handle: 2002102210511400
Modified files:
openpkg-src/qt qt.spec readme.txt
Log:
Added "with_freetype" option.
Summary:
Revision Changes Path
1.42 +18 -1 openpkg-src/qt/qt.spec
1.5 +2 -0 openpkg-src/qt/readme.txt
____________________________________________________________________________
Index: openpkg-src/qt/qt.spec
============================================================
$ cvs diff -u -r1.41 -r1.42 qt.spec
--- openpkg-src/qt/qt.spec 22 Oct 2002 07:17:35 -0000 1.41
+++ openpkg-src/qt/qt.spec 22 Oct 2002 09:51:14 -0000 1.42
@@ -23,6 +23,11 @@
## SUCH DAMAGE.
##
+# package options
+%ifndef with_freetype
+%define with_freetype no
+%endif
+
# package information
Name: qt
Summary: The Qt Toolkit
@@ -43,6 +48,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, X11, gcc
PreReq: OpenPKG, openpkg >= 20020206, X11
+%if "%{with_freetype}" == "yes"
+BuildPreReq: freetype
+PreReq: freetype
+%endif
AutoReq: no
AutoReqProv: no
@@ -59,6 +68,9 @@
similar to templates in C++, but with influences from component
technology.
+ Options:
+ --define 'with_freetype %{with_freetype}'
+
%prep
%setup -q -n qt-x11-free-%{version}
@@ -78,7 +90,12 @@
-platform $oscomp -thread -stl \
-qt-libpng -qt-libjpeg -qt-libmng \
-no-nas-sound -no-tablet -no-xkb \
- -no-xft -sm -xinerama -xrender \
+%if "%{with_freetype}" == "yes"
+ -xft \
+%else
+ -no-xft \
+%endif
+ -sm -xinerama -xrender \
-L`%{l_prefix}/etc/rc --query x11_libdir` \
-R`%{l_prefix}/etc/rc --query x11_libdir`
Index: openpkg-src/qt/readme.txt
============================================================
$ cvs diff -u -r1.4 -r1.5 readme.txt
--- openpkg-src/qt/readme.txt 22 Oct 2002 07:17:35 -0000 1.4
+++ openpkg-src/qt/readme.txt 22 Oct 2002 09:51:14 -0000 1.5
@@ -18,6 +18,8 @@
Fragen:
Is there a way to tell Qt where to find the freetype includes and libraries during
configuration buildtime?
+Freetype is an option, but only comprehensive testing will tell if the OpenPKG
+ freetype package is used during building and then later at runtime also.
Fragen:
Why doesn't DESTDIR work?
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
