[95167] trunk/dports/gis/qgis
vince at macports.org
vince at macports.org
Fri Jul 6 04:00:27 PDT 2012
Revision: 95167
https://trac.macports.org/changeset/95167
Author: vince at macports.org
Date: 2012-07-06 04:00:24 -0700 (Fri, 06 Jul 2012)
Log Message:
-----------
Bump to 1.8.0, delete obsolete patches and add one to workaround a clang bug.
Modified Paths:
--------------
trunk/dports/gis/qgis/Portfile
Added Paths:
-----------
trunk/dports/gis/qgis/files/patch_link_txt
Removed 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-spatialite_c.diff
trunk/dports/gis/qgis/files/patch-src_core_spatialindex_include_tools_h.diff
Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile 2012-07-06 10:02:04 UTC (rev 95166)
+++ trunk/dports/gis/qgis/Portfile 2012-07-06 11:00:24 UTC (rev 95167)
@@ -6,7 +6,7 @@
PortGroup qt4 1.0
name qgis
-version 1.7.4
+version 1.8.0
categories gis
maintainers vince
description QGIS is a user-friendly GIS based on Qt 4
@@ -25,16 +25,14 @@
master_sites http://qgis.org/downloads/
use_bzip2 yes
-checksums md5 ad6e2bd8c5eb0c486939c420af5d8c44 \
- sha1 0dae5cb933d1ce621e5fe30c1937887d813a2098 \
- rmd160 dae51556b09a57ce9537ca4ed75830f15e3be5a4
+checksums md5 1d60520f81d7763c026d0af887ac9a05 \
+ sha1 99c0d716acbe0dd70ad0774242d01e9251c5a130 \
+ rmd160 93138574da56fee232ba006d8d8943e16a2a9959
worksrcdir ${name}-${version}
-patchfiles patch-spatialite_c.diff \
- patch-conversions_sip.diff \
- patch-CMakeLists_txt.diff \
- patch-src_core_spatialindex_include_tools_h.diff
+patchfiles patch-conversions_sip.diff \
+ patch-CMakeLists_txt.diff
depends_lib-append port:libiconv \
port:expat \
@@ -45,7 +43,8 @@
port:sqlite3 \
port:gsl \
port:qwt52 \
- port:fcgi
+ port:fcgi \
+ port:spatialindex
post-extract {
system "cd ${worksrcpath} && mkdir build && mkdir Python.framework"
@@ -175,6 +174,8 @@
configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
configure.args-append "-DWITH_SPATIALITE:BOOL=NO"
+configure.args-append "-DSPATIALINDEX_INCLUDE=${prefix}/include"
+configure.args-append "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
configure.args-append "-DPYTHON_INCLUDE_PATH=${Py_own_FRM}/Headers"
configure.args-append "-DSIP_INCLUDE_DIR=${Py_own_FRM}/Headers"
configure.args-append "-DCMAKE_BUILD_TYPE=Release"
@@ -182,7 +183,6 @@
# This is a fake but don't ask me why it is needed
configure.args-append "-DSVN_MARKER=/usr/bin/svnversion"
-
# Patch for proper linking of our own Python framework
post-configure {
reinplace -E "s|(^\[^ \]*)|\\1 -F${worksrcpath}|" \
@@ -201,19 +201,17 @@
set Py_sys_FRM "${frameworks_dir}/Python.framework/Versions/${Pyverpath}"
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 . ;"
+
+ # Workaround a bug in some clang version
+ system \
+ "cd ${worksrcpath}/build/src/crssync/CMakeFiles/crssync.dir ; \
+ cat link.txt ${filespath}/patch_link_txt > link.txt.tmp ; \
+ mv link.txt.tmp link.txt ;"
}
use_parallel_build yes
Deleted: trunk/dports/gis/qgis/files/ed-build.make
===================================================================
--- trunk/dports/gis/qgis/files/ed-build.make 2012-07-06 10:02:04 UTC (rev 95166)
+++ trunk/dports/gis/qgis/files/ed-build.make 2012-07-06 11:00:24 UTC (rev 95167)
@@ -1,8 +0,0 @@
-/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
Deleted: trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart1_cpp.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart1_cpp.diff 2012-07-06 10:02:04 UTC (rev 95166)
+++ trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart1_cpp.diff 2012-07-06 11:00:24 UTC (rev 95167)
@@ -1,11 +0,0 @@
---- 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))
- {
Deleted: trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart3_cpp.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart3_cpp.diff 2012-07-06 10:02:04 UTC (rev 95166)
+++ trunk/dports/gis/qgis/files/patch-build_python_core_sipcorepart3_cpp.diff 2012-07-06 11:00:24 UTC (rev 95167)
@@ -1,11 +0,0 @@
---- 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-spatialite_c.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-spatialite_c.diff 2012-07-06 10:02:04 UTC (rev 95166)
+++ trunk/dports/gis/qgis/files/patch-spatialite_c.diff 2012-07-06 11:00:24 UTC (rev 95167)
@@ -1,37 +0,0 @@
---- src/core/spatialite/spatialite.c.orig 2009-09-24 07:35:35.000000000 +0200
-+++ src/core/spatialite/spatialite.c 2009-09-24 07:36:23.000000000 +0200
-@@ -72,13 +72,13 @@
- #include <localcharset.h>
- #endif /* end localcharset */
- #else /* not WINDOWS */
--#ifdef __APPLE__
--#include <iconv.h>
--#include <localcharset.h>
--#else /* not Mac OsX */
-+//#ifdef __APPLE__
-+//#include <iconv.h>
-+//#include <localcharset.h>
-+//#else /* not Mac OsX */
- #include <iconv.h>
- #include <langinfo.h>
--#endif
-+//#endif
- #endif
-
- #if OMIT_GEOS == 0 /* including GEOS */
-@@ -7526,11 +7526,11 @@
- #if defined(__MINGW32__) || defined(_WIN32)
- return locale_charset ();
- #else /* not MINGW32 - WIN32 */
--#ifdef __APPLE__
-- return locale_charset ();
--#else /* not Mac OsX */
-+//#ifdef __APPLE__
-+// return locale_charset ();
-+//#else /* not Mac OsX */
- return nl_langinfo (CODESET);
--#endif
-+//#endif
- #endif
- }
-
Deleted: 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 2012-07-06 10:02:04 UTC (rev 95166)
+++ trunk/dports/gis/qgis/files/patch-src_core_spatialindex_include_tools_h.diff 2012-07-06 11:00:24 UTC (rev 95167)
@@ -1,20 +0,0 @@
---- 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
- );
Added: trunk/dports/gis/qgis/files/patch_link_txt
===================================================================
--- trunk/dports/gis/qgis/files/patch_link_txt (rev 0)
+++ trunk/dports/gis/qgis/files/patch_link_txt 2012-07-06 11:00:24 UTC (rev 95167)
@@ -0,0 +1 @@
+install_name_tool -change @executable_path/../Frameworks/qgis_core.framework/Versions/1.8/qgis_core @executable_path/../lib/qgis_core.framework/Versions/1.8/qgis_core ../../output/bin/crssync
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120706/b8c1f2fc/attachment.html>
More information about the macports-changes
mailing list