commit: f6be1c978ea51726091f2499bc5d78d89fce18da Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Oct 4 12:14:25 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 4 17:36:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6be1c97
dev-libs/tinyxml2: drop 9.0.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/tinyxml2/Manifest | 1 - .../tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch | 51 ---------------------- dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild | 29 ------------ 3 files changed, 81 deletions(-) diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest index 22114c122de1..3f01fdfd38ab 100644 --- a/dev-libs/tinyxml2/Manifest +++ b/dev-libs/tinyxml2/Manifest @@ -1,2 +1 @@ DIST tinyxml2-10.0.0.tar.gz 642421 BLAKE2B 89f5a9d92e4e3f12f4abcdbabb2d4cb25950a044bc6f6f788a1a6291913e77d82a805438aacf1e6c14dd8977aa3930527c89ef066e2075161f176a301cbf1b3f SHA512 a359d33bc12fad455b53d81011dbe12727cae0aabfaa5704f1a25807ca216dd854a571291029886c0beedeca5c3b6393dd49c4718773e18a0e008abbdb3de36a -DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367 diff --git a/dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch b/dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch deleted file mode 100644 index 2670d4ffa913..000000000000 --- a/dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch +++ /dev/null @@ -1,51 +0,0 @@ -Bug: https://bugs.gentoo.org/905999 -Upstream: https://leethomason/tinyxml2/pull/945 - -From dfcb914e8bbbb2dca146a3cee62f66fff7ea163b Mon Sep 17 00:00:00 2001 -From: Violet Purcell <[email protected]> -Date: Thu, 8 Jun 2023 15:19:41 +0000 -Subject: [PATCH] Remove LFS64 calls and set _FILE_OFFSET_BITS=64 - -Musl 1.2.4 made the LFS64 interfaces only available when -_LARGEFILE64_SOURCE is defined, and they will be removed altogether in -Musl 1.2.5. This commit replaces the LFS64 calls with their non-LFS64 -versions and defines _FILE_OFFSET_BITS=64, which makes all interfaces -64-bit. - -Bug: https://bugs.gentoo.org/905999 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,6 +31,7 @@ target_compile_definitions( - PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG> - INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT> - PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS> -+ PUBLIC _FILE_OFFSET_BITS=64 - ) - - set_target_properties( ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,7 @@ ARFLAGS = cr - RM = rm -f - RANLIB = ranlib - MKDIR = mkdir -p --CXXFLAGS = -fPIC -+CXXFLAGS = -D_FILE_OFFSET_BITS=64 -fPIC - - INSTALL = install - INSTALL_PROGRAM = $(INSTALL) ---- a/tinyxml2.cpp -+++ b/tinyxml2.cpp -@@ -106,9 +106,6 @@ distribution. - #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__) - #define TIXML_FSEEK fseeko - #define TIXML_FTELL ftello --#elif defined(__unix__) && defined(__x86_64__) -- #define TIXML_FSEEK fseeko64 -- #define TIXML_FTELL ftello64 - #else - #define TIXML_FSEEK fseek - #define TIXML_FTELL ftell --- -2.41.0 - diff --git a/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild b/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild deleted file mode 100644 index 4623fa9dfdd3..000000000000 --- a/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No meson because of bug #791163 -inherit cmake - -DESCRIPTION="A simple, small, efficient, C++ XML parser" -HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"; -SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0/9" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${P}-musl-1.2.4.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -}
