From owner-svn-ports-all@freebsd.org Sun Apr 8 12:12:24 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7F1AF9EC85; Sun, 8 Apr 2018 12:12:24 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 55E817C8D8; Sun, 8 Apr 2018 12:12:24 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F6337B0B; Sun, 8 Apr 2018 12:12:24 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w38CCOwV066366; Sun, 8 Apr 2018 12:12:24 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w38CCOVR066350; Sun, 8 Apr 2018 12:12:24 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804081212.w38CCOVR066350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 8 Apr 2018 12:12:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466795 - head/archivers/ark/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/archivers/ark/files X-SVN-Commit-Revision: 466795 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2018 12:12:24 -0000 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)) {