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: 20-Nov-2003 13:07:44
Branch: HEAD Handle: 2003112012074400
Added files:
openpkg-src/qt qt.patch
Log:
Resolve missing patch file problem by adding the forgotten patch file
Summary:
Revision Changes Path
1.1 +68 -0 openpkg-src/qt/qt.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
============================================================================
$ cvs diff -u -r0 -r1.1 qt.patch
--- /dev/null 2003-11-20 13:07:44.000000000 +0100
+++ qt.patch 2003-11-20 13:07:44.000000000 +0100
@@ -0,0 +1,68 @@
+diff -Naur qt-x11-free-3.2.3.orig/configure qt-x11-free-3.2.3/configure
+--- qt-x11-free-3.2.3.orig/configure 2003-10-21 12:04:20.000000000 +0200
++++ qt-x11-free-3.2.3/configure 2003-11-19 11:40:38.000000000 +0100
+@@ -1684,21 +1684,6 @@
+ CFG_FREETYPE=yes
+ fi
+ fi
+- # add freetype2 include path
+- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then
+- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat
$outpath/config.tests/x11/xft.inc`\""
+- fi
+- rm -f $outpath/config.tests/x11/xft.inc
+- # add Xft specific libraries
+- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ];
then
+- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat
$outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
+- fi
+- rm -f $outpath/config.tests/x11/xft.lib
+- # add Xft specific config options
+- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ];
then
+- QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
+- fi
+- rm -f $outpath/config.tests/x11/xft.cfg
+ # auto-detect Session Management support
+ if [ "$CFG_SM" = "auto" ]; then
+ if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
+@@ -2692,6 +2677,21 @@
+ if [ "$CFG_XKB" = "yes" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG xkb"
+ fi
++ # add freetype2 include path
++ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then
++ QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat
$outpath/config.tests/x11/xft.inc`\""
++ fi
++ rm -f $outpath/config.tests/x11/xft.inc
++ # add Xft specific libraries
++ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ];
then
++ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat
$outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
++ fi
++ rm -f $outpath/config.tests/x11/xft.lib
++ # add Xft specific config options
++ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ];
then
++ QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
++ fi
++ rm -f $outpath/config.tests/x11/xft.cfg
+ fi
+
+ [ '!' -z "$D_FLAGS" ] && QMAKE_VARS="$QMAKE_VARS \"DEFINES+=$D_FLAGS\""
+diff -Naur qt-x11-free-3.2.3.orig/config.tests/x11/xfreetype.test
qt-x11-free-3.2.3/config.tests/x11/xfreetype.test
+--- qt-x11-free-3.2.3.orig/config.tests/x11/xfreetype.test Wed Nov 19 11:45:11
2003
++++ qt-x11-free-3.2.3/config.tests/x11/xfreetype.test Wed Nov 19 12:59:54
2003
+@@ -56,7 +56,7 @@
+ XFT=no
+ [ "$VERBOSE" = "yes" ] && echo " Could not find Xft lib anywhere in $LIBDIRS"
+ fi
+-LIBXFT="-l$F -lfreetype"
++LIBXFT="-l$F -lfontconfig -lexpat -lfreetype"
+
+ # check for X11/Xft/Xft.h
+ XFT_H=
+@@ -89,7 +89,7 @@
+ [ "$VERBOSE" = "yes" ] && echo " Found Xft version $XFT_MAJOR.$XFT_MINOR"
+ if [ "$XFT_MAJOR" = "2" ]; then
+ XFT2=yes
+- LIBXFT="$LIBXFT -lfontconfig"
++ LIBXFT="$LIBXFT"
+ fi
+ fi
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
