svn commit: r466795 - head/archivers/ark/files

Adriaan de Groot adridg at FreeBSD.org
Sun Apr 8 12:12:24 UTC 2018


Author: adridg
Date: Sun Apr  8 12:12:24 2018
New Revision: 466795
URL: https://svnweb.freebsd.org/changeset/ports/466795

Log:
  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)

Added:
  head/archivers/ark/files/
  head/archivers/ark/files/patch-kerfuffle_pluginmanager.cpp   (contents, props changed)

Added: head/archivers/ark/files/patch-kerfuffle_pluginmanager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/ark/files/patch-kerfuffle_pluginmanager.cpp	Sun Apr  8 12:12:24 2018	(r466795)
@@ -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)) {


More information about the svn-ports-head mailing list