[91389] trunk/dports/gis/qgis
vince at macports.org
vince at macports.org
Sat Mar 31 08:41:43 PDT 2012
Revision: 91389
https://trac.macports.org/changeset/91389
Author: vince at macports.org
Date: 2012-03-31 08:41:39 -0700 (Sat, 31 Mar 2012)
Log Message:
-----------
Bump to 1.7.4 and hopefully solves a lot of issues
Modified Paths:
--------------
trunk/dports/gis/qgis/Portfile
Added Paths:
-----------
trunk/dports/gis/qgis/files/ed-build.make
trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart1_cpp.diff
trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart3_cpp.diff
trunk/dports/gis/qgis/files/patch-src_core_spatialindex_include_tools_h.diff
Removed Paths:
-------------
trunk/dports/gis/qgis/files/patch-python_configure_py_in.diff
Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile 2012-03-31 13:35:42 UTC (rev 91388)
+++ trunk/dports/gis/qgis/Portfile 2012-03-31 15:41:39 UTC (rev 91389)
@@ -6,7 +6,7 @@
PortGroup qt4 1.0
name qgis
-version 1.7.0
+version 1.7.4
categories gis
maintainers vince
description QGIS is a user-friendly GIS based on Qt 4
@@ -25,15 +25,16 @@
master_sites http://qgis.org/downloads/
use_bzip2 yes
-checksums md5 d8506990f52563d39c7b916f500f282f \
- sha1 e60f40e72c92f187d3725e6b93c13691d63a7fa7 \
- rmd160 49303eab754f1e7febce388e657253563f65abed
+checksums md5 ad6e2bd8c5eb0c486939c420af5d8c44 \
+ sha1 0dae5cb933d1ce621e5fe30c1937887d813a2098 \
+ rmd160 dae51556b09a57ce9537ca4ed75830f15e3be5a4
worksrcdir ${name}-${version}
patchfiles patch-spatialite_c.diff \
patch-conversions_sip.diff \
- patch-CMakeLists_txt.diff
+ patch-CMakeLists_txt.diff \
+ patch-src_core_spatialindex_include_tools_h.diff
depends_lib-append port:libiconv \
port:expat \
@@ -50,11 +51,6 @@
system "cd ${worksrcpath} && mkdir build && mkdir Python.framework"
}
-# Does not compile wirh clang
-if {${configure.compiler} == "clang" || ${configure.compiler} == "macports-clang"} {
- configure.compiler llvm-gcc-4.2
-}
-
set Py_own_FRM ${worksrcpath}/Python.framework
# Python related stuff
@@ -102,7 +98,6 @@
}
-
variant postgis description "Build postgis support" {
depends_lib-append port:postgis
@@ -121,17 +116,8 @@
configure.args-append "-DGRASS_PREFIX=${prefix}/share/grass-6.4.0"
}
-# LLVM cannot be used (Seg. faults in spatialite.c)
-
-#if {[string first llvm ${configure.cc}] != -1 || \
-# [string first llvm ${configure.cxx}] != -1} {
-
-# ui_msg "Warning: Qgis cannot be compiled with LLVM, switching to GCC\n"
-# set configure.cc gcc
-# set configure.cxx g++
-#}
-
# Overrides default
+
default_variants +python27 +postgis
configure.dir ${worksrcpath}/build
configure.cmd cmake ..
@@ -163,12 +149,11 @@
post-configure {
reinplace -E "s|(^\[^ \]*)|\\1 -F${worksrcpath}|" \
${worksrcpath}/build/src/python/CMakeFiles/qgispython.dir/link.txt
-}
-# Setup Python stuff in order to gracefully link
-# against -framework Python
-pre-build {
+ # Setup Python stuff in order to gracefully link
+ # against -framework Python
+
set variantlist [split ${portvariants} "+"]
set Pyversion [string replace [lindex ${variantlist} \
[lsearch $variantlist "python*"]] 0 5]
@@ -177,11 +162,20 @@
# Set up a fake framework in ${worksrcpath}/Python.framework
set Py_sys_FRM "${frameworks_dir}/Python.framework/Versions/${Pyverpath}"
- system "cd ${Py_own_FRM} ; \
- rm -f Headers Python Resources ; \
- ln -s ${Py_sys_FRM}/include/python${Pyverpath} Headers ; \
- ln -s ${Py_sys_FRM}/Python . ; \
- ln -s ${Py_sys_FRM}/Resources . ;"
+ system \
+ "cd ${worksrcpath}/build/python/CMakeFiles ; \
+ cd python_module_qgis_core.dir ; \
+ cp ${filespath}/ed-build.make . ; \
+ sed -i '' \"s|WRK|${worksrcpath}|\" ed-build.make ; \
+ sed -i '' \"s|FLS|${filespath}|\" ed-build.make; \
+ ed build.make < ed-build.make"
+
+ system \
+ "cd ${Py_own_FRM} ; \
+ rm -f Headers Python Resources ; \
+ ln -s ${Py_sys_FRM}/include/python${Pyverpath} Headers ; \
+ ln -s ${Py_sys_FRM}/Python . ; \
+ ln -s ${Py_sys_FRM}/Resources . ;"
}
use_parallel_build yes
Added: trunk/dports/gis/qgis/files/ed-build.make
===================================================================
--- trunk/dports/gis/qgis/files/ed-build.make (rev 0)
+++ trunk/dports/gis/qgis/files/ed-build.make 2012-03-31 15:41:39 UTC (rev 91389)
@@ -0,0 +1,8 @@
+/sip-
+/sipcorepart3
+a
+ cd WRK/build/python/core && \
+ patch < FLS/patch-build_python_core_sipcorepart1_cpp.diff && \
+ patch < FLS/patch-build_python_core_sipcorepart3_cpp.diff
+.
+wq
Added: trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart1_cpp.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart1_cpp.diff (rev 0)
+++ trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart1_cpp.diff 2012-03-31 15:41:39 UTC (rev 91389)
@@ -0,0 +1,11 @@
+--- sipcorepart1.cpp.orig 2012-03-30 18:51:33.000000000 +0200
++++ sipcorepart1.cpp 2012-03-30 18:52:20.000000000 +0200
+@@ -6661,7 +6661,7 @@
+ PyObject *sipParseErr = NULL;
+
+ {
+- const QgsSymbolV2 *sipCpp;
++ QgsSymbolV2 *sipCpp;
+
+ if (sipParseArgs(&sipParseErr, sipArgs, "B", &sipSelf, sipType_QgsSymbolV2, &sipCpp))
+ {
Added: trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart3_cpp.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart3_cpp.diff (rev 0)
+++ trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart3_cpp.diff 2012-03-31 15:41:39 UTC (rev 91389)
@@ -0,0 +1,11 @@
+--- sipcorepart3.cpp.orig 2012-03-30 18:56:28.000000000 +0200
++++ sipcorepart3.cpp 2012-03-30 18:56:42.000000000 +0200
+@@ -2901,7 +2901,7 @@
+ {
+ QDomNode * a0;
+ QDomDocument * a1;
+- const QgsMapLayer *sipCpp;
++ QgsMapLayer *sipCpp;
+
+ if (sipParseArgs(&sipParseErr, sipArgs, "BJ9J9", &sipSelf, sipType_QgsMapLayer, &sipCpp, sipType_QDomNode, &a0, sipType_QDomDocument, &a1))
+ {
Deleted: trunk/dports/gis/qgis/files/patch-python_configure_py_in.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-python_configure_py_in.diff 2012-03-31 13:35:42 UTC (rev 91388)
+++ trunk/dports/gis/qgis/files/patch-python_configure_py_in.diff 2012-03-31 15:41:39 UTC (rev 91389)
@@ -1,11 +0,0 @@
---- python/configure.py.in.orig 2010-05-14 09:46:39.000000000 +0200
-+++ python/configure.py.in 2010-05-14 09:47:13.000000000 +0200
-@@ -146,7 +146,7 @@
-
- # common settings for core, gui and analysis libs
- for mk in [ makefile_core, makefile_gui, makefile_analysis ]:
-- mk.extra_lflags.extend( "@CMAKE_MODULE_LINKER_FLAGS@".strip(' ').split(' ') )
-+# mk.extra_lflags.extend( "@CMAKE_MODULE_LINKER_FLAGS@".strip(' ').split(' ') )
- mk.extra_libs = ["qgis_core"]
- mk.extra_lib_dirs = [build_path+"/src/core"+intdir]
- mk.extra_include_dirs = [src_path+"/src/core", src_path+"/src/core/composer",
Added: trunk/dports/gis/qgis/files/patch-src_core_spatialindex_include_tools_h.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-src_core_spatialindex_include_tools_h.diff (rev 0)
+++ trunk/dports/gis/qgis/files/patch-src_core_spatialindex_include_tools_h.diff 2012-03-31 15:41:39 UTC (rev 91389)
@@ -0,0 +1,20 @@
+--- src/core/spatialindex/include/Tools.h.orig 2012-03-30 18:41:00.000000000 +0200
++++ src/core/spatialindex/include/Tools.h 2012-03-30 18:41:23.000000000 +0200
+@@ -415,7 +415,7 @@
+ const Tools::PropertySet& p
+ );
+ #else
+- friend std::ostream& Tools::operator<<(
++ friend std::ostream& operator<<(
+ std::ostream& os,
+ const Tools::PropertySet& p
+ );
+@@ -628,7 +628,7 @@
+ const Tools::UniversalHash& h
+ );
+ #else
+- friend std::ostream& Tools::operator<<(
++ friend std::ostream& operator<<(
+ std::ostream& os,
+ const Tools::UniversalHash& h
+ );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120331/0f24ff01/attachment.html>
More information about the macports-changes
mailing list