Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv28380
Added Files:
qgis17-py.info qgis17-py.patch
Log Message:
New upstream; tested on 10.7
--- NEW FILE: qgis17-py.patch ---
diff -ruN qgis-1.7.1-orig/src/core/spatialindex/include/Tools.h
qgis-1.7.1/src/core/spatialindex/include/Tools.h
--- qgis-1.7.1-orig/src/core/spatialindex/include/Tools.h 2011-10-11
08:30:37.000000000 +0900
+++ qgis-1.7.1/src/core/spatialindex/include/Tools.h 2011-10-11
08:33:49.000000000 +0900
@@ -407,19 +407,12 @@
private:
std::map<std::string, Variant> m_propertySet;
-#ifdef _MSC_VER
// MSVC's friend function syntax differs slightly from everyone elses:
// don't seem to need to qualify function name.
friend std::ostream& operator<<(
std::ostream& os,
const Tools::PropertySet& p
);
-#else
- friend std::ostream& Tools::operator<<(
- std::ostream& os,
- const Tools::PropertySet& p
- );
-#endif//_MSC_VER
}; // PropertySet
std::ostream& operator<<( std::ostream& os, const Tools::PropertySet& p );
@@ -620,19 +613,12 @@
unsigned long long* m_a;
unsigned long m_k;
-#ifdef _MSC_VER
// MSVC's friend function syntax differs slightly from everyone elses
// don't seem to need to qualify function name.
friend std::ostream& operator<<(
std::ostream& os,
const Tools::UniversalHash& h
);
-#else
- friend std::ostream& Tools::operator<<(
- std::ostream& os,
- const Tools::UniversalHash& h
- );
-#endif//_MSC_VER
}; // UniversalHash
std::ostream& operator<<( std::ostream& os, const Tools::UniversalHash& h );
diff -ruN qgis-1.7.1-orig/src/core/spatialite/spatialite.c
qgis-1.7.1/src/core/spatialite/spatialite.c
--- qgis-1.7.1-orig/src/core/spatialite/spatialite.c 2011-10-11
08:30:37.000000000 +0900
+++ qgis-1.7.1/src/core/spatialite/spatialite.c 2011-10-11 08:57:58.000000000
+0900
@@ -57582,6 +57582,7 @@
#endif
/* #include <inttypes.h> */
+#include <stdint.h>
typedef int8_t flex_int8_t;
typedef uint8_t flex_uint8_t;
typedef int16_t flex_int16_t;
--- NEW FILE: qgis17-py.info ---
Info2: <<
Package: qgis17-py%type_pkg[python]
Type: python (2.7 2.6)
Architecture: powerpc, i386, x86_64
Distribution: 10.4, 10.5, 10.6, 10.7
Version: 1.7.1
Revision: 1
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
DescDetail: <<
Quantum GIS (QGIS) is a Geographic Information System (GIS)
that runs on Linux, Unix, Mac OSX, and Windows. QGIS supports
vector, raster, and database formats. QGIS is licensed
under the GNU Public License.
Some of the major features include:
1 Support for spatially enabled PostGIS tables
2 Support for shapefiles, ArcInfo coverages, Mapinfo,
and other formats supported by OGR
3 Raster support for a large number of formats
4 Identify features
5 Display attribute tables
6 Select features
7 GRASS Digitizing
8 Feature labeling
<<
DescUsage: <<
Just double click 'QGIS-py%type_pkg[python]-%v.app'
in /Applications/Fink.
<<
# Dependencies.
Depends: %n-shlibs (=%v-%r), qgis-plugin-installer
BuildDepends: <<
fink (>= 0.28), cmake, bison (>= 2.3),
gsl,
qt4-base-mac,
sip-py%type_pkg[python]-bin, pyqt4-mac-py%type_pkg[python] ,
xerces-c31-dev,
libiconv-dev, giflib, libtiff, libjpeg8, libogdi3 (>= 3.1.5-1), libpng15,
netcdf (>= 3.6.0-1002),
libgeos3.3.0,
gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev,
postgresql90-dev,
proj (>=4),
qwt-qt4-mac
<<
# cfitsio,
# unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010),
# Unpack Phase.
Source: http://qgis.org/downloads/qgis-%v.tar.bz2
Source-MD5: 677dcb9d0d53cc7c2a6451590a362477
SourceDirectory: qgis-%v
# Patch Phase.
PatchFile: qgis17-py.patch
PatchFile-MD5: 97141900c19d275e420fcccb88f9a3c0
# Compile Phase.
GCC: 4.0
SetCFLAGS: -fno-common
SetLDFLAGS: -liconv
CompileScript: <<
#!/bin/bash -ev
# Find Fink's PyQt4
PY_VER=%type_raw[python]
perl -pi -e 's|sys.path = \[\\\"\"|sys.path =
\[\\\"%p/lib/qt4-mac/lib/python'${PY_VER}'/site-packages\\", \\"\"|'
src/python/qgspythonutilsimpl.cpp
perl -pi -e 's|\.app|-py%type_pkg[python]-%v.app|' CMakeLists.txt
export QTDIR=%p/lib/qt4-mac
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_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.0/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
-DPYTHON_DEBUG_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib
-DPYTHON_INCLUDE_PATH=%p/include/python$PY_VER
-DPYTHON_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib
-DPYTHON_EXECUTABLE=%p/bin/python$PY_VER
-DPYUIC4_PROGRAM=%p/lib/qt4-mac/lib/python$PY_VER/bin/pyuic4
-DSIP_INCLUDE_DIR=%p/include/python$PY_VER
-DSIP_BINARY_PATH=%p/bin
-DPOSTGRESQL_PREFIX=%p
-DPOSTGRES_CONFIG=%p/bin/pg_config
-DSQLITE3_INCLUDE_DIR=
-DSQLITE3_LIBRARY=
-DQWT_LIBRARY=%p/lib/qt4-mac/lib/libqwt.5.dylib
-DQWT_INCLUDE_DIR=%p/lib/qt4-mac/include/qwt/"
QGIS_DIR=Applications/QGIS-py%type_pkg[python]-%v.app/Contents
mkdir build
pushd build
cmake $QGIS_OPTIONS \
-DGRASS_PREFIX=%p/Applications/GRASS-6.4.app/Contents/MacOS \
-DQ_WS_WIN:INTERNAL=${Q_WS_WIN} \
-DQ_WS_X11:INTERNAL=${Q_WS_X11} \
-DQ_WS_QWS:INTERNAL=${Q_WS_QWS} \
..
make VERBOSE=0
make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin
popd
# Fix install names
pushd %b/$QGIS_DIR/MacOS/lib
install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_core.%v.dylib"
libqgis_core.%v.dylib
install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_analysis.%v.dylib"
libqgis_analysis.%v.dylib
install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_gui.%v.dylib"
libqgis_gui.%v.dylib
install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgispython.%v.dylib"
libqgispython.%v.dylib
install_name_tool -id
"%p/$QGIS_DIR/MacOS/lib/libqgissqlanyconnection.%v.dylib"
libqgissqlanyconnection.%v.dylib
install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgisgrass.%v.dylib"
libqgisgrass.%v.dylib
popd
# Tell qgis to read Fink's environmental variables
pushd %b/$QGIS_DIR/MacOS
mv QGIS QGIS.exe
echo '#!/bin/sh' >QGIS
echo ". %p/bin/init.sh && %p/$QGIS_DIR/MacOS/QGIS.exe" >>QGIS
chmod 555 QGIS
popd
# Plugins are now managed by their own package (e.g. qgis-plugin-ftools)
rm -rf %b/$QGIS_DIR/Resources/python/plugins
# Workaround to SJIS problem
mkdir -p %b/$QGIS_DIR/PlugIns
ln -s %p/lib/qt4-mac/plugins/codecs %b/$QGIS_DIR/PlugIns/codecs
# Recompile python scripts to fix path (added to 1.6.0)
%p/bin/python$PY_VER %p/lib/python$PY_VER/compileall.py -f -d
%p/$QGIS_DIR/Resources/python/qgis %b/$QGIS_DIR/Resources/python/qgis
%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
<<
AppBundles: Applications/QGIS-py%type_pkg[python]-%v.app
SplitOff: <<
Package: %N-shlibs
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] ,
gsl-shlibs,
xerces-c31-shlibs,
libgeos3.3.0-shlibs,
gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
libspatialite1-shlibs | libspatialite1-64bit-shlibs,
proj-shlibs (>=4),
qwt-qt4-mac-shlibs
<<
# gdal-py%type_pkg[python],
Files: <<
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgis_core.%v.dylib
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgis_gui.%v.dylib
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgissqlanyconnection.%v.dylib
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgisgrass.%v.dylib
Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgispython.%v.dylib
<<
Shlibs: <<
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib
1.7.1 %n (>= 1.7.1-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgis_core.%v.dylib
1.7.1 %n (>= 1.7.1-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgis_gui.%v.dylib
1.7.1 %n (>= 1.7.1-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgissqlanyconnection.%v.dylib
1.7.1 %n (>= 1.7.1-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgisgrass.%v.dylib
1.7.1 %n (>= 1.7.1-1)
%p/Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/lib/libqgispython.%v.dylib
1.7.1 %n (>= 1.7.1-1)
<<
#End of SplitOff
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (=%v-%r)
BuildDependsOnly: true
Description: QGIS Headers
Files: Applications/QGIS-py%type_pkg[python]-%v.app/Contents/MacOS/include
<<
DescPackaging: <<
Since 1.7.0,
1. qgis has Python variants,
e.g. qgis17-py31 and qgis17-py27.
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.0,
libjpeg8, libogdi3, libpng14
<<
DescPort: <<
See http://wiki.qgis.org/qgiswiki/BuildingFromSource
See the flags in SetXXXX and CompileScript as well as the patch for details.
<<
# End of Info2
<<
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
