Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv3716
Added Files:
qgis15-py.info qgis15-py.patch
Log Message:
Lion ready
--- NEW FILE: qgis15-py.info ---
Info2: <<
Package: qgis15-py%type_pkg[python]
Type: python (2.7 2.6)
Architecture: powerpc, i386, x86_64
Distribution: 10.5, 10.6, 10.7
Version: 1.5.0
Revision: 9
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
Maintainer: BABA Yoshihiko <[email protected]>
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 (optional)
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 (optional)
8 Feature labeling
To use optional features, choose packages like qgis-pgsql and qgis-grass.
<<
DescUsage: <<
Just double click 'qgis%v-py%type_pkg[python].app'
in %p/Applications.
<<
# Dependencies.
Depends: <<
%n-shlibs (=%v-%r)
<<
BuildDepends: <<
fink (>= 0.28),
cmake, bison (>= 2.3),
gsl,
qt4-base-mac,
pyqt4-mac-py%type_pkg[python] (>=4.8.5-0.1), sip-py%type_pkg[python]-bin
(>=4.12.3-1),
libiconv-dev, giflib, libtiff, libjpeg8, libogdi3 (>= 3.1.5-1002), libpng14,
netcdf (>= 3.6.0-1002),
libgeos3.3.0,
gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev,
postgresql90-dev,
grass64-mac-dev | grass64-x11-dev ,
proj (>=4)
<<
# Unpack Phase.
Source: http://download.osgeo.org/qgis/src/qgis_%v.tar.gz
Source-MD5: a198fbcd8d96f5ed5e85a814cbc8f033
SourceDirectory: qgis-%v
# Patch Phase.
PatchFile: qgis15-py.patch
PatchFile-MD5: a536d8be0cb652d9c7c0bb5e7518e952
# PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
# 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
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%v-py%type_pkg[python]
-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="
QGIS_DIR=Applications/qgis%v-py%type_pkg[python].app/Contents
mkdir build
pushd build
cmake $QGIS_OPTIONS
-DGRASS_PREFIX=%p/Applications/GRASS-6.4.app/Contents/MacOS ..
# Workaround for Makefile bug (1.5.0 only)
touch ../src/mac/Contents/SVN_MARKER-NOTFOUND
make VERSBOSE=1
make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin
popd
mv Applications/qgis%v.app Applications/qgis%v-py%type_pkg[python].app
# 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/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 $QGIS_DIR/Resources/python/plugins
rm -rf $QGIS_DIR/MacOS/share/qgis/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.5.0)
%p/bin/python$PY_VER %p/lib/python$PY_VER/compileall.py -f -d
%p/$QGIS_DIR/Resources/python/qgis %b/$QGIS_DIR/MacOS/share/qgis/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/MacOS/share/qgis/python/qgis
# End of CompileScript
<<
# Install Phase.
InstallScript: <<
mkdir -p
%b/Applications/qgis%v-py%type_pkg[python].app/Contents/Resources/python
ln -s %p/share/qgis/python/plugins
%b/Applications/qgis%v-py%type_pkg[python].app/Contents/Resources/python/plugins
mkdir -p
%b/Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/share/qgis/python
ln -s %p/share/qgis/python/plugins
%b/Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/share/qgis/python/plugins
<<
AppBundles: Applications/qgis%v-py%type_pkg[python].app
SplitOff: <<
Package: %N-shlibs
Description: QGIS Shared Libraries
Depends: <<
qt4-base-mac-qtcore-shlibs,
python%type_pkg[python], pyqt4-mac-py%type_pkg[python] (>=4.8.5-0.1),
sip-py%type_pkg[python] (>=4.12.3-1),
gsl-shlibs,
libgeos3.3.0-shlibs,
gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
libspatialite1-shlibs | libspatialite1-64bit-shlibs,
postgresql90-shlibs,
grass64-mac-shlibs | grass64-x11-shlibs,
proj-shlibs (>=4)
<<
Files: <<
Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/lib/libqgis*.%v.dylib
Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/lib/qgis/plugins/*.so
<<
Shlibs: <<
%p/Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/lib/libqgispython.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
%p/Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/lib/libqgis_analysis.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
%p/Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/lib/libqgis_core.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
%p/Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/lib/libqgis_gui.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
%p/Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/lib/libqgisgrass.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
<<
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (=%v-%r)
BuildDependsOnly: true
Description: QGIS Headers
Files: Applications/qgis%v-py%type_pkg[python].app/Contents/MacOS/include
<<
DescPort: <<
This is the stable version of QGIS 1.5 with backport regarding the newer
versions of PyQt4.
All the patches mentioned in the following site are applied.
http://trac.osgeo.org/qgis/ticket/2985
Works with gcc that comes with Lion. Thanks to pogma and fangism.
# End of DescPort
<<
# End of Info2
<<
--- NEW FILE: qgis15-py.patch ---
diff -ruN qgis-1.5.0-orig/cmake/FindSIP.cmake qgis-1.5.0/cmake/FindSIP.cmake
--- qgis-1.5.0-orig/cmake/FindSIP.cmake 2010-01-16 20:08:04.000000000 +0900
+++ qgis-1.5.0/cmake/FindSIP.cmake 2011-09-23 08:59:19.000000000 +0900
@@ -36,6 +36,7 @@
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE
sip_config)
IF(sip_config)
STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION
${sip_config})
+ STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1"
SIP_VERSION_NUM ${sip_config})
STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1"
SIP_VERSION_STR ${sip_config})
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH
${sip_config})
STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1"
SIP_DEFAULT_SIP_DIR ${sip_config})
diff -ruN qgis-1.5.0-orig/cmake/FindSIP.py qgis-1.5.0/cmake/FindSIP.py
--- qgis-1.5.0-orig/cmake/FindSIP.py 2010-01-16 20:04:41.000000000 +0900
+++ qgis-1.5.0/cmake/FindSIP.py 2011-09-23 08:59:38.000000000 +0900
@@ -9,6 +9,7 @@
sipcfg = sipconfig.Configuration()
print("sip_version:%06.0x" % sipcfg.sip_version)
+print("sip_version_num:%d" % sipcfg.sip_version)
print("sip_version_str:%s" % sipcfg.sip_version_str)
print("sip_bin:%s" % sipcfg.sip_bin)
print("default_sip_dir:%s" % sipcfg.default_sip_dir)
diff -ruN qgis-1.5.0-orig/python/CMakeLists.txt qgis-1.5.0/python/CMakeLists.txt
--- qgis-1.5.0-orig/python/CMakeLists.txt 2010-05-15 17:21:42.000000000
+0900
+++ qgis-1.5.0/python/CMakeLists.txt 2011-09-23 09:08:19.000000000 +0900
@@ -39,6 +39,10 @@
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(PYQT4_VERSION_NUM LESS 263680)
+IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705
+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
+ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
+
# core module
FILE(GLOB sip_files_core core/*.sip)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
diff -ruN qgis-1.5.0-orig/python/core/conversions.sip
qgis-1.5.0/python/core/conversions.sip
--- qgis-1.5.0-orig/python/core/conversions.sip 2010-04-20 21:25:42.000000000
+0900
+++ qgis-1.5.0/python/core/conversions.sip 2011-09-23 09:30:23.000000000
+0900
@@ -14,6 +14,8 @@
- QMap<int, QgsOverlayObject*>*
*/
+%Feature QSETINT_CONVERSION
+
%ModuleHeaderCode
// From Python 2.5, some functions use Py_ssize_t instead of int
// thus this typedef is for maintaining backward compatibility
@@ -265,135 +267,6 @@
-%MappedType QSet<int>
-{
-%TypeHeaderCode
-#include <QSet>
-#if (SIP_VERSION >= 0x040900)
-#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject
(sipType_QString))
-#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject
(sipType_QVariant))
-#endif
-%End
-
-%ConvertFromTypeCode
- // Create the list.
- PyObject *l;
-
- if ((l = PyList_New(sipCpp->size())) == NULL)
- return NULL;
-
- // Set the list elements.
- QSet<int>::iterator it = sipCpp->begin();
- for (int i = 0; it != sipCpp->end(); ++it, ++i)
- {
- PyObject *tobj;
-
- if ((tobj = PyInt_FromLong(*it)) == NULL)
- {
- Py_DECREF(l);
- return NULL;
- }
- PyList_SET_ITEM(l, i, tobj);
- }
-
- return l;
-%End
-
-%ConvertToTypeCode
- // Check the type if that is all that is required.
- if (sipIsErr == NULL)
- return PyList_Check(sipPy);
-
- QSet<int> *qset = new QSet<int>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- {
- qset->insert(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
- }
-
- *sipCppPtr = qset;
- return sipGetState(sipTransferObj);
-%End
-
-};
-
-
-template <TYPE>
-%MappedType QSet<TYPE>
-{
-%TypeHeaderCode
-#include <QSet>
-#if (SIP_VERSION >= 0x040900)
-#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject
(sipType_QString))
-#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject
(sipType_QVariant))
-#endif
-%End
-
-%ConvertFromTypeCode
- // Create the list.
- PyObject *l;
-
- if ((l = PyList_New(sipCpp->size())) == NULL)
- return NULL;
-
- // Set the list elements.
- int i=0;
- for (QSet<TYPE>::iterator it = sipCpp->begin(); it != sipCpp->end(); ++it,
++i)
- {
- TYPE *t = new TYPE(*it);
- PyObject *tobj;
-
- if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj))
== NULL)
- {
- Py_DECREF(l);
- delete t;
- return NULL;
- }
- PyList_SET_ITEM(l, i, tobj);
- }
-
- return l;
-%End
-
-%ConvertToTypeCode
- // Check the type if that is all that is required.
- if (sipIsErr == NULL)
- {
- if (!PyList_Check(sipPy))
- return 0;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE,
SIP_NOT_NONE))
- return 0;
-
- return 1;
- }
-
- QSet<TYPE> *qset = new QSet<TYPE>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- {
- int state;
- TYPE* t = reinterpret_cast<TYPE
*>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE,
sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-
- if (*sipIsErr)
- {
- sipReleaseInstance(t, sipClass_TYPE, state);
- delete qset;
- return 0;
- }
- qset->insert(*t);
- sipReleaseInstance(t, sipClass_TYPE, state);
- }
-
- *sipCppPtr = qset;
- return sipGetState(sipTransferObj);
-%End
-
-};
-
-
-
template<TYPE>
%MappedType QMap<int, QMap<int, TYPE> >
{
diff -ruN qgis-1.5.0-orig/src/core/spatialindex/include/Tools.h
qgis-1.5.0/src/core/spatialindex/include/Tools.h
--- qgis-1.5.0-orig/src/core/spatialindex/include/Tools.h 2009-11-29
02:07:29.000000000 +0900
+++ qgis-1.5.0/src/core/spatialindex/include/Tools.h 2011-09-22
16:05:13.000000000 +0900
@@ -408,19 +408,19 @@
private:
std::map<std::string, Variant> m_propertySet;
-#ifdef _MSC_VER
+// #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
+// #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 );
@@ -621,19 +621,19 @@
unsigned long long* m_a;
unsigned long m_k;
-#ifdef _MSC_VER
+// #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
+// #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 );
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
