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

Update to QGIS 2.18.0.

Browse Source 
See http://changelog.qgis.org/en/qgis/version/2.18.0/ for a visual list
of changes.
This commit is contained in:
landry 2016-11-01 09:18:13 +00:00
parent 3630f3eb7d
commit e8a754552b
6 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
geo/qgis/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.58 2016/10/04 20:04:00 landry Exp $
# $OpenBSD: Makefile,v 1.59 2016/11/01 09:18:13 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-2.16.3
DISTNAME = qgis-2.18.0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 12.0 \
qgis_app 2.0 \
qgis_gui 11.0 \
SHARED_LIBS = qgis_core 13.0 \
qgis_app 3.0 \
qgis_gui 12.0 \
qgis_analysis 6.0 \
qgis_server 4.0 \
qgispython 4.0 \
qgis_server 4.1 \
qgispython 4.1 \
qgis_networkanalysis 1.0
HOMEPAGE = http://www.qgis.org/

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-2.16.3.tar.bz2) = CHTTMzmldaNIAuB1QOpcD7W9+sp8H5f0rs/PNeyX64o=
SIZE (qgis-2.16.3.tar.bz2) = 83332679
SHA256 (qgis-2.18.0.tar.bz2) = Mr0mCpqeGN5xjZdzXFgmElW6ORcqii5TiYh/wawCuLo=
SIZE (qgis-2.18.0.tar.bz2) = 82730749

12
geo/qgis/patches/patch-debian_qgis_desktop
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-debian_qgis_desktop,v 1.3 2014/08/20 08:54:45 landry Exp $
--- debian/qgis.desktop.orig Fri Jun 27 14:00:08 2014
+++ debian/qgis.desktop Tue Jul 1 08:56:15 2014
@@ -48,8 +48,8 @@ GenericName[tr]=Coğrafi bilgi sistemi
$OpenBSD: patch-debian_qgis_desktop,v 1.4 2016/11/01 09:18:13 landry Exp $
--- debian/qgis.desktop.orig Fri Oct 21 14:14:02 2016
+++ debian/qgis.desktop Wed Oct 26 11:21:30 2016
@@ -47,9 +47,9 @@ GenericName[th]=ระบบสารสนเทศà¸
GenericName[tr]=CoÄŸrafi bilgi sistemi
GenericName[uk]=Геоінформаційна система
GenericName[uz]=Geografik axborot tizimi
Icon=qgis
-Icon=qgis
-TryExec=/usr/bin/qgis
-Exec=/usr/bin/qgis %F
+Icon=qgis-icon
+TryExec=${TRUEPREFIX}/bin/qgis
+Exec=${TRUEPREFIX}/bin/qgis %F
Terminal=false

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

@ -1,8 +1,8 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.12 2016/08/08 17:45:40 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.13 2016/11/01 09:18:13 landry Exp $
Fix paths to docs
--- src/app/qgisapp.cpp.orig Fri Jul 29 14:04:56 2016
+++ src/app/qgisapp.cpp Thu Aug 4 08:48:57 2016
@@ -1674,7 +1674,7 @@ void QgisApp::createActions()
--- src/app/qgisapp.cpp.orig Fri Oct 21 14:14:02 2016
+++ src/app/qgisapp.cpp Tue Oct 25 10:29:38 2016
@@ -1706,7 +1706,7 @@ void QgisApp::createActions()
mActionReportaBug->setShortcut( QString() );
#endif
@ -11,7 +11,7 @@ Fix paths to docs
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
@@ -9080,7 +9080,7 @@ void QgisApp::helpContents()
@@ -9129,7 +9129,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -9109,7 +9109,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -9158,7 +9158,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

10
geo/qgis/patches/patch-src_core_CMakeLists_txt
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.14 2016/08/08 17:45:40 landry Exp $
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.15 2016/11/01 09:18:13 landry Exp $
chunk 1: workaround $area expansion issue with gmake expanding to $$$$area
--- src/core/CMakeLists.txt.orig Fri Jul 29 14:04:56 2016
+++ src/core/CMakeLists.txt Thu Aug 4 08:48:57 2016
@@ -363,7 +363,7 @@ SET(QGIS_CORE_SRCS
--- src/core/CMakeLists.txt.orig Fri Oct 21 14:14:02 2016
+++ src/core/CMakeLists.txt Tue Oct 25 10:29:38 2016
@@ -365,7 +365,7 @@ SET(QGIS_CORE_SRCS
)
@ -13,7 +13,7 @@ chunk 1: workaround $area expansion issue with gmake expanding to $$$$area
IF(NOT USING_NINJA)
STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}")
ENDIF(NOT USING_NINJA)
@@ -970,9 +970,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -976,9 +976,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}

40
geo/qgis/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.23 2016/08/31 13:13:02 landry Exp $
@comment $OpenBSD: PLIST,v 1.24 2016/11/01 09:18:13 landry Exp $
@bin bin/qbrowser
@bin bin/qgis
@bin bin/qgis_bench
@ -83,6 +83,7 @@ include/qgis/qgsauthsslconfigwidget.h
include/qgis/qgsauthsslerrorsdialog.h
include/qgis/qgsauthsslimportdialog.h
include/qgis/qgsauthtrustedcasdialog.h
include/qgis/qgsbearingutils.h
include/qgis/qgsbilinearrasterresampler.h
include/qgis/qgsblendmodecombobox.h
include/qgis/qgsblureffect.h
@ -247,6 +248,7 @@ include/qgis/qgsexpressionbuilderwidget.h
include/qgis/qgsexpressioncontext.h
include/qgis/qgsexpressionfieldbuffer.h
include/qgis/qgsexpressionhighlighter.h
include/qgis/qgsexpressionlineedit.h
include/qgis/qgsexpressionselectiondialog.h
include/qgis/qgsextentgroupbox.h
include/qgis/qgsexternalresourceconfigdlg.h
@ -265,6 +267,7 @@ include/qgis/qgsfeaturerequest.h
include/qgis/qgsfeatureselectiondlg.h
include/qgis/qgsfeatureselectionmodel.h
include/qgis/qgsfeaturestore.h
include/qgis/qgsfeedback.h
include/qgis/qgsfield.h
include/qgis/qgsfield_p.h
include/qgis/qgsfieldcombobox.h
@ -452,6 +455,8 @@ include/qgis/qgsnumericsortlistviewitem.h
include/qgis/qgsobjectcustomproperties.h
include/qgis/qgsofflineediting.h
include/qgis/qgsogcutils.h
include/qgis/qgsoptional.h
include/qgis/qgsoptionalexpression.h
include/qgis/qgsoptionsdialogbase.h
include/qgis/qgsorderbydialog.h
include/qgis/qgsorganizetablecolumnsdialog.h
@ -619,6 +624,7 @@ include/qgis/qgssymbolslistwidget.h
include/qgis/qgssymbolv2.h
include/qgis/qgssymbolv2selectordialog.h
include/qgis/qgstablewidgetitem.h
include/qgis/qgstabwidget.h
include/qgis/qgstestutils.h
include/qgis/qgstextannotationitem.h
include/qgis/qgstextdiagram.h
@ -690,25 +696,6 @@ include/qgis/qgswkbsimplifierptr.h
include/qgis/qgswkbtypes.h
include/qgis/qgsxmlutils.h
include/qgis/qgszonalstatistics.h
include/qgis/ui_qgsauthauthoritieseditor.h
include/qgis/ui_qgsauthcertificateinfo.h
include/qgis/ui_qgsauthcertificatemanager.h
include/qgis/ui_qgsauthconfigedit.h
include/qgis/ui_qgsauthconfigeditor.h
include/qgis/ui_qgsauthconfigidedit.h
include/qgis/ui_qgsauthconfigselect.h
include/qgis/ui_qgsauthconfiguriedit.h
include/qgis/ui_qgsautheditorwidgets.h
include/qgis/ui_qgsauthidentitieseditor.h
include/qgis/ui_qgsauthimportcertdialog.h
include/qgis/ui_qgsauthimportidentitydialog.h
include/qgis/ui_qgsauthmethodplugins.h
include/qgis/ui_qgsauthserverseditor.h
include/qgis/ui_qgsauthsslconfigwidget.h
include/qgis/ui_qgsauthsslerrorsdialog.h
include/qgis/ui_qgsauthsslimportdialog.h
include/qgis/ui_qgsauthsslimporterrors.h
include/qgis/ui_qgsauthtrustedcasdialog.h
include/qgis/ui_qgscredentialdialog.h
include/qgis/ui_qgsdetaileditemwidgetbase.h
include/qgis/ui_qgsexpressionbuilder.h
@ -1588,6 +1575,7 @@ share/qgis/python/plugins/db_manager/dlg_export_vector.py
share/qgis/python/plugins/db_manager/dlg_field_properties.py
share/qgis/python/plugins/db_manager/dlg_import_vector.py
share/qgis/python/plugins/db_manager/dlg_query_builder.py
share/qgis/python/plugins/db_manager/dlg_sql_layer_window.py
share/qgis/python/plugins/db_manager/dlg_sql_window.py
share/qgis/python/plugins/db_manager/dlg_table_properties.py
share/qgis/python/plugins/db_manager/icons/
@ -1636,6 +1624,7 @@ share/qgis/python/plugins/db_manager/ui/ui_DlgExportVector.py
share/qgis/python/plugins/db_manager/ui/ui_DlgFieldProperties.py
share/qgis/python/plugins/db_manager/ui/ui_DlgImportVector.py
share/qgis/python/plugins/db_manager/ui/ui_DlgQueryBuilder.py
share/qgis/python/plugins/db_manager/ui/ui_DlgSqlLayerWindow.py
share/qgis/python/plugins/db_manager/ui/ui_DlgSqlWindow.py
share/qgis/python/plugins/db_manager/ui/ui_DlgTableProperties.py
share/qgis/python/plugins/processing/
@ -2314,6 +2303,7 @@ share/qgis/python/plugins/processing/algs/grass7/nviz7.py
share/qgis/python/plugins/processing/algs/help/
share/qgis/python/plugins/processing/algs/help/__init__.py
share/qgis/python/plugins/processing/algs/help/qgis.yaml
share/qgis/python/plugins/processing/algs/help/saga.yaml
share/qgis/python/plugins/processing/algs/lidar/
share/qgis/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py
share/qgis/python/plugins/processing/algs/lidar/__init__.py
@ -2677,6 +2667,8 @@ share/qgis/python/plugins/processing/algs/qgis/AutoincrementalField.py
share/qgis/python/plugins/processing/algs/qgis/BarPlot.py
share/qgis/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py
share/qgis/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py
share/qgis/python/plugins/processing/algs/qgis/Boundary.py
share/qgis/python/plugins/processing/algs/qgis/BoundingBox.py
share/qgis/python/plugins/processing/algs/qgis/Buffer.py
share/qgis/python/plugins/processing/algs/qgis/Centroids.py
share/qgis/python/plugins/processing/algs/qgis/CheckValidity.py
@ -2721,10 +2713,16 @@ share/qgis/python/plugins/processing/algs/qgis/LinesToPolygons.py
share/qgis/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py
share/qgis/python/plugins/processing/algs/qgis/MeanCoords.py
share/qgis/python/plugins/processing/algs/qgis/Merge.py
share/qgis/python/plugins/processing/algs/qgis/MergeLines.py
share/qgis/python/plugins/processing/algs/qgis/MergeLines_BACKUP_1606.py
share/qgis/python/plugins/processing/algs/qgis/MergeLines_BASE_1606.py
share/qgis/python/plugins/processing/algs/qgis/MergeLines_LOCAL_1606.py
share/qgis/python/plugins/processing/algs/qgis/MergeLines_REMOTE_1606.py
share/qgis/python/plugins/processing/algs/qgis/MultipartToSingleparts.py
share/qgis/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py
share/qgis/python/plugins/processing/algs/qgis/OrientedMinimumBoundingBox.py
share/qgis/python/plugins/processing/algs/qgis/PointDistance.py
share/qgis/python/plugins/processing/algs/qgis/PointOnSurface.py
share/qgis/python/plugins/processing/algs/qgis/PointsDisplacement.py
share/qgis/python/plugins/processing/algs/qgis/PointsFromLines.py
share/qgis/python/plugins/processing/algs/qgis/PointsFromPolygons.py
@ -2752,6 +2750,7 @@ share/qgis/python/plugins/processing/algs/qgis/RasterLayerStatistics.py
share/qgis/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
share/qgis/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
share/qgis/python/plugins/processing/algs/qgis/RegularPoints.py
share/qgis/python/plugins/processing/algs/qgis/RemoveNullGeometry.py
share/qgis/python/plugins/processing/algs/qgis/ReprojectLayer.py
share/qgis/python/plugins/processing/algs/qgis/ReverseLineDirection.py
share/qgis/python/plugins/processing/algs/qgis/SaveSelectedFeatures.py
@ -4526,6 +4525,7 @@ share/qgis/python/plugins/processing/tests/Grass7AlgorithmsRasterTest.py
share/qgis/python/plugins/processing/tests/ParametersTest.py
share/qgis/python/plugins/processing/tests/QgisAlgorithmsTest.py
share/qgis/python/plugins/processing/tests/TestData.py
share/qgis/python/plugins/processing/tests/ToolsTest.py
share/qgis/python/plugins/processing/tests/__init__.py
share/qgis/python/plugins/processing/tests/data/
share/qgis/python/plugins/processing/tests/data/lines.dbf