Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs17:/tmp/cvs-serv10583
Modified Files:
qgis.patch
Log Message:
Hoged 2.
Index: qgis.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/qgis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qgis.patch 11 May 2007 07:18:45 -0000 1.1
+++ qgis.patch 11 May 2007 07:36:17 -0000 1.2
@@ -1,6 +1,28 @@
--- configure.orig 2006-12-30 08:56:26.000000000 +0900
-+++ configure 2007-05-11 16:16:23.000000000 +0900
-@@ -19866,7 +19866,7 @@
++++ configure 2007-05-11 16:34:34.000000000 +0900
+@@ -19836,7 +19836,10 @@
+ # Test for the Windows version first because if if QTDIR is mounted via
+ # smbfs to an actual Windows installation, the /include/Qt is found
+ # case-insensitively
+-if test -f $QTDIR/include/Qt/qglobal.h -a -f
$QTDIR/src/corelib/global/qglobal.h; then
++if true; then
++ QTINC=$QTDIR/include
++ QTVERTEST=$QTDIR/include/Qt
++elif test -f $QTDIR/include/Qt/qglobal.h -a -f
$QTDIR/src/corelib/global/qglobal.h; then
+ # Windows: $QTDIR/include/Qt/qglobal.h includes
$QTDIR/src/corelib/global/qglobal.h
+ QTINC=$QTDIR/include
+ QTVERTEST=$QTDIR/src/corelib/global/
+@@ -19853,8 +19856,7 @@
+ QTINC=$QTDIR/lib/QtCore.framework/Headers
+ QTVERTEST=$QTDIR/lib/QtCore.framework/Headers
+ else
+- QTINC=$QTDIR/include
+- QTVERTEST=$QTDIR/include
++ :
+ fi
+
+ # Figure out which version of Qt we are using
+@@ -19866,7 +19868,7 @@
QT_MAJOR="${QT_VER:0:1}"
QT_MINOR="${QT_VER:1:1}"
case "${host}" in
@@ -9,7 +31,7 @@
QT4_3SUPPORTINC=$QTDIR/lib/Qt3Support.framework/Headers
QT4_COREINC=$QTDIR/lib/QtCore.framework/Headers
QT4_GUIINC=$QTDIR/lib/QtGui.framework/Headers
-@@ -20200,9 +20200,9 @@
+@@ -20200,9 +20202,9 @@
;;
*-darwin*)
# determin static or dynamic -- prefer dynamic
@@ -21,7 +43,7 @@
if test "x$QT_IS_STATIC" = x; then
QT_IS_STATIC="no"
{ { echo "$as_me:$LINENO: error: *** Couldn't find any Qt libraries
in $QTDIR/lib" >&5
-@@ -20232,13 +20232,9 @@
+@@ -20232,13 +20234,9 @@
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
