Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22786/10.7/stable/main/finkinfo/sci
Modified Files:
qgis18-py.info
Log Message:
Fix sip issues; move to -py
Index: qgis18-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/qgis18-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qgis18-py.info 7 Dec 2012 00:44:14 -0000 1.1
+++ qgis18-py.info 3 Jan 2013 23:42:33 -0000 1.2
@@ -3,10 +3,9 @@
Package: qgis18-py%type_pkg[python]
Type: python (2.7 2.6)
Architecture: powerpc, i386, x86_64
-Distribution: 10.5, 10.6, 10.7
Version: 1.8.0
-Revision: 1
+Revision: 2
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
@@ -35,12 +34,12 @@
<<
# Dependencies.
-Depends: qgis-plugin-installer, %n-shlibs (=%v-%r)
+Depends: qgis-plugin-installer-py%type_pkg[python], %n-shlibs (=%v-%r)
BuildDepends: <<
fink (>= 0.28), cmake, bison (>= 2.4),
gsl,
qt4-base-mac (>= 4.4),
- sip-py%type_pkg[python]-bin (>= 4.8), pyqt4-mac-py%type_pkg[python],
+ sip-py%type_pkg[python]-bin (>= 4.13.3-1),
xerces-c31-dev,
libiconv-dev, giflib, libtiff, libjpeg8, libogdi3 (>= 3.1.5-1),
libpng15, netcdf (>= 3.6.0-1002),
cfitsio,
@@ -48,7 +47,7 @@
libgeos3.3.3 (>= 3.0),
gdal-dev (>= 1.4) | gdal-pgsql-dev (>= 1.4),
postgresql90-dev,
- grass64-mac-dev | grass64-mac-dev,
+ grass64-x11-dev | grass64-mac-dev,
proj (>= 4.4),
qwt6-qt4-mac (>= 5.0),
libspatialindex2,
@@ -85,12 +84,13 @@
export CC=gcc-fsf-4.6
fi
- QGIS_OPTIONS="-D QGIS_APP_NAME=QGIS-py%type_pkg[python]-%v
+ QGIS_OPTIONS=" -D CMAKE_C_COMPILER=gcc
+ -D QGIS_APP_NAME=QGIS-py-%v
-D CMAKE_PREFIX_PATH=%p
-D
EXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS
-D CMAKE_INSTALL_PREFIX=%b/Applications
-D GDAL_INCLUDE_DIR=%p/include/gdal1
- -D
GEOS_CONFIG=%p/opt/libgeos3.3.3/bin/geos-config
+ -D
GEOS_CONFIG=%p/opt/libgeos3.3.1/bin/geos-config
-D QT_BINARY_DIR=%p/lib/qt4-mac/bin
-D QT_INCLUDE_DIR=%p/lib/qt4-mac/include
-D
QT_QMAKE_EXECUTABLE=%p/lib/qt4-mac/bin/qmake
@@ -161,7 +161,7 @@
# 1.6.0 Plugins are now managed by their own package (e.g.
qgis-plugin-ftools)
rm -rf %b/$QGIS_DIR/Resources/python/plugins
- ln -s %p/share/qgis/python/plugins
%b/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Resources/python/plugins
+ ln -s %p/share/qgis/python%type_pkg[python]/plugins
%b/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Resources/python/plugins
# 1.6.0 Workaround to SJIS problem
mkdir -p %b/$QGIS_DIR/PlugIns
@@ -255,12 +255,12 @@
Description: Shared libraries for QGIS
Depends: <<
qt4-base-mac-qtcore-shlibs (>= 4.4),
- python%type_pkg[python], sip-py%type_pkg[python] (>= 4.8),
pyqt4-mac-py%type_pkg[python],
+ python%type_pkg[python], sip-py%type_pkg[python] (>= 4.13.3-1),
pyqt4-mac-py%type_pkg[python],
gsl-shlibs,
xerces-c31-shlibs,
libgeos3.3.3-shlibs (>= 3.0),
gdal-shlibs (>= 1.4) | gdal-pgsql-shlibs (>= 1.4),
- grass64-mac-shlibs | grass64-x11-shlibs,
+ grass64-x11-shlibs | grass64-mac-shlibs,
libspatialite5-shlibs,
proj-shlibs (>= 4.4),
qwt6-qt4-mac-shlibs (>= 5.0),
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
