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 45DCB13835A for ; Mon, 15 Jun 2020 09:54:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6753FE08AB; Mon, 15 Jun 2020 09:54:10 +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 441F4E08AB for ; Mon, 15 Jun 2020 09:54:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 EA3CF34F077 for ; Mon, 15 Jun 2020 09:54:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE7CB286 for ; Mon, 15 Jun 2020 09:54:06 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1592214828.cdb09fb67044e74063938f4b8091d602da75146c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/liblas/files/, sci-geosciences/liblas/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch sci-geosciences/liblas/liblas-1.8.1-r3.ebuild X-VCS-Directories: sci-geosciences/liblas/ sci-geosciences/liblas/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: cdb09fb67044e74063938f4b8091d602da75146c X-VCS-Branch: master Date: Mon, 15 Jun 2020 09:54:06 +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: 15d9ff38-f821-44a2-9897-8a7ac43433dc X-Archives-Hash: 38a1822b17f9ca5290c8c4b0a738d301 commit: cdb09fb67044e74063938f4b8091d602da75146c Author: David Seifert gentoo org> AuthorDate: Mon Jun 15 09:53:48 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Jun 15 09:53:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb09fb6 sci-geosciences/liblas: Fix building against boost 1.73 Closes: https://bugs.gentoo.org/722878 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Suggested-by: Attila Tóth atoth.sote.hu> Signed-off-by: David Seifert gentoo.org> .../liblas/files/liblas-1.8.1-boost-1.73.patch | 55 ++++++++++++++++++++++ sci-geosciences/liblas/liblas-1.8.1-r3.ebuild | 1 + 2 files changed, 56 insertions(+) diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch new file mode 100644 index 00000000000..288f207737b --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch @@ -0,0 +1,55 @@ +diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp +index d3116a1..ab20e06 100644 +--- a/include/liblas/detail/binary.hpp ++++ b/include/liblas/detail/binary.hpp +@@ -17,6 +17,8 @@ + #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED + #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED + ++#include ++ + #include + #include + #include +@@ -25,7 +27,6 @@ + + #include + #include +-#include + #include + + #if CHAR_BIT != 8 +@@ -43,7 +44,7 @@ namespace detail { namespace binary { + struct big_endian_tag {}; + struct little_endian_tag {}; + +-#ifdef BOOST_BIG_ENDIAN ++#ifdef LIBLAS_BIG_ENDIAN + typedef big_endian_tag native_endian_tag; + #else + typedef little_endian_tag native_endian_tag; +diff --git a/src/c_api.cpp b/src/c_api.cpp +index a70fe74..e8be785 100644 +--- a/src/c_api.cpp ++++ b/src/c_api.cpp +@@ -96,6 +96,7 @@ using namespace liblas; + #endif + + #include ++#include + + bool IsReprojectionTransform(liblas::TransformPtr const& p) + { +diff --git a/src/header.cpp b/src/header.cpp +index 9987ce1..a5c8f7d 100644 +--- a/src/header.cpp ++++ b/src/header.cpp +@@ -54,7 +54,7 @@ + // boost + #include + #include +- ++#include + //std + #include + #include diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild index 46930174cab..cee50e9a545 100644 --- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild +++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482 "${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846 "${FILESDIR}"/${P}-fix-debug.patch # bug 668778 + "${FILESDIR}"/${P}-boost-1.73.patch # bug 722878 ) src_prepare() {