From owner-svn-ports-all@freebsd.org Tue Jul 10 06:13:51 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 959B6104AB6D; Tue, 10 Jul 2018 06:13:51 +0000 (UTC) (envelope-from yuri@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 4809883707; Tue, 10 Jul 2018 06:13:51 +0000 (UTC) (envelope-from yuri@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 2992C2037C; Tue, 10 Jul 2018 06:13:51 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6A6Dph6045395; Tue, 10 Jul 2018 06:13:51 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6A6DogW045393; Tue, 10 Jul 2018 06:13:50 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201807100613.w6A6DogW045393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 10 Jul 2018 06:13:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474335 - in head/science/openstructure: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/openstructure: . files X-SVN-Commit-Revision: 474335 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.27 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: Tue, 10 Jul 2018 06:13:51 -0000 Author: yuri Date: Tue Jul 10 06:13:50 2018 New Revision: 474335 URL: https://svnweb.freebsd.org/changeset/ports/474335 Log: science/openstructure: Fix build on 12 broken due to the obvious misuse of std::getline Reported by: fallout Added: head/science/openstructure/files/patch-modules_base_src_test__utils_compare__files.cc (contents, props changed) Modified: head/science/openstructure/Makefile Modified: head/science/openstructure/Makefile ============================================================================== --- head/science/openstructure/Makefile Tue Jul 10 06:02:57 2018 (r474334) +++ head/science/openstructure/Makefile Tue Jul 10 06:13:50 2018 (r474335) @@ -2,7 +2,7 @@ PORTNAME= openstructure DISTVERSION= 1.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MASTER_SITES= https://git.scicore.unibas.ch/schwede/${PORTNAME}/repository/${DISTVERSION}/archive.tar.gz?dummy=/ Added: head/science/openstructure/files/patch-modules_base_src_test__utils_compare__files.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/openstructure/files/patch-modules_base_src_test__utils_compare__files.cc Tue Jul 10 06:13:50 2018 (r474335) @@ -0,0 +1,17 @@ +Patch for the obvious bug. Reported to the upstream. + +--- modules/base/src/test_utils/compare_files.cc.orig 2018-07-10 05:54:54 UTC ++++ modules/base/src/test_utils/compare_files.cc +@@ -37,8 +37,10 @@ bool compare_files(const String& test, c + } + String test_line, gold_line; + while (true) { +- bool test_end=std::getline(test_stream, test_line) != 0; +- bool gold_end=std::getline(gold_stream, gold_line) != 0; ++ std::getline(test_stream, test_line); ++ std::getline(gold_stream, gold_line); ++ bool test_end=test_stream.eof(); ++ bool gold_end=gold_stream.eof(); + if (!(test_end || gold_end)) { + return true; + }