From b6c444e23ed8b0933959b68b4b5aa5e2238d00ff Mon Sep 17 00:00:00 2001 From: landry Date: Thu, 12 Dec 2019 10:54:49 +0000 Subject: [PATCH] Update to qgis 3.10.1 --- geo/qgis/Makefile | 13 ++++++------- geo/qgis/distinfo | 4 ++-- geo/qgis/patches/patch-src_core_CMakeLists_txt | 4 ++-- .../patches/patch-src_providers_wms_CMakeLists_txt | 6 +++--- geo/qgis/pkg/PLIST | 9 ++++----- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile index b531c439419..bffe62c1e44 100644 --- a/geo/qgis/Makefile +++ b/geo/qgis/Makefile @@ -1,20 +1,19 @@ -# $OpenBSD: Makefile,v 1.115 2019/11/25 14:15:52 kmos Exp $ +# $OpenBSD: Makefile,v 1.116 2019/12/12 10:54:49 landry Exp $ COMMENT = desktop geographical information system DPB_PROPERTIES = parallel -DISTNAME = qgis-3.10.0 +DISTNAME = qgis-3.10.1 EXTRACT_SUFX = .tar.bz2 CATEGORIES = geo x11 DEBUG_PACKAGES =${BUILD_PACKAGES} -REVISION = 0 -SHARED_LIBS = qgis_core 37.0 \ - qgis_app 20.0 \ - qgis_gui 27.0 \ +SHARED_LIBS = qgis_core 38.0 \ + qgis_app 21.0 \ + qgis_gui 28.0 \ qgis_analysis 14.0 \ - qgis_server 11.2 \ + qgis_server 11.3 \ qgispython 6.0 \ qgis_3d 5.1 \ qgis_native 0.3 diff --git a/geo/qgis/distinfo b/geo/qgis/distinfo index d886d02fb13..436e38c962c 100644 --- a/geo/qgis/distinfo +++ b/geo/qgis/distinfo @@ -1,2 +1,2 @@ -SHA256 (qgis-3.10.0.tar.bz2) = JescQdn7ki/6M3pyDf3O7kPPLThAmSPwh8IBDJdC8BI= -SIZE (qgis-3.10.0.tar.bz2) = 101075584 +SHA256 (qgis-3.10.1.tar.bz2) = RmrJ+tkfJmzzudFI9Y4q3r1bn8/APmcw63IlHmw0yKs= +SIZE (qgis-3.10.1.tar.bz2) = 99813767 diff --git a/geo/qgis/patches/patch-src_core_CMakeLists_txt b/geo/qgis/patches/patch-src_core_CMakeLists_txt index 23f063290fb..40628d81058 100644 --- a/geo/qgis/patches/patch-src_core_CMakeLists_txt +++ b/geo/qgis/patches/patch-src_core_CMakeLists_txt @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_core_CMakeLists_txt,v 1.24 2019/11/20 10:11:22 landry Exp $ +$OpenBSD: patch-src_core_CMakeLists_txt,v 1.25 2019/12/12 10:54:49 landry Exp $ takes many hours with the default (225) @@ -9,7 +9,7 @@ https://github.com/qgis/QGIS/commit/59a766e22a12cc274cf1b852d466f34848297658 Index: src/core/CMakeLists.txt --- src/core/CMakeLists.txt.orig +++ src/core/CMakeLists.txt -@@ -889,6 +889,7 @@ ELSE(MSVC) +@@ -891,6 +891,7 @@ ELSE(MSVC) SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)) SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1") diff --git a/geo/qgis/patches/patch-src_providers_wms_CMakeLists_txt b/geo/qgis/patches/patch-src_providers_wms_CMakeLists_txt index 7f217c16c55..3c1624ec5fb 100644 --- a/geo/qgis/patches/patch-src_providers_wms_CMakeLists_txt +++ b/geo/qgis/patches/patch-src_providers_wms_CMakeLists_txt @@ -1,15 +1,15 @@ -$OpenBSD: patch-src_providers_wms_CMakeLists_txt,v 1.4 2019/11/14 17:07:42 landry Exp $ +$OpenBSD: patch-src_providers_wms_CMakeLists_txt,v 1.5 2019/12/12 10:54:49 landry Exp $ https://github.com/qgis/QGIS/pull/32824/ Index: src/providers/wms/CMakeLists.txt --- src/providers/wms/CMakeLists.txt.orig +++ src/providers/wms/CMakeLists.txt -@@ -82,6 +82,7 @@ IF (WITH_GUI) +@@ -82,7 +82,6 @@ IF (WITH_GUI) ) TARGET_COMPILE_DEFINITIONS(wmsprovider_gui_a PRIVATE "-DQT_NO_FOREACH") ADD_DEPENDENCIES(wmsprovider_gui_a ui) -+ ADD_DEPENDENCIES(wmsprovider_a ui) +- ADD_DEPENDENCIES(wmsprovider_a ui) ENDIF (WITH_GUI) IF (FORCE_STATIC_PROVIDERS) diff --git a/geo/qgis/pkg/PLIST b/geo/qgis/pkg/PLIST index acfd396ea9a..fa0fb911e2e 100644 --- a/geo/qgis/pkg/PLIST +++ b/geo/qgis/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.55 2019/11/15 09:08:14 landry Exp $ +@comment $OpenBSD: PLIST,v 1.56 2019/12/12 10:54:49 landry Exp $ @bin bin/qgis @bin bin/qgis_bench @bin bin/qgis_mapserv.fcgi @@ -823,6 +823,7 @@ include/qgis/qgsprojectstorageregistry.h include/qgis/qgsprojectstylealgorithms.h include/qgis/qgsprojecttranslator.h include/qgis/qgsprojectversion.h +include/qgis/qgsprojectviewsettings.h include/qgis/qgsprojutils.h include/qgis/qgsproperty.h include/qgis/qgsproperty_p.h @@ -1367,6 +1368,7 @@ share/qgis/doc/nohelp.html share/qgis/doc/style.css share/qgis/i18n/ share/qgis/i18n/qgis_ar.qm +share/qgis/i18n/qgis_bg.qm share/qgis/i18n/qgis_bs.qm share/qgis/i18n/qgis_ca.qm share/qgis/i18n/qgis_cs.qm @@ -1377,7 +1379,6 @@ share/qgis/i18n/qgis_es.qm share/qgis/i18n/qgis_et.qm share/qgis/i18n/qgis_eu.qm share/qgis/i18n/qgis_fi.qm -share/qgis/i18n/qgis_fr.qm share/qgis/i18n/qgis_gl.qm share/qgis/i18n/qgis_hi.qm share/qgis/i18n/qgis_hu.qm @@ -1393,16 +1394,13 @@ share/qgis/i18n/qgis_nb.qm share/qgis/i18n/qgis_nl.qm share/qgis/i18n/qgis_pl.qm share/qgis/i18n/qgis_pt_BR.qm -share/qgis/i18n/qgis_pt_PT.qm share/qgis/i18n/qgis_ro.qm share/qgis/i18n/qgis_ru.qm share/qgis/i18n/qgis_sl.qm -share/qgis/i18n/qgis_sv.qm share/qgis/i18n/qgis_tr.qm share/qgis/i18n/qgis_uk.qm share/qgis/i18n/qgis_vi.qm share/qgis/i18n/qgis_zh-Hans.qm -share/qgis/i18n/qgis_zh-Hant.qm share/qgis/images/ share/qgis/images/icons/ share/qgis/images/icons/qbrowser-icon.png @@ -1620,6 +1618,7 @@ share/qgis/python/plugins/processing/algs/gdal/polygonize.py share/qgis/python/plugins/processing/algs/gdal/proximity.py share/qgis/python/plugins/processing/algs/gdal/rasterize.py share/qgis/python/plugins/processing/algs/gdal/rasterize_over.py +share/qgis/python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py share/qgis/python/plugins/processing/algs/gdal/rearrange_bands.py share/qgis/python/plugins/processing/algs/gdal/retile.py share/qgis/python/plugins/processing/algs/gdal/rgb2pct.py