Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22110/10.7/stable/main/finkinfo/sci
Modified Files:
qgis17-py.info qgis17-py.patch
Log Message:
Fix sip issues; move to -py
Index: qgis17-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/qgis17-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qgis17-py.patch 11 Oct 2011 01:32:09 -0000 1.1
+++ qgis17-py.patch 3 Jan 2013 23:39:46 -0000 1.2
@@ -1,6 +1,39 @@
-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
+diff -ruN qgis-1.7.4-orig/python/core/qgsmaplayer.sip
qgis-1.7.4/python/core/qgsmaplayer.sip
+--- qgis-1.7.4-orig/python/core/qgsmaplayer.sip 2013-01-03
17:43:38.000000000 +0900
++++ qgis-1.7.4/python/core/qgsmaplayer.sip 2013-01-03 17:47:27.000000000
+0900
+@@ -158,7 +158,7 @@
+
+ @returns true if successful
+ */
+- bool writeXML(QDomNode & layer_node, QDomDocument & document) const;
++ bool writeXML(QDomNode & layer_node, QDomDocument & document);
+
+ /** Set a custom property for layer. Properties are stored in a map and
saved in project file.
+ * @note Added in v1.4 */
+diff -ruN qgis-1.7.4-orig/python/core/symbology-ng-core.sip
qgis-1.7.4/python/core/symbology-ng-core.sip
+--- qgis-1.7.4-orig/python/core/symbology-ng-core.sip 2013-01-03
17:43:38.000000000 +0900
++++ qgis-1.7.4/python/core/symbology-ng-core.sip 2013-01-03
17:54:53.000000000 +0900
+@@ -622,7 +622,7 @@
+ void setSelected( bool selected );
+
+ //! @note added in 1.5
+- int renderHints();
++ int renderHints() const;
+ //! @note added in 1.5
+ void setRenderHints( int hints );
+
+@@ -726,7 +726,7 @@
+ void setAlpha( qreal alpha );
+
+ //! @note added in 1.5
+- int renderHints() const;
++ int renderHints();
+ //! @note added in 1.5
+ void setRenderHints( int hints );
+
+diff -ruN qgis-1.7.4-orig/src/core/spatialindex/include/Tools.h
qgis-1.7.4/src/core/spatialindex/include/Tools.h
+--- qgis-1.7.4-orig/src/core/spatialindex/include/Tools.h 2013-01-03
17:43:39.000000000 +0900
++++ qgis-1.7.4/src/core/spatialindex/include/Tools.h 2013-01-03
17:45:27.000000000 +0900
@@ -407,19 +407,12 @@
private:
std::map<std::string, Variant> m_propertySet;
@@ -41,9 +74,9 @@
}; // 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
+diff -ruN qgis-1.7.4-orig/src/core/spatialite/spatialite.c
qgis-1.7.4/src/core/spatialite/spatialite.c
+--- qgis-1.7.4-orig/src/core/spatialite/spatialite.c 2013-01-03
17:43:39.000000000 +0900
++++ qgis-1.7.4/src/core/spatialite/spatialite.c 2013-01-03
17:45:27.000000000 +0900
@@ -57582,6 +57582,7 @@
#endif
Index: qgis17-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/qgis17-py.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qgis17-py.info 30 Apr 2012 08:35:52 -0000 1.5
+++ qgis17-py.info 3 Jan 2013 23:39:46 -0000 1.6
@@ -3,11 +3,10 @@
Package: qgis17-py%type_pkg[python]
Type: python (2.7 2.6)
Architecture: powerpc, i386, x86_64
-Distribution: 10.5, 10.6, 10.7
Version: 1.7.4
-Revision: 1
+Revision: 2
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
@@ -36,17 +35,17 @@
<<
# Dependencies.
-Depends: %n-shlibs (=%v-%r), qgis-plugin-installer
+Depends: %n-shlibs (=%v-%r), qgis-plugin-installer-py%type_pkg[python]
BuildDepends: <<
fink (>= 0.28), cmake, bison (>= 2.3),
gsl,
qt4-base-mac,
- sip-py%type_pkg[python]-bin, 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,
+ libgeos3.3.3,
gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev,
postgresql90-dev,
proj (>=4),
@@ -60,7 +59,7 @@
# Patch Phase.
PatchFile: qgis17-py.patch
-PatchFile-MD5: 97141900c19d275e420fcccb88f9a3c0
+PatchFile-MD5: 3485c4a3084794c1a1a552b3744c407a
# Compile Phase.
GCC: 4.0
@@ -100,6 +99,7 @@
-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 \
@@ -108,8 +108,7 @@
-DQ_WS_X11:INTERNAL=${Q_WS_X11} \
-DQ_WS_QWS:INTERNAL=${Q_WS_QWS} \
..
-
- make VERBOSE=0
+ make VERBOSE=1
make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin
popd
@@ -132,7 +131,7 @@
popd
# Plugins are now managed by their own package (e.g. qgis-plugin-ftools)
- rm -rf %b/$QGIS_DIR/Resources/python/plugins
+ rm -rf %b/$QGIS_DIR/Resources/python%type_pkg[python]/plugins
# Workaround to SJIS problem
mkdir -p %b/$QGIS_DIR/PlugIns
@@ -153,10 +152,10 @@
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.3-shlibs,
gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
libspatialite1-shlibs | libspatialite1-64bit-shlibs,
proj-shlibs (>=4),
@@ -201,6 +200,8 @@
grass64,
libgeos3.3.1,
libjpeg8, libogdi3, libpng14
+
+ sip errors can usually be found in .sip files in python/core.
<<
DescPort: <<
See http://wiki.qgis.org/qgiswiki/BuildingFromSource
------------------------------------------------------------------------------
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
