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

Update to QGIS 2.16.1.

Browse Source 
See http://changelog.qgis.org/en/qgis/version/2.16.0/.

Add two patches reverting selected chunks of upstream commits leading to
segfaults in python/sip initializations, until if figure out what's
wrong in upstream ticket #15347, hopefully at g2k16. With those two
commits reverted, it runs fine...
This commit is contained in:
landry 2016-08-08 17:45:40 +00:00
parent 2f6cbf8300
commit cd3cd13ec4
16 changed files with 984 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
geo/qgis/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.52 2016/06/01 14:05:22 landry Exp $
# $OpenBSD: Makefile,v 1.53 2016/08/08 17:45:40 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-2.14.3
DISTNAME = qgis-2.16.1
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 11.0 \
qgis_app 1.0 \
qgis_gui 10.0 \
SHARED_LIBS = qgis_core 12.0 \
qgis_app 2.0 \
qgis_gui 11.0 \
qgis_analysis 6.0 \
qgis_server 3.0 \
qgispython 3.0 \
qgis_server 4.0 \
qgispython 4.0 \
qgis_networkanalysis 1.0
HOMEPAGE = http://www.qgis.org/
@ -52,6 +52,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
geo/spatialite/libspatialite \
geo/spatialindex \
devel/gsl \
devel/qjson \
security/qca2 \
databases/postgresql
@ -60,7 +61,7 @@ WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat \
mng png pthread util stdc++ z proj \
QtGui QtNetwork QtXml QtSql QtCore QtScript QtSvg \
QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi qca2 \
QtTest spatialindex spatialite sqlite3 qscintilla2
QtTest spatialindex spatialite sqlite3 qscintilla2 qjson
WANTLIB += ${MODPY_WANTLIB} jpeg tiff
CONFIGURE_ENV+= VERBOSE=1
@ -70,7 +71,6 @@ 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.14.3.tar.bz2) = VE3q/mpIa1f7pMPcs0BD1iD5YFRNxy7KSlF/b6vYajc=
SIZE (qgis-2.14.3.tar.bz2) = 74078303
SHA256 (qgis-2.16.1.tar.bz2) = SlJs2K52/Aa7K2oVjobbXcDJRUUTeoIzzUZe+Ges3Is=
SIZE (qgis-2.16.1.tar.bz2) = 83147327

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

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.13 2016/03/02 14:39:10 landry Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.14 2016/08/08 17:45:40 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 Feb 26 13:23:48 2016
+++ CMakeLists.txt Tue Mar 1 13:51:41 2016
@@ -612,12 +612,6 @@ ELSE (WIN32)
--- CMakeLists.txt.orig Fri Jul 8 14:11:47 2016
+++ CMakeLists.txt Sat Jul 23 12:28:56 2016
@@ -627,12 +627,6 @@ ELSE (WIN32)
SET(DLLEXPORT "")
ENDIF()

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

@ -1,7 +1,7 @@
$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)
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.9 2016/08/08 17:45:40 landry Exp $
--- cmake/FindGDAL.cmake.orig Fri Jul 29 14:04:56 2016
+++ cmake/FindGDAL.cmake Fri Aug 5 08:55:07 2016
@@ -169,7 +169,7 @@ ELSE(WIN32)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GDAL_LIBRARY)
ELSE (APPLE)

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.10 2016/08/08 17:45:40 landry Exp $
--- cmake/FindGEOS.cmake.orig Fri Jul 29 14:04:56 2016
+++ cmake/FindGEOS.cmake Fri Aug 5 08:55:07 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.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
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.8 2016/08/08 17:45:40 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Jul 29 14:04:56 2016
+++ cmake/FindPostgres.cmake Fri Aug 5 08:55:07 2016
@@ -96,7 +96,7 @@ ELSE(WIN32)
ENDFOREACH(_LIBNAME ${_LIBS})

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

@ -1,14 +1,14 @@
$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
$OpenBSD: patch-doc_CMakeLists_txt,v 1.10 2016/08/08 17:45:40 landry Exp $
--- doc/CMakeLists.txt.orig Fri Jul 8 14:11:47 2016
+++ doc/CMakeLists.txt Sat Jul 23 12:28:57 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)
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css release-sponsors.html AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
-INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
-INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/images)
+INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/../doc/qgis)
+INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/../doc/qgis/images)
IF(WITH_APIDOC)
FIND_PACKAGE(Doxygen)
# Sponsor images
FILE (GLOB SPONSOR_IMAGES images/projects/thumbnails/* )

36
geo/qgis/patches/patch-python_core___init___py Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-python_core___init___py,v 1.1 2016/08/08 17:45:40 landry Exp $
Revert https://github.com/qgis/QGIS/commit/1bc17e6c4f40ab64a7d3443886e13f926dab23b7
http://hub.qgis.org/issues/15347
--- python/core/__init__.py.orig Wed Aug 3 14:27:13 2016
+++ python/core/__init__.py Wed Aug 3 14:33:26 2016
@@ -30,7 +30,7 @@ import string
from qgis._core import *
-def register_function(function, arg_count, group, usesgeometry=False, referenced_columns=[QgsFeatureRequest.AllAttributes], **kwargs):
+def register_function(function, arg_count, group, usesgeometry=False, **kwargs):
"""
Register a Python function to be used as a expression function.
@@ -59,8 +59,8 @@ def register_function(function, arg_count, group, uses
"""
class QgsExpressionFunction(QgsExpression.Function):
- def __init__(self, func, name, args, group, helptext='', usesgeometry=True, referencedColumns=QgsFeatureRequest.AllAttributes, expandargs=False):
- QgsExpression.Function.__init__(self, name, args, group, helptext, usesgeometry, referencedColumns)
+ def __init__(self, func, name, args, group, helptext='', usesgeometry=True, expandargs=False):
+ QgsExpression.Function.__init__(self, name, args, group, helptext, usesgeometry)
self.function = func
self.expandargs = expandargs
@@ -100,7 +100,7 @@ def register_function(function, arg_count, group, uses
function.__name__ = name
helptext = helptemplate.safe_substitute(name=name, doc=helptext)
- f = QgsExpressionFunction(function, name, arg_count, group, helptext, usesgeometry, referenced_columns, expandargs)
+ f = QgsExpressionFunction(function, name, arg_count, group, helptext, usesgeometry, expandargs)
# This doesn't really make any sense here but does when used from a decorator context
# so it can stay.

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

@ -1,8 +0,0 @@
$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
View File

@ -1,9 +0,0 @@
$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 $@

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

@ -1,8 +1,8 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.11 2016/06/01 14:05:22 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.12 2016/08/08 17:45:40 landry Exp $
Fix paths to docs
--- src/app/qgisapp.cpp.orig Fri May 20 14:05:10 2016
+++ src/app/qgisapp.cpp Wed Jun 1 10:50:25 2016
@@ -1527,7 +1527,7 @@ void QgisApp::createActions()
--- src/app/qgisapp.cpp.orig Fri Jul 29 14:04:56 2016
+++ src/app/qgisapp.cpp Thu Aug 4 08:48:57 2016
@@ -1674,7 +1674,7 @@ void QgisApp::createActions()
mActionReportaBug->setShortcut( QString() );
#endif
@ -11,7 +11,7 @@ Fix paths to docs
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
@@ -8533,7 +8533,7 @@ void QgisApp::helpContents()
@@ -9080,7 +9080,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -8562,7 +8562,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -9109,7 +9109,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

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

@ -1,19 +1,19 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.13 2016/03/29 15:09:52 landry Exp $
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.14 2016/08/08 17:45:40 landry Exp $
chunk 1: workaround $area expansion issue with gmake expanding to $$$$area
--- src/core/CMakeLists.txt.orig Fri Mar 25 13:17:01 2016
+++ src/core/CMakeLists.txt Tue Mar 29 14:24:04 2016
@@ -341,7 +341,7 @@ SET(QGIS_CORE_SRCS
geometry/qgswkbtypes.cpp
--- src/core/CMakeLists.txt.orig Fri Jul 29 14:04:56 2016
+++ src/core/CMakeLists.txt Thu Aug 4 08:48:57 2016
@@ -363,7 +363,7 @@ SET(QGIS_CORE_SRCS
)
-FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*")
+FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/a*")
STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}")
STRING(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}")
@@ -915,9 +915,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
IF(NOT USING_NINJA)
STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
ENDIF(NOT USING_NINJA)
@@ -970,9 +970,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.8 2016/03/02 14:39:10 landry Exp $
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.9 2016/08/08 17:45:40 landry Exp $
Fix paths to various doc files, installed in share/doc/qgis
per doc/CMakeLists.txt patch
--- 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()
--- src/core/qgsapplication.cpp.orig Fri Jul 8 14:11:47 2016
+++ src/core/qgsapplication.cpp Sat Jul 23 12:51:17 2016
@@ -554,18 +554,18 @@ QHash<QString, QString> QgsApplication::uiThemes()
*/
QString QgsApplication::authorsFilePath()
{
@ -25,7 +25,7 @@ per doc/CMakeLists.txt patch
}
/*!
@@ -563,7 +563,7 @@ QString QgsApplication::developersMapFilePath()
@@ -573,7 +573,7 @@ QString QgsApplication::developersMapFilePath()
*/
QString QgsApplication::sponsorsFilePath()
{
@ -34,7 +34,7 @@ per doc/CMakeLists.txt patch
}
/*!
@@ -571,19 +571,19 @@ QString QgsApplication::sponsorsFilePath()
@@ -581,19 +581,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.4 2016/03/02 14:39:10 landry Exp $
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.5 2016/08/08 17:45:40 landry Exp $
install sld & xml in share/qgis
--- 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
--- src/server/CMakeLists.txt.orig Fri Jul 8 14:11:47 2016
+++ src/server/CMakeLists.txt Sat Jul 23 12:51:18 2016
@@ -225,6 +225,6 @@ INSTALL(FILES
admin.sld
wms_metadata.xml
schemaExtension.xsd

115
geo/qgis/patches/patch-utf Normal file
View File

@ -0,0 +1,115 @@
$OpenBSD: patch-utf,v 1.1 2016/08/08 17:45:40 landry Exp $
Revert selected chunks of
https://github.com/qgis/QGIS/commit/c9838ccea481c8ca87c4e1647099cfe78777e795
sip blows at runtime when accessing QGIS_VERSION. Sigh.
http://hub.qgis.org/issues/15347
From c9838ccea481c8ca87c4e1647099cfe78777e795 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Sun, 10 Jul 2016 12:09:02 +0200
Subject: [PATCH] support utf-8 encoded release names
---
cmake/Txt2Tags.cmake | 2 +-
doc/INSTALL.html | 4 ++--
doc/news.html | 4 ++--
python/core/qgis.sip | 6 +++---
src/app/qgisapp.cpp | 4 ++--
src/app/qgspluginregistry.cpp | 2 +-
src/core/qgis.cpp | 4 ++--
src/core/qgis.h | 4 ++--
src/core/qgsmaplayer.cpp | 2 +-
tests/src/core/testqgsexpressioncontext.cpp | 4 ++--
10 files changed, 18 insertions(+), 18 deletions(-)
--- python/core/qgis.sip.orig
+++ python/core/qgis.sip
@@ -31,7 +31,7 @@ class QGis
// Version constants
//
// Version string
- static QString QGIS_VERSION;
+ static const char* QGIS_VERSION;
// Version number used for comparing versions using the "Check QGIS Version" function
static const int QGIS_VERSION_INT;
// Release name
--- src/app/qgisapp.cpp.orig
+++ src/app/qgisapp.cpp
@@ -376,7 +376,7 @@ static void setTitleBarText_( QWidget & qgisApp )
{
QString caption = QgisApp::tr( "QGIS " );
- if ( QGis::QGIS_VERSION.endsWith( "Master" ) )
+ if ( QString( QGis::QGIS_VERSION ).endsWith( "Master" ) )
{
caption += QString( "%1" ).arg( QGis::QGIS_DEV_VERSION );
}
@@ -8114,7 +8114,7 @@ void QgisApp::duplicateVectorStyle( QgsVectorLayer* srcLayer, QgsVectorLayer* de
"qgis", "http://mrcc.com/qgis.dtd", "SYSTEM" );
QDomDocument doc( documentType );
QDomElement rootNode = doc.createElement( "qgis" );
- rootNode.setAttribute( "version", QGis::QGIS_VERSION );
+ rootNode.setAttribute( "version", QString( "%1" ).arg( QGis::QGIS_VERSION ) );
doc.appendChild( rootNode );
QString errorMsg;
srcLayer->writeSymbology( rootNode, doc, errorMsg );
--- src/app/qgspluginregistry.cpp.orig
+++ src/app/qgspluginregistry.cpp
@@ -237,7 +237,7 @@ bool QgsPluginRegistry::checkQgisVersion( const QString& minVersion, const QStri
}
// our qgis version - cut release name after version number
- QString qgisVersion = QGis::QGIS_VERSION.section( '-', 0, 0 );
+ QString qgisVersion = QString( QGis::QGIS_VERSION ).section( '-', 0, 0 );
QStringList qgisVersionParts = qgisVersion.split( '.' );
--- src/core/qgis.cpp.orig
+++ src/core/qgis.cpp
@@ -36,7 +36,7 @@
//
// Version string
-QString QGis::QGIS_VERSION( QString::fromUtf8( VERSION ) );
+const char* QGis::QGIS_VERSION = VERSION;
// development version
const char* QGis::QGIS_DEV_VERSION = QGSVERSION;
--- src/core/qgis.h.orig
+++ src/core/qgis.h
@@ -43,7 +43,7 @@ class CORE_EXPORT QGis
// Version constants
//
// Version string
- static QString QGIS_VERSION;
+ static const char* QGIS_VERSION;
// Version number used for comparing versions using the "Check QGIS Version" function
static const int QGIS_VERSION_INT;
// Release name
--- src/core/qgsmaplayer.cpp.orig
+++ src/core/qgsmaplayer.cpp
@@ -1258,7 +1258,7 @@ void QgsMapLayer::exportNamedStyle( QDomDocument &doc, QString &errorMsg )
QDomDocument myDocument( documentType );
QDomElement myRootNode = myDocument.createElement( "qgis" );
- myRootNode.setAttribute( "version", QGis::QGIS_VERSION );
+ myRootNode.setAttribute( "version", QString( "%1" ).arg( QGis::QGIS_VERSION ) );
myDocument.appendChild( myRootNode );
myRootNode.setAttribute( "hasScaleBasedVisibilityFlag", hasScaleBasedVisibility() ? 1 : 0 );
--- tests/src/core/testqgsexpressioncontext.cpp.orig
+++ tests/src/core/testqgsexpressioncontext.cpp
@@ -495,7 +495,7 @@ void TestQgsExpressionContext::globalScope()
QgsExpression expOsName( "var('qgis_os_name')" );
QgsExpression expPlatform( "var('qgis_platform')" );
- QCOMPARE( expVersion.evaluate( &context ).toString(), QGis::QGIS_VERSION );
+ QCOMPARE( expVersion.evaluate( &context ).toString(), QString( QGis::QGIS_VERSION ) );
QCOMPARE( expVersionNo.evaluate( &context ).toInt(), QGis::QGIS_VERSION_INT );
QCOMPARE( expReleaseName.evaluate( &context ).toString(), QString( QGis::QGIS_RELEASE_NAME ) );
QCOMPARE( expAccountName.evaluate( &context ).toString(), QgsApplication::userLoginName() );

896
geo/qgis/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff