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

Update to qgis 2.18.2.

Browse Source 
Remove patch-src_gui_qgisgui_h which was part of
3e738405e2
upstream.

Switch to use gcc4 on all platforms (not only on i386), the new DWG
importer (added in a stable branch.. sigh) doesn't build with base gcc,
and what's the point of trying to build a modern c++ codebase with a 10
year-old compiler ?

Bump all shlib majors for lots of symbols removed as a consequence.
This commit is contained in:
landry 2016-12-22 21:34:06 +00:00
parent 21c7167c9d
commit 376cfc4d70
4 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
geo/qgis/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.60 2016/11/30 16:53:37 landry Exp $
# $OpenBSD: Makefile,v 1.61 2016/12/22 21:34:06 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-2.18.1
DISTNAME = qgis-2.18.2
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
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 \
qgis_networkanalysis 1.0
SHARED_LIBS = qgis_core 15.0 \
qgis_app 4.0 \
qgis_gui 14.0 \
qgis_analysis 7.0 \
qgis_server 5.0 \
qgispython 5.0 \
qgis_networkanalysis 2.0
HOMEPAGE = http://www.qgis.org/
@ -27,7 +27,7 @@ MODULES = gcc4 \
devel/cmake \
devel/gettext \
lang/python
MODGCC4_ARCHS = i386 # base GCC uses too much RAM
MODGCC4_ARCHS = *
MODGCC4_LANGS = c++
BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
@ -63,7 +63,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat \
fontconfig freetype glib-2.0 gobject-2.0 gthread-2.0 lcms m \
mng png pthread util stdc++ z proj \
mng png pthread util z proj \
QtGui QtNetwork QtXml QtSql QtCore QtScript QtSvg \
QtWebKit gdal geos_c gsl gslcblas pq qwt fcgi qca2 \
QtTest spatialindex spatialite sqlite3 qscintilla2 qjson

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-2.18.1.tar.bz2) = 23BunAUWD+qYd2zVlIZCYa+g6Jl1zRhRumT3KfTtVhQ=
SIZE (qgis-2.18.1.tar.bz2) = 82985311
SHA256 (qgis-2.18.2.tar.bz2) = 4hjswsC5g6lbug3EZ4hmHoA8+HD1dAy8+qHqOacfAqA=
SIZE (qgis-2.18.2.tar.bz2) = 83593908

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

@ -1,8 +1,8 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.14 2016/11/30 16:53:37 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.15 2016/12/22 21:34:06 landry Exp $
Fix paths to docs
--- 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()
--- src/app/qgisapp.cpp.orig Fri Dec 16 13:00:14 2016
+++ src/app/qgisapp.cpp Tue Dec 20 17:10:39 2016
@@ -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() ) );
@@ -9143,7 +9143,7 @@ void QgisApp::helpContents()
@@ -9152,7 +9152,7 @@ void QgisApp::helpContents()
void QgisApp::apiDocumentation()
{
@ -20,7 +20,7 @@ Fix paths to docs
{
openURL( "api/index.html" );
}
@@ -9172,7 +9172,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
@@ -9181,7 +9181,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
// open help in user browser
if ( useQgisDocDirectory )
{

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

@ -1,22 +0,0 @@
$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