From owner-svn-ports-all@freebsd.org Sat Apr 14 07:12:30 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 17817F85614; Sat, 14 Apr 2018 07:12:30 +0000 (UTC) (envelope-from tcberner@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 BDC9269DD0; Sat, 14 Apr 2018 07:12:29 +0000 (UTC) (envelope-from tcberner@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 B8B1425226; Sat, 14 Apr 2018 07:12:29 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3E7CTBg077658; Sat, 14 Apr 2018 07:12:29 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3E7CTEL077657; Sat, 14 Apr 2018 07:12:29 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201804140712.w3E7CTEL077657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 14 Apr 2018 07:12:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467292 - head/deskutils/fbreader/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/deskutils/fbreader/files X-SVN-Commit-Revision: 467292 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: Sat, 14 Apr 2018 07:12:30 -0000 Author: tcberner Date: Sat Apr 14 07:12:29 2018 New Revision: 467292 URL: https://svnweb.freebsd.org/changeset/ports/467292 Log: deskutils/fbreader: Fix build with Clang 6 PR: 227125 Submitted by: Peter Kien Approved by: xmj (maintainer) Added: head/deskutils/fbreader/files/patch-fbreader_src_database_booksdb_BooksDB.cpp (contents, props changed) Added: head/deskutils/fbreader/files/patch-fbreader_src_database_booksdb_BooksDB.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/fbreader/files/patch-fbreader_src_database_booksdb_BooksDB.cpp Sat Apr 14 07:12:29 2018 (r467292) @@ -0,0 +1,25 @@ +BooksDB.cpp:148:10: error: no viable conversion from returned value of type 'bool' to function return type 'shared_ptr' + return false; + ^~~~~ +/wrkdirs/usr/ports/deskutils/fbreader/work/FBReader-0.99.6-freebsdport/fbreader/../zlibrary/core/include/shared_ptr.h:57:3: note: candidate constructor not viable: no known conversion from 'bool' to 'Book *' for 1st argument + shared_ptr(T *t); + ^ +/wrkdirs/usr/ports/deskutils/fbreader/work/FBReader-0.99.6-freebsdport/fbreader/../zlibrary/core/include/shared_ptr.h:58:3: note: candidate constructor not viable: no known conversion from 'bool' to 'const shared_ptr &' for 1st argument + shared_ptr(const shared_ptr &t); + ^ +/wrkdirs/usr/ports/deskutils/fbreader/work/FBReader-0.99.6-freebsdport/fbreader/../zlibrary/core/include/shared_ptr.h:59:3: note: candidate constructor not viable: no known conversion from 'bool' to 'const weak_ptr &' for 1st argument + shared_ptr(const weak_ptr &t); + ^ +1 error generated. + +--- fbreader/src/database/booksdb/BooksDB.cpp.orig 2014-01-11 12:45:25 UTC ++++ fbreader/src/database/booksdb/BooksDB.cpp +@@ -145,7 +145,7 @@ shared_ptr BooksDB::loadBook(const std::string & + + myFindFileId->setFileName(fileName); + if (!myFindFileId->run()) { +- return false; ++ return 0; + } + ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId(); + shared_ptr reader = myLoadBook->executeReader();