فهرست منبع

Remove freetype option.

Michael Schloh von Bennewitz 23 سال پیش
والد
کامیت
9d517a0ce8
1فایلهای تغییر یافته به همراه2 افزوده شده و 19 حذف شده
  1. 2 19
      qt/qt.spec

+ 2 - 19
qt/qt.spec

@@ -23,11 +23,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   package options
-%ifndef    with_freetype
-%define    with_freetype    no
-%endif
-
 #   package information
 Name:         qt
 Summary:      The Qt Toolkit
@@ -38,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      3.0.6
-Release:      20021023
+Release:      20021105
 
 #   list of sources
 Source0:      ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -48,10 +43,6 @@ Prefix:       %{l_prefix}
 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
 
@@ -68,9 +59,6 @@ AutoReqProv:  no
     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}
 
@@ -89,12 +77,7 @@ AutoReqProv:  no
         -static -qt-gif -qt-zlib \
         -platform $oscomp -thread -stl \
         -qt-libpng -qt-libjpeg -qt-libmng \
-        -no-nas-sound -no-tablet -no-xkb \
-%if "%{with_freetype}" == "yes"
-        -xft \
-%else
-        -no-xft \
-%endif
+        -no-nas-sound -no-tablet -no-xkb -no-xft \
         -sm -xinerama -xrender \
         -L`%{l_prefix}/etc/rc --query x11_libdir` \
         -R`%{l_prefix}/etc/rc --query x11_libdir`