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

geo/qgis: update to 3.22.2.

Browse Source 
drop backported llvm13 build fix, was merged upstream.
This commit is contained in:
landry 2021-12-18 08:41:14 +00:00
parent 0b71314f69
commit 8d7426ea19
4 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
geo/qgis/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.156 2021/11/20 08:27:11 landry Exp $ # $OpenBSD: Makefile,v 1.157 2021/12/18 08:41:14 landry Exp $
BROKEN-sparc64 = undefined reference to QOpenGLExtension_ARB_tessellation_shader::QOpenGLExtension_ARB_tessellation_shader() in libQt53DRender.so.2.0 when linking qgis_3drenderingtest BROKEN-sparc64 = undefined reference to QOpenGLExtension_ARB_tessellation_shader::QOpenGLExtension_ARB_tessellation_shader() in libQt53DRender.so.2.0 when linking qgis_3drenderingtest
@ -6,14 +6,14 @@ COMMENT = desktop geographical information system
DPB_PROPERTIES = parallel DPB_PROPERTIES = parallel
DISTNAME = qgis-3.22.1 DISTNAME = qgis-3.22.2
EXTRACT_SUFX = .tar.bz2 EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11 CATEGORIES = geo x11
DEBUG_PACKAGES =${BUILD_PACKAGES} DEBUG_PACKAGES =${BUILD_PACKAGES}
SHARED_LIBS = qgis_core 55.0 \ SHARED_LIBS = qgis_core 56.0 \
qgis_app 37.0 \ qgis_app 37.0 \
qgis_gui 44.0 \ qgis_gui 45.0 \
qgis_analysis 19.0 \ qgis_analysis 19.0 \
qgis_server 17.1 \ qgis_server 17.1 \
qgispython 6.0 \ qgispython 6.0 \

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-3.22.1.tar.bz2) = vAKSz2OxVzEQeuyKDeudlh1KInJ62CSKfTNP/I4/x0g= SHA256 (qgis-3.22.2.tar.bz2) = /0iKH0mpsWHc/+sLyMwxQtO05/Sl6PldyyXvw5tACHA=
SIZE (qgis-3.22.1.tar.bz2) = 136772144 SIZE (qgis-3.22.2.tar.bz2) = 136903329

26
geo/qgis/patches/patch-src_core_providers_ogr_qgsogrproviderutils_cpp
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_core_providers_ogr_qgsogrproviderutils_cpp,v 1.1 2021/12/08 09:26:10 landry Exp $
Fix build with llvm 13
https://github.com/qgis/QGIS/pull/46408
Index: src/core/providers/ogr/qgsogrproviderutils.cpp
--- src/core/providers/ogr/qgsogrproviderutils.cpp.orig
+++ src/core/providers/ogr/qgsogrproviderutils.cpp
@@ -2311,7 +2311,7 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer
}
-void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *&ds )
+void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *ds )
{
if ( !ds )
return;
@@ -2319,7 +2319,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase
QMutexLocker locker( sGlobalMutex() );
releaseInternal( ds->mIdent, ds->mDs, true );
delete ds;
- ds = nullptr;
}
bool QgsOgrProviderUtils::canDriverShareSameDatasetAmongLayers( const QString &driverName )

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

@ -1,18 +0,0 @@
$OpenBSD: patch-src_core_providers_ogr_qgsogrproviderutils_h,v 1.1 2021/12/08 09:26:10 landry Exp $
Fix build with llvm 13
https://github.com/qgis/QGIS/pull/46408
Index: src/core/providers/ogr/qgsogrproviderutils.h
--- src/core/providers/ogr/qgsogrproviderutils.h.orig
+++ src/core/providers/ogr/qgsogrproviderutils.h
@@ -216,7 +216,7 @@ class CORE_EXPORT QgsOgrProviderUtils
static void release( QgsOgrLayer *&layer );
//! Release a QgsOgrDataset*
- static void releaseDataset( QgsOgrDataset *&ds );
+ static void releaseDataset( QgsOgrDataset *ds );
//! Make sure that the existing pool of opened datasets on dsName is not accessible for new getLayer() attempts
static void invalidateCachedDatasets( const QString &dsName );