From b8fb483abe54582544cf79a319b29a00cb164ad7 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Tue, 21 Jan 2020 12:50:46 +0000
Subject: [PATCH] Update to qgis 3.10.2

---
 geo/qgis/Makefile                              | 10 +++++-----
 geo/qgis/distinfo                              |  4 ++--
 geo/qgis/patches/patch-src_core_CMakeLists_txt |  4 ++--
 geo/qgis/pkg/PLIST                             |  7 ++++++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile
index 88694b982ad..728cc1d7ddf 100644
--- a/geo/qgis/Makefile
+++ b/geo/qgis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.117 2020/01/09 10:34:18 cwen Exp $
+# $OpenBSD: Makefile,v 1.118 2020/01/21 12:50:46 landry Exp $
 
 BROKEN-powerpc =	does not build: "operand out of range"
 
@@ -6,14 +6,14 @@ COMMENT =	desktop geographical information system
 
 DPB_PROPERTIES =	parallel
 
-DISTNAME =	qgis-3.10.1
+DISTNAME =	qgis-3.10.2
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	geo x11
 DEBUG_PACKAGES =${BUILD_PACKAGES}
 
-SHARED_LIBS =	qgis_core	38.0 \
-		qgis_app	21.0 \
-		qgis_gui	28.0 \
+SHARED_LIBS =	qgis_core	39.0 \
+		qgis_app	22.0 \
+		qgis_gui	29.0 \
 		qgis_analysis	14.0 \
 		qgis_server	11.3 \
 		qgispython	6.0 \
diff --git a/geo/qgis/distinfo b/geo/qgis/distinfo
index 436e38c962c..8a86b265817 100644
--- a/geo/qgis/distinfo
+++ b/geo/qgis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qgis-3.10.1.tar.bz2) = RmrJ+tkfJmzzudFI9Y4q3r1bn8/APmcw63IlHmw0yKs=
-SIZE (qgis-3.10.1.tar.bz2) = 99813767
+SHA256 (qgis-3.10.2.tar.bz2) = OBywGorC9TeakVsSTpyDDXJ9LGd3XsSWCccVP+dlpvc=
+SIZE (qgis-3.10.2.tar.bz2) = 101916273
diff --git a/geo/qgis/patches/patch-src_core_CMakeLists_txt b/geo/qgis/patches/patch-src_core_CMakeLists_txt
index 40628d81058..6c635223f64 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.25 2019/12/12 10:54:49 landry Exp $
+$OpenBSD: patch-src_core_CMakeLists_txt,v 1.26 2020/01/21 12:50:46 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
-@@ -891,6 +891,7 @@ ELSE(MSVC)
+@@ -893,6 +893,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/pkg/PLIST b/geo/qgis/pkg/PLIST
index fa0fb911e2e..dd7d5f22b4d 100644
--- a/geo/qgis/pkg/PLIST
+++ b/geo/qgis/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.56 2019/12/12 10:54:49 landry Exp $
+@comment $OpenBSD: PLIST,v 1.57 2020/01/21 12:50:46 landry Exp $
 @bin bin/qgis
 @bin bin/qgis_bench
 @bin bin/qgis_mapserv.fcgi
@@ -895,6 +895,7 @@ include/qgis/qgsreferencedgeometry.h
 include/qgis/qgsregularpolygon.h
 include/qgis/qgsrelation.h
 include/qgis/qgsrelationaggregatesearchwidgetwrapper.h
+include/qgis/qgsrelationcontext.h
 include/qgis/qgsrelationeditorwidget.h
 include/qgis/qgsrelationmanager.h
 include/qgis/qgsrelationreferenceconfigdlg.h
@@ -1379,6 +1380,7 @@ 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
@@ -1394,13 +1396,16 @@ 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