Update to QGIS 3.8.1.

This commit is contained in:
landry 2019-07-24 08:51:05 +00:00
parent f977fd3b31
commit 1249223f27
5 changed files with 12 additions and 38 deletions

View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.109 2019/07/12 21:36:21 sthen Exp $
# $OpenBSD: Makefile,v 1.110 2019/07/24 08:51:05 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-3.8.0
REVISION = 0
DISTNAME = qgis-3.8.1
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 33.0 \
qgis_app 17.0 \
SHARED_LIBS = qgis_core 34.0 \
qgis_app 17.1 \
qgis_gui 25.0 \
qgis_analysis 13.0 \
qgis_server 11.0 \
qgis_server 11.1 \
qgispython 6.0 \
qgis_3d 5.0 \
qgis_native 0.3

View File

@ -1,2 +1,2 @@
SHA256 (qgis-3.8.0.tar.bz2) = oo/4zsJ+EWDd/TMbxY8ZD03VgSIqUbMu7OfNfKi4/AM=
SIZE (qgis-3.8.0.tar.bz2) = 82018062
SHA256 (qgis-3.8.1.tar.bz2) = 1lyOHHRxu6RvUBfyYeu++B3/tYQ6JPDncToA9weF6pk=
SIZE (qgis-3.8.1.tar.bz2) = 82396609

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_core_qgsapplication_cpp,v 1.11 2019/07/03 09:45:05 landry Exp $
ihttps://github.com/qgis/QGIS/pull/30336
Index: src/core/qgsapplication.cpp
--- src/core/qgsapplication.cpp.orig
+++ src/core/qgsapplication.cpp
@@ -307,12 +307,16 @@ void QgsApplication::init( QString profileFolder )
// append local user-writable folder as a proj search path
QStringList currentProjSearchPaths = QgsProjUtils::searchPaths();
currentProjSearchPaths.append( qgisSettingsDirPath() + QStringLiteral( "proj" ) );
- const char **newPaths = new const char *[currentProjSearchPaths.length()];
+ char **newPaths = new char *[currentProjSearchPaths.length()];
for ( int i = 0; i < currentProjSearchPaths.count(); ++i )
{
- newPaths[i] = currentProjSearchPaths.at( i ).toUtf8().constData();
+ newPaths[i] = CPLStrdup( currentProjSearchPaths.at( i ).toUtf8().constData() );
}
proj_context_set_search_paths( nullptr, currentProjSearchPaths.count(), newPaths );
+ for ( int i = 0; i < currentProjSearchPaths.count(); ++i )
+ {
+ CPLFree( newPaths[i] );
+ }
delete [] newPaths;
#endif

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.11 2019/07/03 09:45:05 landry Exp $
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.12 2019/07/24 08:51:05 landry Exp $
install qgis_server additional files to share/qgis
Index: src/server/CMakeLists.txt
--- src/server/CMakeLists.txt.orig
+++ src/server/CMakeLists.txt
@@ -193,5 +193,5 @@ INSTALL(TARGETS
@@ -194,5 +194,5 @@ INSTALL(TARGETS
INSTALL(FILES
admin.sld
wms_metadata.xml

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.50 2019/07/03 09:45:05 landry Exp $
@comment $OpenBSD: PLIST,v 1.51 2019/07/24 08:51:05 landry Exp $
@bin bin/qgis
@bin bin/qgis_bench
@bin bin/qgis_mapserv.fcgi
@ -57,6 +57,7 @@ include/qgis/qgsadvanceddigitizingfloater.h
include/qgis/qgsaggregatecalculator.h
include/qgis/qgsaggregatetoolbutton.h
include/qgis/qgsalgorithmimportphotos.h
include/qgis/qgsalignmentcombobox.h
include/qgis/qgsalignraster.h
include/qgis/qgsanalysis.h
include/qgis/qgsanimatedicon.h
@ -185,6 +186,7 @@ include/qgis/qgsconfigureshortcutsdialog.h
include/qgis/qgsconnectionpool.h
include/qgis/qgscontrastenhancement.h
include/qgis/qgscontrastenhancementfunction.h
include/qgis/qgscoordinateboundspreviewmapwidget.h
include/qgis/qgscoordinateformatter.h
include/qgis/qgscoordinatereferencesystem.h
include/qgis/qgscoordinatetransform.h
@ -1310,7 +1312,6 @@ share/qgis/i18n/qgis_bg.qm
share/qgis/i18n/qgis_bs.qm
share/qgis/i18n/qgis_ca.qm
share/qgis/i18n/qgis_cs.qm
share/qgis/i18n/qgis_da.qm
share/qgis/i18n/qgis_de.qm
share/qgis/i18n/qgis_el.qm
share/qgis/i18n/qgis_es.qm