Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17596
Modified Files:
qgis17-py.info qgis18-py.info
Log Message:
plugin location qgis17-py27 style
Index: qgis17-py.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis17-py.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qgis17-py.info 3 Jan 2013 15:09:12 -0000 1.3
+++ qgis17-py.info 28 Jun 2013 10:40:58 -0000 1.4
@@ -6,7 +6,7 @@
Version: 1.7.4
-Revision: 4
+Revision: 5
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
@@ -40,12 +40,12 @@
fink (>= 0.28), cmake, bison (>= 2.3),
gsl,
qt4-base-mac,
- sip-py%type_pkg[python]-bin,
+ 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,
unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010),
- libgeos3.3.1,
+ libgeos3.3.6,
gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev,
postgresql90-dev,
proj (>=4),
@@ -84,7 +84,7 @@
-DCMAKE_INSTALL_PREFIX=%b/Applications
-DCMAKE_BUILD_TYPE=Release
-DGDAL_INCLUDE_DIR=%p/include/gdal1
- -DGEOS_CONFIG=%p/opt/libgeos3.3.1/bin/geos-config
+ -DGEOS_CONFIG=%p/opt/libgeos3.3.6/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
@@ -142,7 +142,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/qgis17-py%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
@@ -152,12 +152,12 @@
Description: QGIS Shared Libraries
Depends: <<
qt4-base-mac-qtcore-shlibs,
- python%type_pkg[python], sip-py%type_pkg[python],
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.1-shlibs,
+ libgeos3.3.6-shlibs,
gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
- libspatialite1-shlibs | libspatialite1-64bit-shlibs,
+ libspatialite5-shlibs,
proj-shlibs (>=4),
qwt-qt4-mac-shlibs
<<
Index: qgis18-py.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis18-py.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qgis18-py.info 1 Jan 2013 02:04:52 -0000 1.5
+++ qgis18-py.info 28 Jun 2013 10:40:58 -0000 1.6
@@ -1,11 +1,11 @@
Info2: <<
-Package: qgis18-py%type_pkg[python]
-Type: python (2.7 2.6)
+Package: qgis18%type_pkg[grass]-py%type_pkg[python]
+Type: python (2.7 2.6), grass (. -nograss)
Architecture: powerpc, i386, x86_64
Version: 1.8.0
-Revision: 1.1
+Revision: 5
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
@@ -39,21 +39,23 @@
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,
unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010),
- libgeos3.3.1 (>= 3.0),
+ libgeos3.3.6 (>= 3.0),
gdal-dev (>= 1.4) | gdal-pgsql-dev (>= 1.4),
postgresql90-dev,
- grass64-x11-dev | grass64-mac-dev,
+ (%type_raw[grass] = . ) grass64-x11-dev | (%type_raw[grass] = . )
grass64-mac-dev,
proj (>= 4.4),
qwt6-qt4-mac (>= 5.0),
- libspatialindex2,
+ libspatialindex3,
libspatialite5 (>= 3.0)
<<
BuildConflicts: libspatialite1
+Conflicts: qgis18-py%type_pkg[python], qgis18-nograss-py%type_pkg[python]
+Replaces: qgis18-py%type_pkg[python], qgis18-nograss-py%type_pkg[python]
# Unpack Phase.
Source: http://qgis.org/downloads/qgis-%v.tar.bz2
@@ -80,8 +82,8 @@
QGIS_DIR=Applications/QGIS-py%type_pkg[python]-%v.app/Contents
# Lion
- if [[ $( sw_vers -productVersion ) > 10.7 ]]; then
- export CC=gcc-fsf-4.6
+ if [ $( sw_vers -productVersion ) > 10.7 ]; then
+ export CC=%p/lib/gcc4.7/bin/gcc-fsf-4.7
fi
QGIS_OPTIONS=" -D CMAKE_C_COMPILER=gcc
@@ -100,8 +102,7 @@
-D
PYUIC4_PROGRAM=%p/lib/qt4-mac/lib/python$PY_VER/bin/pyuic4
-D
SIP_INCLUDE_DIR=%p/include/python$PY_VER
-D SIP_BINARY_PATH=%p/bin
- -D POSTGRES_CONFIG=%p/bin/pg_config
- -D
GRASS_PREFIX=%p/Applications/GRASS-6.4.app/Contents/MacOS"
+ -D POSTGRES_CONFIG=%p/bin/pg_config"
QGIS_VERSION_OPTIONS="-D CMAKE_BUILD_TYPE=Release
-D ENABLE_TESTS=FALSE
-D WITH_INTERNAL_SPATIALITE=FALSE
@@ -121,7 +122,11 @@
mkdir build
pushd build
- cmake $QGIS_OPTIONS $QGIS_VERSION_OPTIONS ..
+ if [ "%type_raw[grass]" == "." ]; then
+ cmake $QGIS_OPTIONS $QGIS_VERSION_OPTIONS -D
GRASS_PREFIX=%p/Applications/GRASS-6.4.app/Contents/MacOS ..
+ else
+ cmake $QGIS_OPTIONS $QGIS_VERSION_OPTIONS -D GRASS_PREFIX=no ..
+ fi;
# 1.8.0 Fix hardcoded application name
for filename in src/app/cmake_install.cmake
src/app/CMakeFiles/QGIS.dir/build.make src/app/CMakeFiles/QGIS.dir/link.txt
cmake_clean.cmake
@@ -161,7 +166,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%type_pkg[python]/plugins
%b/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Resources/python/plugins
+ ln -s %p/share/qgis-py%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
@@ -180,7 +185,7 @@
popd
pushd $QGIS_DIR/Frameworks
- for libname in qgis_analysis qgis_core qgis_gui qgis_networkanalysis
qgisgrass qgissqlanyconnection
+ for libname in qgis_analysis qgis_core qgis_gui qgis_networkanalysis
qgissqlanyconnection
do
install_name_tool -id
%p/$QGIS_DIR/Frameworks/$libname.framework/Versions/1.8/$libname
$libname.framework/Versions/1.8/$libname
for loadable in qgis_analysis qgis_core qgis_gui
@@ -188,6 +193,16 @@
install_name_tool -change
@loader_path/../../../$loadable.framework/$loadable
%p/$QGIS_DIR/Frameworks/$loadable.framework/Versions/1.8/$loadable
$libname.framework/Versions/1.8/$libname
done
done
+ if [ "%type_raw[grass]" == "." ]; then
+ for libname in qgisgrass
+ do
+ install_name_tool -id
%p/$QGIS_DIR/Frameworks/$libname.framework/Versions/1.8/$libname
$libname.framework/Versions/1.8/$libname
+ for loadable in qgis_analysis qgis_core qgis_gui
+ do
+ install_name_tool -change
@loader_path/../../../$loadable.framework/$loadable
%p/$QGIS_DIR/Frameworks/$loadable.framework/Versions/1.8/$loadable
$libname.framework/Versions/1.8/$libname
+ done
+ done
+ fi
popd
pushd $QGIS_DIR/Resources/python/qgis
@@ -218,9 +233,9 @@
pushd $QGIS_DIR/PlugIns/qgis
for libname in libcoordinatecaptureplugin.so libgpsimporterplugin.so
libmssqlprovider.so libspatialiteprovider.so \
libdelimitedtextplugin.so libgpxprovider.so
libofflineeditingplugin.so libspatialqueryplugin.so \
- libdelimitedtextprovider.so libgrassplugin.so
libogrprovider.so libspitplugin.so \
- libdiagramoverlay.so libgrassprovider.so
liboracleplugin.so libsqlanywhereplugin.so \
- libdxf2shpconverterplugin.so libgrassrasterprovider.so
libosmprovider.so libsqlanywhereprovider.so \
+ libdelimitedtextprovider.so libogrprovider.so
libspitplugin.so \
+ libdiagramoverlay.so liboracleplugin.so
libsqlanywhereplugin.so \
+ libdxf2shpconverterplugin.so libosmprovider.so
libsqlanywhereprovider.so \
libevis.so libheatmapplugin.so
libpostgresprovider.so libwfsprovider.so \
libgdalprovider.so libinterpolationplugin.so
librasterterrainplugin.so libwmsprovider.so \
libgeorefplugin.so libmemoryprovider.so
libroadgraphplugin.so libzonalstatisticsplugin.so
@@ -231,6 +246,16 @@
install_name_tool -change
@loader_path/../../MacOS/../Frameworks/$loadable.framework/$loadable
%p/$QGIS_DIR/Frameworks/$loadable.framework/Versions/1.8/$loadable $libname
done
done
+ if [ "%type_raw[grass]" == "." ]; then
+ for libname in libgrassplugin.so libgrassprovider.so
libgrassrasterprovider.so
+ do
+ install_name_tool -id %p/$QGIS_DIR/PlugIns/qgis/$libname
$libname
+ for loadable in qgis_analysis qgis_core qgis_gui
+ do
+ install_name_tool -change
@loader_path/../../MacOS/../Frameworks/$loadable.framework/$loadable
%p/$QGIS_DIR/Frameworks/$loadable.framework/Versions/1.8/$loadable $libname
+ done
+ done
+ fi
popd
@@ -248,6 +273,7 @@
echo "Completed the building process..."
<<
+
AppBundles: Applications/QGIS-py%type_pkg[python]-%v.app
SplitOff: <<
@@ -255,24 +281,25 @@
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.1-shlibs (>= 3.0),
+ libgeos3.3.6-shlibs (>= 3.0),
gdal-shlibs (>= 1.4) | gdal-pgsql-shlibs (>= 1.4),
- grass64-x11-shlibs | grass64-mac-shlibs,
- libspatialite5-shlibs,
+ (%type_raw[grass] = . ) grass64-x11-shlibs | (%type_raw[grass] = . )
grass64-mac-shlibs,
proj-shlibs (>= 4.4),
qwt6-qt4-mac-shlibs (>= 5.0),
libspatialindex2-shlibs,
libspatialite5-shlibs (>= 3.0)
<<
+ Conflicts: qgis18-py%type_pkg[python]-shlibs,
qgis18-nograss-py%type_pkg[python]-shlibs
+ Replaces: qgis18-py%type_pkg[python]-shlibs,
qgis18-nograss-py%type_pkg[python]-shlibs
Files: <<
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_analysis.framework/Versions/1.8/qgis_analysis
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_core.framework/Versions/1.8/qgis_core
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_gui.framework/Versions/1.8/qgis_gui
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_networkanalysis.framework/Versions/1.8/qgis_networkanalysis
-
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/Versions/1.8/qgisgrass
+ (%type_raw[grass] = . )
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/Versions/1.8/qgisgrass
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgissqlanyconnection.framework/Versions/1.8/qgissqlanyconnection
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgispython.1.8.0.dylib
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/qgis/crssync
@@ -283,7 +310,7 @@
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_core.framework/Versions/1.8/qgis_core
1.8.0 %n (>= 1.8.0-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_gui.framework/Versions/1.8/qgis_gui
1.8.0 %n (>= 1.8.0-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_networkanalysis.framework/Versions/1.8/qgis_networkanalysis
1.8.0 %n (>= 1.8.0-1)
-
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/Versions/1.8/qgisgrass
1.8.0 %n (>= 1.8.0-1)
+ (%type_raw[grass] = . )
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/Versions/1.8/qgisgrass
1.8.0 %n (>= 1.8.0-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgissqlanyconnection.framework/Versions/1.8/qgissqlanyconnection
1.8.0 %n (>= 1.8.0-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgispython.1.8.0.dylib
1.8.0 %n (>= 1.8.0-1)
<<
@@ -293,17 +320,19 @@
SplitOff2: <<
Package: %N-dev
Description: Header files for QGIS
+ Conflicts: qgis18-py%type_pkg[python]-dev,
qgis18-nograss-py%type_pkg[python]-dev
+ Replaces: qgis18-py%type_pkg[python]-dev,
qgis18-nograss-py%type_pkg[python]-dev
Files: <<
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_analysis.framework/Versions/Current
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_core.framework/Versions/Current
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_gui.framework/Versions/Current
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_networkanalysis.framework/Versions/Current
-
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/Versions/Current
+ (%type_raw[grass] = . )
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/Versions/Current
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_analysis.framework/qgis_analysis
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_core.framework/qgis_core
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_gui.framework/qgis_gui
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgis_networkanalysis.framework/qgis_networkanalysis
-
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/qgisgrass
+ (%type_raw[grass] = . )
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgisgrass.framework/qgisgrass
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/Frameworks/qgissqlanyconnection.framework/qgissqlanyconnection
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgispython.dylib
<<
@@ -322,7 +351,7 @@
the latest stable versions, e.g.:
postgresql90,
grass64,
- libgeos3.3.1,
+ libgeos3.3.6,
libjpeg8, libogdi3, libpng15
<<
DescPort: <<
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
