cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to QGIS 2.14.

Browse Source 
See http://changelog.qgis.org/en/qgis/version/2.14.0/ for changes.
This commit is contained in:
landry 2016-03-02 14:39:10 +00:00
parent a0d624151e
commit 74756882cd
16 changed files with 1017 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
geo/qgis/Makefile
View File

@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.47 2016/01/19 09:44:25 landry Exp $
# $OpenBSD: Makefile,v 1.48 2016/03/02 14:39:10 landry Exp $
COMMENT = desktop geographical information system
SHARED_ONLY = Yes
DISTNAME = qgis-2.12.3
DISTNAME = qgis-2.14.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 10.0 \
qgis_app 0.0 \
qgis_gui 9.0 \
qgis_analysis 5.0 \
qgis_server 2.0 \
qgispython 2.2 \
qgis_networkanalysis 0.0
SHARED_LIBS = qgis_core 11.0 \
qgis_app 1.0 \
qgis_gui 10.0 \
qgis_analysis 6.0 \
qgis_server 3.0 \
qgispython 3.0 \
qgis_networkanalysis 1.0
HOMEPAGE = http://www.qgis.org/
@ -72,6 +72,7 @@ pre-configure:
# otherwise takes precedence over systemwide file
rm -f ${WRKSRC}/cmake/FindIconv.cmake
${SUBST_CMD} ${WRKSRC}/cmake/Find{GDAL,GEOS,Postgres}.cmake
${SUBST_CMD} ${WRKSRC}/scripts/pyuic4-wrapper.{py,sh}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-2.12.3.tar.bz2) = NCsdmWLSEEU5q+RM9I1ehx6OzrxGVb+dNLFN96z3xjo=
SIZE (qgis-2.12.3.tar.bz2) = 69119328
SHA256 (qgis-2.14.0.tar.bz2) = Z4aZYSUD3xDLA22SJ5OqtOGC+x2xqutUKMI+nmxv+tU=
SIZE (qgis-2.14.0.tar.bz2) = 76423899

8
geo/qgis/patches/patch-CMakeLists_txt
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.12 2015/11/16 10:22:59 landry Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.13 2016/03/02 14:39:10 landry Exp $
chunk 1: http://hub.qgis.org/issues/3999
lots of undefined refs to syms in libc, we dont link shlibs with -lc
--- CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ CMakeLists.txt Mon Nov 16 09:27:43 2015
@@ -610,12 +610,6 @@ ELSE (WIN32)
--- CMakeLists.txt.orig Fri Feb 26 13:23:48 2016
+++ CMakeLists.txt Tue Mar 1 13:51:41 2016
@@ -612,12 +612,6 @@ ELSE (WIN32)
SET(DLLEXPORT "")
ENDIF()

6
geo/qgis/patches/patch-cmake_FindGDAL_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.7 2015/10/31 15:29:44 landry Exp $
--- cmake/FindGDAL.cmake.orig Fri Oct 23 14:10:38 2015
+++ cmake/FindGDAL.cmake Fri Oct 30 16:42:16 2015
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.8 2016/03/02 14:39:10 landry Exp $
--- cmake/FindGDAL.cmake.orig Fri Feb 26 13:23:48 2016
+++ cmake/FindGDAL.cmake Tue Mar 1 13:53:24 2016
@@ -160,7 +160,7 @@ ELSE(WIN32)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GDAL_LIBRARY)

6
geo/qgis/patches/patch-cmake_FindGEOS_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.8 2015/10/31 15:29:44 landry Exp $
--- cmake/FindGEOS.cmake.orig Fri Oct 23 14:10:38 2015
+++ cmake/FindGEOS.cmake Fri Oct 30 16:42:16 2015
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.9 2016/03/02 14:39:10 landry Exp $
--- cmake/FindGEOS.cmake.orig Fri Feb 26 13:23:48 2016
+++ cmake/FindGEOS.cmake Tue Mar 1 13:53:24 2016
@@ -148,7 +148,7 @@ ELSE(WIN32)
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GEOS_LIBRARY)

6
geo/qgis/patches/patch-cmake_FindPostgres_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.6 2015/10/31 15:29:44 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Oct 23 14:10:38 2015
+++ cmake/FindPostgres.cmake Fri Oct 30 16:42:16 2015
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.7 2016/03/02 14:39:10 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Feb 26 13:23:48 2016
+++ cmake/FindPostgres.cmake Tue Mar 1 13:53:24 2016
@@ -96,7 +96,7 @@ ELSE(WIN32)
ENDFOREACH(_LIBNAME ${_LIBS})

8
geo/qgis/patches/patch-doc_CMakeLists_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.8 2015/07/21 10:06:14 landry Exp $
--- doc/CMakeLists.txt.orig Fri Jun 26 14:38:57 2015
+++ doc/CMakeLists.txt Mon Jun 29 22:08:17 2015
@@ -25,8 +25,8 @@ ENDIF(TXT2TAGS_EXECUTABLE)
$OpenBSD: patch-doc_CMakeLists_txt,v 1.9 2016/03/02 14:39:10 landry Exp $
--- doc/CMakeLists.txt.orig Fri Feb 26 13:23:48 2016
+++ doc/CMakeLists.txt Tue Mar 1 13:51:41 2016
@@ -24,8 +24,8 @@ ENDIF(TXT2TAGS_EXECUTABLE)
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)

8
geo/qgis/patches/patch-scripts_pyuic4-wrapper_py Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-scripts_pyuic4-wrapper_py,v 1.1 2016/03/02 14:39:10 landry Exp $
--- scripts/pyuic4-wrapper.py.orig Tue Mar 1 16:35:30 2016
+++ scripts/pyuic4-wrapper.py Tue Mar 1 16:35:43 2016
@@ -1,3 +1,4 @@
+#!${MODPY_BIN}
try:
import sip
sip.setapi("QVariant", 2)

9
geo/qgis/patches/patch-scripts_pyuic4-wrapper_sh Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-scripts_pyuic4-wrapper_sh,v 1.1 2016/03/02 14:39:10 landry Exp $
--- scripts/pyuic4-wrapper.sh.orig Tue Mar 1 16:28:08 2016
+++ scripts/pyuic4-wrapper.sh Tue Mar 1 16:28:20 2016
@@ -7,4 +7,4 @@ shift 3
export LD_LIBRARY_PATH PYTHONPATH
-exec python $(dirname $0)/pyuic4-wrapper.py $@
+exec ${MODPY_BIN} $(dirname $0)/pyuic4-wrapper.py $@

14
geo/qgis/patches/patch-src_app_qgisapp_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.8 2015/10/31 15:29:44 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.9 2016/03/02 14:39:10 landry Exp $
Fix paths to docs
--- src/app/qgisapp.cpp.orig Fri Oct 23 14:10:38 2015
+++ src/app/qgisapp.cpp Fri Oct 30 15:44:07 2015
@@ -1481,7 +1481,7 @@ void QgisApp::createActions()
mActionQgisHomePage->setShortcut( QString() );
--- src/app/qgisapp.cpp.orig Fri Feb 26 13:23:48 2016
+++ src/app/qgisapp.cpp Tue Mar 1 13:51:41 2016
@@ -1528,7 +1528,7 @@ void QgisApp::createActions()
mActionReportaBug->setShortcut( QString() );
#endif
- mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/index.html" ).exists() );
@ -11,7 +11,7 @@ Fix paths to docs
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
@@ -8218,7 +8218,7 @@ void QgisApp::helpContents()
@@ -8518,7 +8518,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -8243,7 +8243,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -8547,7 +8547,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

8
geo/qgis/patches/patch-src_app_qgsabout_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_app_qgsabout_cpp,v 1.7 2015/10/31 15:29:44 landry Exp $
--- src/app/qgsabout.cpp.orig Fri Oct 23 14:10:38 2015
+++ src/app/qgsabout.cpp Fri Oct 30 15:44:07 2015
@@ -237,7 +237,7 @@ void QgsAbout::setWhatsNew()
$OpenBSD: patch-src_app_qgsabout_cpp,v 1.8 2016/03/02 14:39:10 landry Exp $
--- src/app/qgsabout.cpp.orig Fri Feb 26 13:23:48 2016
+++ src/app/qgsabout.cpp Tue Mar 1 13:51:41 2016
@@ -232,7 +232,7 @@ void QgsAbout::setWhatsNew()
{
txtWhatsNew->clear();
txtWhatsNew->document()->setDefaultStyleSheet( QgsApplication::reportStyleSheet() );

10
geo/qgis/patches/patch-src_core_CMakeLists_txt
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.11 2015/11/16 10:22:59 landry Exp $
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.12 2016/03/02 14:39:10 landry Exp $
chunk 1: workaround $area expansion issue with gmake expanding to $$$$area
--- src/core/CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ src/core/CMakeLists.txt Mon Nov 16 09:27:43 2015
@@ -327,7 +327,7 @@ SET(QGIS_CORE_SRCS
--- src/core/CMakeLists.txt.orig Fri Feb 26 13:23:48 2016
+++ src/core/CMakeLists.txt Tue Mar 1 13:51:41 2016
@@ -340,7 +340,7 @@ SET(QGIS_CORE_SRCS
geometry/qgswkbtypes.cpp
)
@ -13,7 +13,7 @@ chunk 1: workaround $area expansion issue with gmake expanding to $$$$area
STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}")
STRING(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}")
@@ -864,9 +864,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -913,9 +913,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}

12
geo/qgis/patches/patch-src_core_qgsapplication_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.7 2015/12/07 13:11:41 landry Exp $
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.8 2016/03/02 14:39:10 landry Exp $
Fix paths to various doc files, installed in share/doc/qgis
per doc/CMakeLists.txt patch
--- src/core/qgsapplication.cpp.orig Fri Oct 23 14:10:38 2015
+++ src/core/qgsapplication.cpp Fri Oct 30 15:48:30 2015
@@ -528,18 +528,18 @@ QHash<QString, QString> QgsApplication::uiThemes()
--- src/core/qgsapplication.cpp.orig Fri Feb 26 13:23:48 2016
+++ src/core/qgsapplication.cpp Tue Mar 1 13:51:41 2016
@@ -544,18 +544,18 @@ QHash<QString, QString> QgsApplication::uiThemes()
*/
QString QgsApplication::authorsFilePath()
{
@ -25,7 +25,7 @@ per doc/CMakeLists.txt patch
}
/*!
@@ -547,7 +547,7 @@ QString QgsApplication::developersMapFilePath()
@@ -563,7 +563,7 @@ QString QgsApplication::developersMapFilePath()
*/
QString QgsApplication::sponsorsFilePath()
{
@ -34,7 +34,7 @@ per doc/CMakeLists.txt patch
}
/*!
@@ -555,19 +555,19 @@ QString QgsApplication::sponsorsFilePath()
@@ -571,19 +571,19 @@ QString QgsApplication::sponsorsFilePath()
*/
QString QgsApplication::donorsFilePath()
{

8
geo/qgis/patches/patch-src_server_CMakeLists_txt
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.3 2015/10/31 15:29:44 landry Exp $
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.4 2016/03/02 14:39:10 landry Exp $
install sld & xml in share/qgis
--- src/server/CMakeLists.txt.orig Fri Oct 23 14:10:38 2015
+++ src/server/CMakeLists.txt Fri Oct 30 15:44:07 2015
@@ -216,6 +216,6 @@ INSTALL(FILES
--- src/server/CMakeLists.txt.orig Fri Feb 26 13:23:48 2016
+++ src/server/CMakeLists.txt Tue Mar 1 13:51:41 2016
@@ -220,6 +220,6 @@ INSTALL(FILES
admin.sld
wms_metadata.xml
schemaExtension.xsd

27
geo/qgis/patches/patch-tests_src_core_testqgsdistancearea_cpp
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-tests_src_core_testqgsdistancearea_cpp,v 1.1 2015/11/01 20:48:06 sthen Exp $
--- tests/src/core/testqgsdistancearea.cpp.orig Sun Nov 1 13:45:40 2015
+++ tests/src/core/testqgsdistancearea.cpp Sun Nov 1 13:46:13 2015
@@ -204,19 +204,19 @@ void TestQgsDistanceArea::collections()
//collection of polygons
QgsGeometry polys( QgsGeometryFactory::geomFromWkt( "GeometryCollection( Polygon((0 36.53, 5.76 -48.16, 0 25.54, 0 36.53)), Polygon((10 20, 15 20, 15 10, 10 20)) )" ) );
result = myDa.measure( &polys ); //should meaure area
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
result = myDa.measureArea( &polys );
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
result = myDa.measureLength( &polys );
QVERIFY( qgsDoubleNear( result, 0 ) );
//mixed collection
QgsGeometry mixed( QgsGeometryFactory::geomFromWkt( "GeometryCollection( LineString(0 36.53, 5.76 -48.16), LineString(0 25.54, 24.20 36.70), Polygon((0 36.53, 5.76 -48.16, 0 25.54, 0 36.53)), Polygon((10 20, 15 20, 15 10, 10 20)) )" ) );
result = myDa.measure( &mixed ); //should measure area
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
//measure area specifically
result = myDa.measureArea( &mixed );
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
//measure length
result = myDa.measureLength( &mixed );
QVERIFY( qgsDoubleNear( result, 12006159, 1 ) );

1200
geo/qgis/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff