commit: 5437edb7f8173d081c411b0d4714377df4343d4d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Oct 30 10:36:16 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 31 23:24:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5437edb7
sci-geosciences/liblas: treeclean Closes: https://bugs.gentoo.org/725938 (pkgremoved) Closes: https://bugs.gentoo.org/742668 (pkgremoved) Closes: https://bugs.gentoo.org/944868 (pkgremoved) Closes: https://bugs.gentoo.org/957235 (pkgremoved) Closes: https://bugs.gentoo.org/961718 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 6 --- sci-geosciences/liblas/Manifest | 1 - .../files/liblas-1.8.0_remove-std-c++98.patch | 30 ----------- .../files/liblas-1.8.1-CVE-2018-20540-fixup.patch | 24 --------- .../liblas/files/liblas-1.8.1-CVE-2018-20540.patch | 55 ------------------- .../liblas/files/liblas-1.8.1-boost-1.73.patch | 55 ------------------- .../liblas/files/liblas-1.8.1-c99.patch | 22 -------- .../liblas/files/liblas-1.8.1-fix-debug.patch | 18 ------- .../files/liblas-1.8.1-fix-overload-call.patch | 15 ------ .../liblas/files/liblas-1.8.1-gcc11.patch | 34 ------------ .../liblas/files/liblas-1.8.1-gdal-2.5.0.patch | 34 ------------ sci-geosciences/liblas/liblas-1.8.1-r4.ebuild | 61 ---------------------- sci-geosciences/liblas/metadata.xml | 15 ------ 13 files changed, 370 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index e77e9715db83..9fba05eb202c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -167,12 +167,6 @@ net-libs/NativeThread # Removal on 2025-11-04. Bug #957460. media-sound/lmms -# Andreas Sturmlechner <[email protected]> (2025-10-05) -# Dead upstream, replaced by sci-libs/pdal in most places. -# Many bugs: #725938, #742668, #944868, #957235, #961718 -# Removal on 2025-11-01. -sci-geosciences/liblas - # Andreas Sturmlechner <[email protected]> (2025-10-05) # Last release 8 years ago, broken by CMake 4, unclear purpose without any # revdeps. Bugs #800608, #866377, #955465. Removal on 2025-11-01. diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest deleted file mode 100644 index fcc9da773c40..000000000000 --- a/sci-geosciences/liblas/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6 diff --git a/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch b/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch deleted file mode 100644 index dc230dad0777..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- libLAS-1.8.0/CMakeLists.txt -+++ libLAS-1.8.0/CMakeLists.txt -@@ -140,27 +140,6 @@ - - set(CMAKE_INCLUDE_PATH c:/osgeo4w64/include;$ENV{CMAKE_INCLUDE_PATH}) - set(CMAKE_LIBRARY_PATH c:/osgeo4w64/lib;$ENV{CMAKE_LIBRARY_PATH}) --else() -- -- # Recommended C++ compilation flags -- # -Weffc++ -- # -- # Remove -pedandic which causes errors from boost (comma at end of -- # enum) 2012-09-05. Remove -Wcast-qual -Wfloat-equal -- # -Wredundant-decls to suppress the multitude of warning messages. -- set(LIBLAS_COMMON_CXX_FLAGS -- " -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long") -- -- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) -- -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}") -- if (CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi") -- endif() -- -- elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}") -- endif() - endif(WIN32) - - if (APPLE) diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch deleted file mode 100644 index 6f0c132b5c58..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6a666b9101293b13fde4e4eb1d2c627f7613515e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Felipe=20M=2E=20L=C3=B3pez?= <[email protected]> -Date: Fri, 19 Jul 2019 08:26:44 +0200 -Subject: [PATCH] Always return NULL when Open() is used (#168) - -Attempt to open LAS file using standard stream, without -Boost supports built in, always failed with -"Cannot open sample.las for read. Exiting..." ---- - include/liblas/liblas.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp -index 325de3ff..5c950ce0 100644 ---- a/include/liblas/liblas.hpp -+++ b/include/liblas/liblas.hpp -@@ -138,6 +138,7 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode) - ifs = new std::ifstream(); - ifs->open(filename.c_str(), mode); - if (ifs->is_open() == false) return NULL; -+ return ifs; - } - catch (...) - { diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch deleted file mode 100644 index ab2174f04ff0..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 09d45518776489508f34098f1c159f58b856f459 Mon Sep 17 00:00:00 2001 -From: Mateusz Loskot <[email protected]> -Date: Sun, 20 Jan 2019 02:28:29 +0100 -Subject: [PATCH] Ensure stream is deallocated in case of exception (#162) - -Fixes #158 ---- - include/liblas/liblas.hpp | 32 ++++++++++++++++++++++++-------- - 1 file changed, 24 insertions(+), 8 deletions(-) - -diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp -index f5ad44e1..325de3ff 100644 ---- a/include/liblas/liblas.hpp -+++ b/include/liblas/liblas.hpp -@@ -119,16 +119,32 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode) - { - #ifdef USE_BOOST_IO - namespace io = boost::iostreams; -- io::stream<io::file_source>* ifs = new io::stream<io::file_source>(); -- ifs->open(filename.c_str(), mode); -- if (ifs->is_open() == false) return NULL; -- return ifs; -+ io::stream<io::file_source>* ifs = NULL; -+ try -+ { -+ ifs = new io::stream<io::file_source>(); -+ ifs->open(filename.c_str(), mode); -+ if (ifs->is_open() == false) return NULL; -+ return ifs; -+ } -+ catch (...) -+ { -+ delete ifs; -+ } - #else -- std::ifstream* ifs = new std::ifstream(); -- ifs->open(filename.c_str(), mode); -- if (ifs->is_open() == false) return NULL; -- return ifs; -+ std::ifstream* ifs = NULL; -+ try -+ { -+ ifs = new std::ifstream(); -+ ifs->open(filename.c_str(), mode); -+ if (ifs->is_open() == false) return NULL; -+ } -+ catch (...) -+ { -+ delete ifs; -+ } - #endif -+ return NULL; - } - - /// Create file and open to write in binary mode. 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 deleted file mode 100644 index 288f207737bf..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 <liblas/detail/endian.hpp> -+ - #include <cassert> - #include <climits> - #include <cstring> -@@ -25,7 +27,6 @@ - - #include <boost/config.hpp> - #include <boost/static_assert.hpp> --#include <boost/detail/endian.hpp> - #include <boost/type_traits/is_signed.hpp> - - #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 <boost/lambda/lambda.hpp> -+#include <boost/bind.hpp> - - 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 <boost/cstdint.hpp> - #include <boost/lambda/lambda.hpp> -- -+#include <boost/bind.hpp> - //std - #include <algorithm> - #include <fstream> diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-c99.patch b/sci-geosciences/liblas/files/liblas-1.8.1-c99.patch deleted file mode 100644 index 71ef666010a2..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-c99.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/933089 -https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493 - -From e789d43df4500da0c12d2f6d3ac1d031ed835493 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel <[email protected]> -Date: Wed, 31 Oct 2018 11:38:19 -0400 -Subject: [PATCH] las2col: use fflush for FILE* - -The `fsync` function operates on file descriptors, not C `FILE` -pointers. Instead, use `fflush`. ---- a/apps/las2col.c -+++ b/apps/las2col.c -@@ -1042,7 +1042,7 @@ int main(int argc, char *argv[]) - fflush(files_out[i]); - if (verbose) - printf("close file %d\n", i); -- fsync(files_out[i]); -+ fflush(files_out[i]); - fclose(files_out[i]); - } - free(files_out); - diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch b/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch deleted file mode 100644 index 0c3b8ceec269..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix compilation with -DDEBUG and GDAL >= 2 -Author: Even Rouault <[email protected]> -Origin: https://github.com/libLAS/libLAS/commit/72f7709bf1dfd3473b64cdba0259363d3beea3c3 - ---- a/src/gt_wkt_srs.cpp -+++ b/src/gt_wkt_srs.cpp -@@ -90,7 +90,11 @@ static const char *papszDatumEquiv[] = - /* LibgeotiffOneTimeInit() */ - /************************************************************************/ - -+#if GDAL_VERSION_MAJOR >= 2 -+static CPLMutex* hMutex = NULL; -+#else - static void* hMutex = NULL; -+#endif - - void LibgeotiffOneTimeInit() - { diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch b/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch deleted file mode 100644 index 0b77da12148a..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/gt_citation.cpp 2018-08-03 12:16:16.007831564 +0100 -+++ b/src/gt_citation.cpp 2018-08-03 12:16:45.224830335 +0100 -@@ -387,10 +387,10 @@ - osCitation += primemName; - bRewriteGeogCitation = TRUE; - -- double primemValue = poSRS->GetPrimeMeridian(NULL); -+ double primemValue = poSRS->GetPrimeMeridian(); - if(angUnitName && !EQUAL(angUnitName, "Degree")) - { -- double aUnit = poSRS->GetAngularUnits(NULL); -+ double aUnit = poSRS->GetAngularUnits(); - primemValue *= aUnit; - } - GTIFKeySet( psGTIF, GeogPrimeMeridianLongGeoKey, TYPE_DOUBLE, 1, diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch deleted file mode 100644 index b279eb40f4cd..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://github.com/libLAS/libLAS/commit/8c4985384453a2df7254f05688b83706723bad7b.patch -https://bugs.gentoo.org/789732 - -From 8c4985384453a2df7254f05688b83706723bad7b Mon Sep 17 00:00:00 2001 -From: FX Coudert <[email protected]> -Date: Wed, 4 Oct 2017 11:51:23 +0200 -Subject: [PATCH] fix pointer comparison - ---- - src/gt_citation.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gt_citation.cpp b/src/gt_citation.cpp -index 65fce31a..8d3966bc 100644 ---- a/src/gt_citation.cpp -+++ b/src/gt_citation.cpp -@@ -155,7 +155,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) - if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') - p1 --; - p2 = p1 - 1; -- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) -+ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) - p2--; - if(p2 != p1 - 1) - p1 = p2; -@@ -198,7 +198,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID) - if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ') - p1 --; - char* p2 = p1 - 1; -- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) -+ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') ) - p2--; - if(p2 != p1 - 1) - p1 = p2; diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch deleted file mode 100644 index 0691c16c1b7e..000000000000 --- a/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3a572ff7e684668da62c794b37ccccbc169723de Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 26 Feb 2020 17:45:30 +0100 -Subject: [PATCH] Fix build against >=GDAL-2.5.0 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - src/gt_wkt_srs.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp -index 9871aa0..099972d 100755 ---- a/src/gt_wkt_srs.cpp -+++ b/src/gt_wkt_srs.cpp -@@ -493,7 +493,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) - { - char *pszWKT; - oSRS.morphFromESRI(); -- oSRS.FixupOrdering(); - if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) - return pszWKT; - } -@@ -1094,8 +1093,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) - /* ==================================================================== */ - char *pszWKT; - -- oSRS.FixupOrdering(); -- - if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) - return pszWKT; - else --- -2.25.1 - diff --git a/sci-geosciences/liblas/liblas-1.8.1-r4.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r4.ebuild deleted file mode 100644 index c55fc20687a9..000000000000 --- a/sci-geosciences/liblas/liblas-1.8.1-r4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS" -HOMEPAGE="https://github.com/libLAS/libLAS/"; -SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/libLAS-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" -IUSE="gdal" - -DEPEND=" - dev-libs/boost:= - sci-geosciences/laszip - sci-libs/libgeotiff:= - gdal? ( sci-libs/gdal:= ) -" -RDEPEND="${DEPEND}" - -# tests known to fail due to LD_LIBRARY_PATH issue -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch - "${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654 - "${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 - "${FILESDIR}"/${P}-gcc11.patch # bug 789732 - "${FILESDIR}"/${P}-c99.patch # bug 933089 -) - -src_prepare() { - use gdal && has_version ">=sci-libs/gdal-2.5.0" && PATCHES+=( - "${FILESDIR}"/${P}-gdal-2.5.0.patch # bug 707706 - ) - cmake_src_prepare - - # add missing linkage - sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \ - -i "${S}/apps/CMakeLists.txt" || die -} - -src_configure() { - # Aliasing violations (bug #862585) - filter-lto - append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DLIBLAS_LIB_SUBDIR=$(get_libdir) - -DWITH_GDAL=$(usex gdal) - ) - cmake_src_configure -} diff --git a/sci-geosciences/liblas/metadata.xml b/sci-geosciences/liblas/metadata.xml deleted file mode 100644 index b134a755b5b1..000000000000 --- a/sci-geosciences/liblas/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Geosciences Project</name> -</maintainer> -<use> - <flag name="gdal">Add support for the <pkg>sci-libs/gdal</pkg> geospatial - raster library</flag> -</use> -<upstream> - <remote-id type="github">libLAS/libLAS</remote-id> -</upstream> -</pkgmetadata>
