From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C744B1382C5 for ; Sat, 5 Jun 2021 08:41:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BFCCE0872; Sat, 5 Jun 2021 08:41:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12310E0872 for ; Sat, 5 Jun 2021 08:41:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C68D533D3C5 for ; Sat, 5 Jun 2021 08:41:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CB44733 for ; Sat, 5 Jun 2021 08:41:52 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1622882423.ad26594a82336cbc51a19077c8baa27bca7066cb.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph-openmw/files/, dev-games/openscenegraph-openmw/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild X-VCS-Directories: dev-games/openscenegraph-openmw/files/ dev-games/openscenegraph-openmw/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: ad26594a82336cbc51a19077c8baa27bca7066cb X-VCS-Branch: master Date: Sat, 5 Jun 2021 08:41:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f45ee131-9fc3-48b3-b4ee-0f6e7e295743 X-Archives-Hash: a3a05b3a87d8de14bb141593b55d69dd commit: ad26594a82336cbc51a19077c8baa27bca7066cb Author: Alexey Sokolov google com> AuthorDate: Thu May 6 01:01:47 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jun 5 08:40:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad26594a dev-games/openscenegraph-openmw: fix build with gcc 11 Closes: https://bugs.gentoo.org/788301 Signed-off-by: Alexey Sokolov google.com> Closes: https://github.com/gentoo/gentoo/pull/21127 Signed-off-by: Ionen Wolkens gentoo.org> .../files/openscenegraph-3.4-gcc11.patch | 23 ++++++++++++++++++++++ ...openscenegraph-openmw-3.4_p20200425-r100.ebuild | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch new file mode 100644 index 00000000000..0d2dc2d0f73 --- /dev/null +++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/788301 +--- a/include/osgDB/ObjectCache ++++ b/include/osgDB/ObjectCache +@@ -72,7 +72,7 @@ class OSGDB_EXPORT ObjectCache : public osg::Referenced + + class ClassComp { + public: +- bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs); ++ bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const; + }; + + typedef std::pair, double > ObjectTimeStampPair; +--- a/src/osgDB/ObjectCache.cpp ++++ b/src/osgDB/ObjectCache.cpp +@@ -16,7 +16,7 @@ + + using namespace osgDB; + +-bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) ++bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const + { + // check if filename are the same + if (lhs.first < rhs.first) return true; diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild index 202f18429af..08efaabecea 100644 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild +++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -87,6 +87,7 @@ PATCHES=( "${FILESDIR}"/openscenegraph-3.4-cmake.patch "${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch "${FILESDIR}"/openscenegraph-3.6.3-docdir.patch + "${FILESDIR}"/openscenegraph-3.4-gcc11.patch ) pkg_setup() {