Update to qgis 2.18.3.

This commit is contained in:
landry 2017-02-07 08:20:51 +00:00
parent d52802ecf3
commit dff1040483
5 changed files with 49 additions and 10 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.61 2016/12/22 21:34:06 landry Exp $
# $OpenBSD: Makefile,v 1.62 2017/02/07 08:20:51 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-2.18.2
DISTNAME = qgis-2.18.3
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11

View File

@ -1,2 +1,2 @@
SHA256 (qgis-2.18.2.tar.bz2) = 4hjswsC5g6lbug3EZ4hmHoA8+HD1dAy8+qHqOacfAqA=
SIZE (qgis-2.18.2.tar.bz2) = 83593908
SHA256 (qgis-2.18.3.tar.bz2) = dD9PIvihex/Qrlde1NodIKsf4GVhVk0Je3XCH935s5Q=
SIZE (qgis-2.18.3.tar.bz2) = 83508061

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.15 2016/12/22 21:34:06 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.16 2017/02/07 08:20:51 landry Exp $
Fix paths to docs
--- src/app/qgisapp.cpp.orig Fri Dec 16 13:00:14 2016
+++ src/app/qgisapp.cpp Tue Dec 20 17:10:39 2016
--- src/app/qgisapp.cpp.orig Fri Jan 13 13:00:04 2017
+++ src/app/qgisapp.cpp Mon Feb 6 16:40:20 2017
@@ -1708,7 +1708,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() ) );
@@ -9152,7 +9152,7 @@ void QgisApp::helpContents()
@@ -9154,7 +9154,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -9181,7 +9181,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -9183,7 +9183,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

View File

@ -0,0 +1,38 @@
$OpenBSD: patch-src_server_qgsserver_cpp,v 1.1 2017/02/07 08:20:51 landry Exp $
https://github.com/qgis/QGIS/commit/77b8c3d67b868024e31120a38e3df9c0583e90bd
--- src/server/qgsserver.cpp.orig Fri Jan 13 13:00:04 2017
+++ src/server/qgsserver.cpp Mon Feb 6 15:54:14 2017
@@ -202,18 +202,18 @@ void QgsServer::printRequestParameters( const QMap< QS
*/
void QgsServer::printRequestInfos()
{
- QgsMessageLog::logMessage( QStringLiteral( "******************** New request ***************" ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "******************** New request ***************" , "Server", QgsMessageLog::INFO );
if ( getenv( "REMOTE_ADDR" ) )
{
- QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ),"Server" , QgsMessageLog::INFO );
}
if ( getenv( "REMOTE_HOST" ) )
{
- QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), "Server" , QgsMessageLog::INFO );
}
if ( getenv( "REMOTE_USER" ) )
{
- QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), "Server" , QgsMessageLog::INFO );
}
if ( getenv( "REMOTE_IDENT" ) )
{
@@ -245,7 +245,7 @@ void QgsServer::printRequestInfos()
}
if ( getenv( "HTTP_AUTHORIZATION" ) )
{
- QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), "Server", QgsMessageLog::INFO );
}
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.25 2016/11/30 16:53:37 landry Exp $
@comment $OpenBSD: PLIST,v 1.26 2017/02/07 08:20:51 landry Exp $
@bin bin/qbrowser
@bin bin/qgis
@bin bin/qgis_bench
@ -5325,6 +5325,7 @@ share/qgis/python/pytz/zoneinfo/zone1970.tab
share/qgis/python/qgis/
share/qgis/python/qgis/PyQt/
share/qgis/python/qgis/PyQt/Qsci.py
share/qgis/python/qgis/PyQt/Qt.py
share/qgis/python/qgis/PyQt/QtCore.py
share/qgis/python/qgis/PyQt/QtGui.py
share/qgis/python/qgis/PyQt/QtNetwork.py