OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 06-Nov-2002 17:10:22
Branch: HEAD Handle: 2002110616102101
Modified files:
openpkg-src/qt qt.spec readme.txt
openpkg-web news.txt
Log:
Replace old broken freetype option with new xft one.
Summary:
Revision Changes Path
1.45 +33 -2 openpkg-src/qt/qt.spec
1.6 +21 -0 openpkg-src/qt/readme.txt
1.1958 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/qt/qt.spec
============================================================
$ cvs diff -u -r1.44 -r1.45 qt.spec
--- openpkg-src/qt/qt.spec 5 Nov 2002 18:29:00 -0000 1.44
+++ openpkg-src/qt/qt.spec 6 Nov 2002 16:10:22 -0000 1.45
@@ -23,6 +23,11 @@
## SUCH DAMAGE.
##
+# package options
+%ifndef with_xft
+%define with_xft no
+%endif
+
# package information
Name: qt
Summary: The Qt Toolkit
@@ -33,7 +38,7 @@
Group: XWindow
License: GPL
Version: 3.0.6
-Release: 20021105
+Release: 20021106
# list of sources
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-free-%{version}.tar.gz
@@ -59,6 +64,9 @@
similar to templates in C++, but with influences from component
technology.
+ Options:
+ --define 'with_xft %{with_xft}'
+
%prep
%setup -q -n qt-x11-free-%{version}
@@ -70,6 +78,24 @@
*-solaris* ) oscomp="solaris-g++" ;;
* ) echo "platform %{l_target} not supported" 2>&1; exit 1 ;;
esac
+
+ # ensure that libXft exists
+%if "%{with_xft}" == "yes"
+ found_xft=""
+ for ext in a so sl; do
+ if [ -f "`%{l_prefix}/etc/rc --query x11_libdir`/libXft.$ext" ]; then
+ found_xft="da"
+ break;
+ fi
+ done
+ if [ ".$found_xft" = . ]; then
+ echo "ERROR! Library libXft could not be found," 2>&1;
+ echo "please consider building without with_xft" 2>&1;
+ exit 1;
+ fi
+%endif
+
+ # special trolltech configuration
echo "yes" | ./configure \
-prefix %{l_prefix} -release \
-docdir %{l_prefix}/share/qt/doc \
@@ -77,7 +103,12 @@
-static -qt-gif -qt-zlib \
-platform $oscomp -thread -stl \
-qt-libpng -qt-libjpeg -qt-libmng \
- -no-nas-sound -no-tablet -no-xkb -no-xft \
+ -no-nas-sound -no-tablet -no-xkb \
+%if "%{with_xft}" == "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.5 -r1.6 readme.txt
--- openpkg-src/qt/readme.txt 22 Oct 2002 09:51:14 -0000 1.5
+++ openpkg-src/qt/readme.txt 6 Nov 2002 16:10:22 -0000 1.6
@@ -27,6 +27,27 @@
Qt uses $INSTALL_ROOT instead, but isn't recursively passed to subsequent
make calls so is relatively useless in a spec file.
+Files Problem:
+root@dt4# rpm -Uvh
+/u/ms/work/openpkg/pkg/bin/qt-3.0.6-20021105.ix86-freebsd4.7-sw.rpm
+Preparing... ########################################### [100%]
+package qt-3.0.6-20021105 is already installed
+file /sw/bin/designer from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/bin/linguist from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/bin/lrelease from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/bin/lupdate from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/bin/qtconfig from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/bin/uic from install of qt-3.0.6-20021105 conflicts with file from package
qt-3.0.6-20021105
+file /sw/lib/libeditor.prl from install of qt-3.0.6-20021105 conflicts with file
from package qt-3.0.6-20021105
+file /sw/lib/libqnp.prl from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/lib/libqt-mt.a from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/lib/libqt-mt.prl from install of qt-3.0.6-20021105 conflicts with file
from package qt-3.0.6-20021105
+file /sw/lib/libqui.a from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/lib/libqui.prl from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/lib/libqxt.prl from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+file /sw/bin/assistant from install of qt-3.0.6-20021105 conflicts with file from
package qt-3.0.6-20021105
+root@dt4# rpm -e qt
+
-------- First problem building with -system-libpng
$ rpm --rebuild qt-3.0.4-20020610.src.rpm
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1957 -r1.1958 news.txt
--- openpkg-web/news.txt 6 Nov 2002 09:07:01 -0000 1.1957
+++ openpkg-web/news.txt 6 Nov 2002 16:10:21 -0000 1.1958
@@ -1,3 +1,4 @@
+06-Nov-2002: Upgraded package: P<qt-3.0.6-20021106>
06-Nov-2002: Upgraded package: P<vim-6.1.248-20021106>
06-Nov-2002: Upgraded package: P<sed-4.0.1-20021106>
06-Nov-2002: Upgraded package: P<perl-parse-20021106-20021106>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
