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

Bugfix update to qgis 2.18.1

Browse Source
This commit is contained in:
landry 2016-11-30 16:53:37 +00:00
parent fda09b0f70
commit 7ae8154226
9 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
geo/qgis/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.59 2016/11/01 09:18:13 landry Exp $
# $OpenBSD: Makefile,v 1.60 2016/11/30 16:53:37 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-2.18.0
DISTNAME = qgis-2.18.1
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
SHARED_LIBS = qgis_core 13.0 \
qgis_app 3.0 \
qgis_gui 12.0 \
SHARED_LIBS = qgis_core 14.0 \
qgis_app 3.1 \
qgis_gui 13.0 \
qgis_analysis 6.0 \
qgis_server 4.1 \
qgispython 4.1 \

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-2.18.0.tar.bz2) = Mr0mCpqeGN5xjZdzXFgmElW6ORcqii5TiYh/wawCuLo=
SIZE (qgis-2.18.0.tar.bz2) = 82730749
SHA256 (qgis-2.18.1.tar.bz2) = 23BunAUWD+qYd2zVlIZCYa+g6Jl1zRhRumT3KfTtVhQ=
SIZE (qgis-2.18.1.tar.bz2) = 82985311

6
geo/qgis/patches/patch-cmake_FindGDAL_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.9 2016/08/08 17:45:40 landry Exp $
--- cmake/FindGDAL.cmake.orig Fri Jul 29 14:04:56 2016
+++ cmake/FindGDAL.cmake Fri Aug 5 08:55:07 2016
$OpenBSD: patch-cmake_FindGDAL_cmake,v 1.10 2016/11/30 16:53:37 landry Exp $
--- cmake/FindGDAL.cmake.orig Fri Nov 25 14:13:12 2016
+++ cmake/FindGDAL.cmake Tue Nov 29 16:55:58 2016
@@ -169,7 +169,7 @@ ELSE(WIN32)
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GDAL_LIBRARY)

6
geo/qgis/patches/patch-cmake_FindGEOS_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.10 2016/08/08 17:45:40 landry Exp $
--- cmake/FindGEOS.cmake.orig Fri Jul 29 14:04:56 2016
+++ cmake/FindGEOS.cmake Fri Aug 5 08:55:07 2016
$OpenBSD: patch-cmake_FindGEOS_cmake,v 1.11 2016/11/30 16:53:37 landry Exp $
--- cmake/FindGEOS.cmake.orig Fri Nov 25 14:13:12 2016
+++ cmake/FindGEOS.cmake Tue Nov 29 16:55:58 2016
@@ -148,7 +148,7 @@ ELSE(WIN32)
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
ENDIF (NOT GEOS_LIBRARY)

6
geo/qgis/patches/patch-cmake_FindPostgres_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.8 2016/08/08 17:45:40 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Jul 29 14:04:56 2016
+++ cmake/FindPostgres.cmake Fri Aug 5 08:55:07 2016
$OpenBSD: patch-cmake_FindPostgres_cmake,v 1.9 2016/11/30 16:53:37 landry Exp $
--- cmake/FindPostgres.cmake.orig Fri Nov 25 14:13:12 2016
+++ cmake/FindPostgres.cmake Tue Nov 29 16:55:58 2016
@@ -96,7 +96,7 @@ ELSE(WIN32)
ENDFOREACH(_LIBNAME ${_LIBS})

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.13 2016/11/01 09:18:13 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.14 2016/11/30 16:53:37 landry Exp $
Fix paths to docs
--- src/app/qgisapp.cpp.orig Fri Oct 21 14:14:02 2016
+++ src/app/qgisapp.cpp Tue Oct 25 10:29:38 2016
--- src/app/qgisapp.cpp.orig Fri Nov 25 14:13:12 2016
+++ src/app/qgisapp.cpp Tue Nov 29 14:20:04 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() ) );
@@ -9129,7 +9129,7 @@ void QgisApp::helpContents()
@@ -9143,7 +9143,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -9158,7 +9158,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -9172,7 +9172,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

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

@ -1,9 +1,9 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.15 2016/11/01 09:18:13 landry Exp $
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.16 2016/11/30 16:53:37 landry Exp $
chunk 1: workaround $area expansion issue with gmake expanding to $$$$area
--- src/core/CMakeLists.txt.orig Fri Oct 21 14:14:02 2016
+++ src/core/CMakeLists.txt Tue Oct 25 10:29:38 2016
--- src/core/CMakeLists.txt.orig Fri Nov 25 14:13:12 2016
+++ src/core/CMakeLists.txt Tue Nov 29 14:20:04 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)
@@ -976,9 +976,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -977,9 +977,9 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}

22
geo/qgis/patches/patch-src_gui_qgisgui_h Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_gui_qgisgui_h,v 1.1 2016/11/30 16:53:37 landry Exp $
Fix build failure
--- src/gui/qgisgui.h.orig Fri Nov 25 14:13:12 2016
+++ src/gui/qgisgui.h Wed Nov 30 09:05:03 2016
@@ -54,7 +54,7 @@ namespace QgisGui
* @see CANVAS_MAGNIFICATION_MAX
* @note added in QGIS 3.0
*/
- constexpr double CANVAS_MAGNIFICATION_MIN = 0.1;
+ static const double CANVAS_MAGNIFICATION_MIN = 0.1;
/**
* Maximum magnification level allowed in map canvases.
@@ -62,7 +62,7 @@ namespace QgisGui
* @note added in QGIS 3.0
*/
// Must be a factor of 2, so zooming in to max from 100% then zooming back out will result in 100% mag
- constexpr double CANVAS_MAGNIFICATION_MAX = 16.0;
+ static const double CANVAS_MAGNIFICATION_MAX = 16.0;
/**
Open files, preferring to have the default file selector be the

17
geo/qgis/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.24 2016/11/01 09:18:13 landry Exp $
@comment $OpenBSD: PLIST,v 1.25 2016/11/30 16:53:37 landry Exp $
@bin bin/qbrowser
@bin bin/qgis
@bin bin/qgis_bench
@ -29,6 +29,7 @@ include/qgis/qgs25drenderer.h
include/qgis/qgs25drendererwidget.h
include/qgis/qgsabstractgeometryv2.h
include/qgis/qgsaction.h
include/qgis/qgsactionmanager.h
include/qgis/qgsactionmenu.h
include/qgis/qgsaddremoveitemcommand.h
include/qgis/qgsaddremovemultiframecommand.h
@ -276,6 +277,7 @@ include/qgis/qgsfieldexpressionwidget.h
include/qgis/qgsfieldmodel.h
include/qgis/qgsfieldproxymodel.h
include/qgis/qgsfieldvalidator.h
include/qgis/qgsfiledownloader.h
include/qgis/qgsfiledropedit.h
include/qgis/qgsfilenamewidgetfactory.h
include/qgis/qgsfilenamewidgetwrapper.h
@ -1514,6 +1516,16 @@ share/qgis/python/plugins/db_manager/db_plugins/
share/qgis/python/plugins/db_manager/db_plugins/__init__.py
share/qgis/python/plugins/db_manager/db_plugins/connector.py
share/qgis/python/plugins/db_manager/db_plugins/data_model.py
share/qgis/python/plugins/db_manager/db_plugins/gpkg/
share/qgis/python/plugins/db_manager/db_plugins/gpkg/__init__.py
share/qgis/python/plugins/db_manager/db_plugins/gpkg/connector.py
share/qgis/python/plugins/db_manager/db_plugins/gpkg/data_model.py
share/qgis/python/plugins/db_manager/db_plugins/gpkg/icons/
share/qgis/python/plugins/db_manager/db_plugins/gpkg/icons/gpkg_icon.png
share/qgis/python/plugins/db_manager/db_plugins/gpkg/info_model.py
share/qgis/python/plugins/db_manager/db_plugins/gpkg/plugin.py
share/qgis/python/plugins/db_manager/db_plugins/gpkg/resources_rc.py
share/qgis/python/plugins/db_manager/db_plugins/gpkg/sql_dictionary.py
share/qgis/python/plugins/db_manager/db_plugins/html_elems.py
share/qgis/python/plugins/db_manager/db_plugins/info_model.py
share/qgis/python/plugins/db_manager/db_plugins/plugin.py
@ -2715,9 +2727,6 @@ 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