Skip to content

Commit

Permalink
qt59-qtlocation: avoid C++17
Browse files Browse the repository at this point in the history
Fixes https://trac.macports.org/ticket/56615
See https://bugreports.qt.io/browse/QTBUG-67810

No revbump because the port either builds successfully or not at all
  • Loading branch information
MarcusCalhoun-Lopez committed Jun 10, 2018
1 parent 1b32eef commit af3d416
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
4 changes: 4 additions & 0 deletions aqua/qt59/Portfile
Expand Up @@ -1231,6 +1231,10 @@ foreach {module module_info} [array get modules] {
reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/config.tests/${test}/main.cpp
}
}

# see https://trac.macports.org/ticket/56615
# see https://bugreports.qt.io/browse/QTBUG-67810
patchfiles-append patch-qtlocation-no-cxx17.diff
}

# special case
Expand Down
10 changes: 10 additions & 0 deletions aqua/qt59/files/patch-qtlocation-no-cxx17.diff
@@ -0,0 +1,10 @@
--- src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro.orig 2017-11-29 10:38:56.000000000 -0800
+++ src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro 2018-06-10 10:32:18.000000000 -0700
@@ -3,6 +3,7 @@
load(qt_helper_lib)

CONFIG += qt c++14 exceptions warn_off staticlib object_parallel_to_source
+CONFIG -= c++1z

QT += network-private \
gui-private \

0 comments on commit af3d416

Please sign in to comment.