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

Update to qgis 3.4.2

Browse Source
This commit is contained in:
landry 2018-12-07 23:17:35 +00:00
parent 0b7e394afc
commit dd4b971cdf
6 changed files with 12 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
geo/qgis/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.95 2018/11/05 10:51:47 landry Exp $
# $OpenBSD: Makefile,v 1.96 2018/12/07 23:17:35 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-3.4.1
DISTNAME = qgis-3.4.2
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 26.0 \
qgis_app 11.0 \
qgis_gui 21.1 \
SHARED_LIBS = qgis_core 27.0 \
qgis_app 12.0 \
qgis_gui 22.0 \
qgis_analysis 12.0 \
qgis_server 7.0 \
qgispython 6.0 \
qgis_3d 3.0 \
qgis_3d 3.1 \
qgis_native 0.2
HOMEPAGE = http://www.qgis.org/

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-3.4.1.tar.bz2) = H8cRbG/aM7r10JNxBNyOScqwXVkh2yxBGYZs1N2A7BI=
SIZE (qgis-3.4.1.tar.bz2) = 72253801
SHA256 (qgis-3.4.2.tar.bz2) = an8wSYWUAEgEYHStdyTaRMuvhXpy4iKBY9JRU74+YnM=
SIZE (qgis-3.4.2.tar.bz2) = 72414835

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

@ -1,16 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.17 2018/10/29 08:25:30 landry Exp $
https://github.com/qgis/QGIS/pull/8357
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -932,6 +932,6 @@ IF (WITH_CORE)
INCLUDE(CPack)
ENDIF (WITH_CORE)
-IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+IF (UNIX)
ADD_SUBDIRECTORY(linux)
-ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ENDIF (UNIX)

25
geo/qgis/patches/patch-i18n_CMakeLists_txt
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-i18n_CMakeLists_txt,v 1.1 2018/10/29 08:25:30 landry Exp $
https://github.com/qgis/QGIS/pull/8357
Index: i18n/CMakeLists.txt
--- i18n/CMakeLists.txt.orig
+++ i18n/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(TS_FILES qgis_ar.ts qgis_bg.ts qgis_bs.ts qgis_ca.
ADD_TRANSLATION_FILES (QM_FILES ${TS_FILES})
-IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+IF (UNIX)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_BINARY_DIR}/org.qgis.qgis.desktop ${CMAKE_BINARY_DIR}/org.qgis.qgis.appdata.xml
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
@@ -39,7 +39,7 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
INSTALL(FILES ${CMAKE_BINARY_DIR}/org.qgis.qgis.desktop DESTINATION share/applications)
INSTALL(FILES ${CMAKE_BINARY_DIR}/org.qgis.qgis.appdata.xml DESTINATION share/metainfo)
-ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ENDIF (UNIX)
# creating a custom target is needed to make the files build
# "ALL" means that it will be run by default

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

@ -1,9 +1,9 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.29 2018/11/05 10:51:47 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.30 2018/12/07 23:17:35 landry Exp $
Index: src/app/qgisapp.cpp
--- src/app/qgisapp.cpp.orig
+++ src/app/qgisapp.cpp
@@ -10186,7 +10186,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
@@ -10195,7 +10195,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
void QgisApp::loadPythonSupport()
{
QString pythonlibName( QStringLiteral( "qgispython" ) );

4
geo/qgis/patches/patch-src_server_CMakeLists_txt
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.8 2018/10/29 08:25:30 landry Exp $
$OpenBSD: patch-src_server_CMakeLists_txt,v 1.9 2018/12/07 23:17:35 landry Exp $
install qgis_server additional files to share/qgis
Index: src/server/CMakeLists.txt
--- src/server/CMakeLists.txt.orig
+++ src/server/CMakeLists.txt
@@ -195,5 +195,5 @@ INSTALL(TARGETS
@@ -191,5 +191,5 @@ INSTALL(TARGETS
INSTALL(FILES
admin.sld
wms_metadata.xml