Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11830/10.4/stable/main/finkinfo/sci
Modified Files: qgis17-py.info qgis18-py.info Log Message: Update dependencies Index: qgis17-py.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/qgis17-py.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- qgis17-py.info 14 Jan 2013 03:50:35 -0000 1.2 +++ qgis17-py.info 23 Sep 2013 09:50:22 -0000 1.3 @@ -6,7 +6,7 @@ Version: 1.7.4 -Revision: 4 +Revision: 7 Description: User friendly Open Source GIS License: GPL Homepage: http://qgis.org @@ -42,12 +42,12 @@ qt4-base-mac, 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), + libiconv-dev, giflib, libtiff5, libjpeg9, libogdi3 (>= 3.1.5-1), libpng16, netcdf (>= 3.6.0-1002), cfitsio, unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010), - libgeos3.3.6, + libgeos3.4.2, gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev, - postgresql90-dev, + postgresql91-dev, proj (>=4), qwt-qt4-mac << @@ -78,13 +78,15 @@ export PYTHONPATH=%p/lib/qt4-mac/lib/python$PY_VER/site-packages:$PYTHONPATH export PATH=%p/lib/qt4-mac/lib/python$PY_VER/bin:$PATH + QGIS_DIR=Applications/QGIS-py%type_pkg[python]-%v.app/Contents + QGIS_OPTIONS="-DQGIS_APP_NAME=QGIS-py%type_pkg[python]-%v -DCMAKE_PREFIX_PATH=%p -DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS -DCMAKE_INSTALL_PREFIX=%b/Applications -DCMAKE_BUILD_TYPE=Release -DGDAL_INCLUDE_DIR=%p/include/gdal1 - -DGEOS_CONFIG=%p/opt/libgeos3.3.6/bin/geos-config + -DGEOS_CONFIG=%p/opt/libgeos3.4.2/bin/geos-config -DQT_BINARY_DIR=%p/lib/qt4-mac/bin -DQT_INCLUDE_DIR=%p/lib/qt4-mac/include -DQT_QMAKE_EXECUTABLE=%p/lib/qt4-mac/bin/qmake @@ -131,7 +133,7 @@ popd # Plugins are now managed by their own package (e.g. qgis-plugin-ftools) - rm -rf %b/$QGIS_DIR/Resources/python%type_pkg[python]/plugins + rm -rf %b/$QGIS_DIR/Resources/python/plugins # Workaround to SJIS problem mkdir -p %b/$QGIS_DIR/PlugIns @@ -142,7 +144,7 @@ %p/bin/python$PY_VER -O %p/lib/python$PY_VER/compileall.py -f -d %p/$QGIS_DIR/Resources/python/qgis %b/$QGIS_DIR/Resources/python/qgis << InstallScript: << - 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 << AppBundles: Applications/QGIS-py%type_pkg[python]-%v.app @@ -155,7 +157,7 @@ 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.6-shlibs, + libgeos3.4.2-shlibs, gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs| gdal-pgsql-mysql-shlibs, libspatialite5-shlibs, proj-shlibs (>=4), @@ -194,14 +196,8 @@ 2. separates all the python plugins as independent packages. - For consistency, qgis and relevant packages are strongly recommended to depend on -the latest stable versions, e.g.: - postgresql90, - grass64, - libgeos3.3.1, - libjpeg8, libogdi3, libpng14 - - sip errors can usually be found in .sip files in python/core. + Not compatible: + qwt6 << DescPort: << See http://wiki.qgis.org/qgiswiki/BuildingFromSource Index: qgis18-py.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/qgis18-py.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qgis18-py.info 8 Jul 2013 01:50:59 -0000 1.3 +++ qgis18-py.info 23 Sep 2013 09:50:22 -0000 1.4 @@ -5,7 +5,7 @@ Architecture: powerpc, i386, x86_64 Version: 1.8.0 -Revision: 5 +Revision: 6 Description: User friendly Open Source GIS License: GPL Homepage: http://qgis.org @@ -41,12 +41,12 @@ qt4-base-mac (>= 4.4), 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), + libiconv-dev, giflib, libtiff5, libjpeg9, libogdi3 (>= 3.1.5-1), libpng16, netcdf (>= 3.6.0-1002), cfitsio, unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010), - libgeos3.3.6 (>= 3.0), + libgeos3.4.2 (>= 3.0), gdal-dev (>= 1.4) | gdal-pgsql-dev (>= 1.4), - postgresql90-dev, + postgresql91-dev, (%type_raw[grass] = . ) grass64-x11-dev | (%type_raw[grass] = . ) grass64-mac-dev, proj (>= 4.4), qwt6-qt4-mac (>= 5.0), @@ -92,7 +92,7 @@ -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.6/bin/geos-config + -D GEOS_CONFIG=%p/opt/libgeos3.4.2/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 @@ -284,12 +284,12 @@ 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.6-shlibs (>= 3.0), + libgeos3.4.2-shlibs (>= 3.0), gdal-shlibs (>= 1.4) | gdal-pgsql-shlibs (>= 1.4), (%type_raw[grass] = . ) grass64-x11-shlibs | (%type_raw[grass] = . ) grass64-mac-shlibs, proj-shlibs (>= 4.4), qwt6-qt4-mac-shlibs (>= 5.0), - libspatialindex2-shlibs, + libspatialindex3-shlibs, libspatialite5-shlibs (>= 3.0) << Conflicts: qgis18-py%type_pkg[python]-shlibs, qgis18-nograss-py%type_pkg[python]-shlibs ------------------------------------------------------------------------------ LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs