diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-08 12:12:24 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-04-08 12:12:24 +0000 |
| commit | 79426f758a8bf5df6e80dc7827db7b82c2b61317 (patch) | |
| tree | 874cf520dbd98f393d948456ef1de1544e520390 /archivers/ark | |
| parent | edc41da73583b46bf52768da3e0cb885210557e4 (diff) | |
| download | ports-79426f758a8bf5df6e80dc7827db7b82c2b61317.tar.gz ports-79426f758a8bf5df6e80dc7827db7b82c2b61317.zip | |
Fix build of archivers/ark on 10.3 (old clang). Make the return
type of the lambda explicit, to avoid this build error:
error: return type 'QString' must match previous return type 'const QString' when lambda expression has unspecified explicit return type
return QString();
Reported by: pkg-fallout
Approved by: tcberner (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=466795
Diffstat (limited to 'archivers/ark')
| -rw-r--r-- | archivers/ark/files/patch-kerfuffle_pluginmanager.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/archivers/ark/files/patch-kerfuffle_pluginmanager.cpp b/archivers/ark/files/patch-kerfuffle_pluginmanager.cpp new file mode 100644 index 000000000000..995b135b3d60 --- /dev/null +++ b/archivers/ark/files/patch-kerfuffle_pluginmanager.cpp @@ -0,0 +1,11 @@ +--- kerfuffle/pluginmanager.cpp.orig 2018-03-03 22:55:29 UTC ++++ kerfuffle/pluginmanager.cpp +@@ -258,7 +258,7 @@ QStringList PluginManager::sortByComment + bool PluginManager::libarchiveHasLzo() + { + // Step 1: look for the libarchive plugin, which is built against libarchive. +- const QString pluginPath = []() { ++ const QString pluginPath = []() -> const QString { + foreach (const QString &path, QCoreApplication::libraryPaths()) { + const QString pluginPath = QStringLiteral("%1/kerfuffle/kerfuffle_libarchive.so").arg(path); + if (QFileInfo::exists(pluginPath)) { |