public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tinyxml2/, dev-libs/tinyxml2/files/
@ 2016-08-04  3:52 Tim Harder
  0 siblings, 0 replies; 5+ messages in thread
From: Tim Harder @ 2016-08-04  3:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3aa4296812cda354ed706d4cadfd8aac5e96479d
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 03:49:14 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 03:52:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa42968

dev-libs/tinyxml2: version bump to 4.0.1

 dev-libs/tinyxml2/Manifest                         |  1 +
 .../files/tinyxml2-4.0.1-optional-tests.patch      | 30 +++++++++++++++++++
 .../tinyxml2/files/tinyxml2-4.0.1-xmltest.patch    | 11 +++++++
 dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild            | 34 ++++++++++++++++++++++
 4 files changed, 76 insertions(+)

diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 6edb19d..f98ef54 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,2 +1,3 @@
 DIST tinyxml2-1.0.9_p20121123.tar.bz2 91204 SHA256 894b6b1136c86cc98bff77892ca077726b470432e871ca8c8c605177047272ea SHA512 054342b51141771c7611ae5aeb6ea332c42dff603aa6747f802d02bd010cad4b5c84fadf976576d2a604f1cccc7afe95ff23682a98c9294b032c94aa48b09aaf WHIRLPOOL 9aa505e7794b1fe1919b185d2080e63f3b01f44d2daeba94b7da6701f4931ec9188c0f92c9db9c6e8ac02772ef85f582b3a5d64227fd7b353da0a258c8a72eb7
 DIST tinyxml2-2.2.0.tar.gz 455226 SHA256 f891224f32e7a06bf279290619cec80cc8ddc335c13696872195ffb87f5bce67 SHA512 e06edb46f96dcc58cf16c8fef91dd072c9bd6dd296bb9ba3e082db059438f5f31e0689015deee7f1c390788d9bd0e64b6f5c0235c9d2839419ee2ab1784f53c4 WHIRLPOOL 6310e1492b180cc1a74f856dbf78897c5db7777d44ffd5ef785f85fb87a91462479a9da006d93ad7157763416863ed623b14cfc8d99f35494335de7252cda754
+DIST tinyxml2-4.0.1.tar.gz 344295 SHA256 14b38ef25cc136d71339ceeafb4856bb638d486614103453eccd323849267f20 SHA512 4add31a72c62b3f68bdb17fb90630bc51bf96b616f4beafb413082dc77bc699b8d516fa0955d001d5d69bc3371b7ca9ce5cd9696d91dd913b09a1c10681b819e WHIRLPOOL 76fd8f6d15f73845b1051385aaff64d33263639cc630eaaf2563d6f1c3fca1ffae277d7c540197c6eee65ac4429ac6f1f0541ab99520cf809afd655fbdacc9ab

diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
new file mode 100644
index 0000000..95e849f
--- /dev/null
+++ b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
@@ -0,0 +1,30 @@
+--- tinyxml2-4.0.1/CMakeLists.txt
++++ tinyxml2-4.0.1/CMakeLists.txt
+@@ -100,15 +100,18 @@
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+-add_executable(xmltest xmltest.cpp)
+-if(BUILD_SHARED_LIBS)
+-   add_dependencies(xmltest tinyxml2)
+-   add_dependencies(xmltest ${TARGET_DATA_COPY})
+-   target_link_libraries(xmltest tinyxml2)
+-else(BUILD_STATIC_LIBS)
+-   add_dependencies(xmltest tinyxml2_static)
+-   add_dependencies(xmltest ${TARGET_DATA_COPY})
+-   target_link_libraries(xmltest tinyxml2_static)
++set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests")
++if(BUILD_TEST)
++	add_executable(xmltest xmltest.cpp)
++	if(BUILD_SHARED_LIBS)
++		add_dependencies(xmltest tinyxml2)
++		add_dependencies(xmltest ${TARGET_DATA_COPY})
++		target_link_libraries(xmltest tinyxml2)
++	else(BUILD_STATIC_LIBS)
++		add_dependencies(xmltest tinyxml2_static)
++		add_dependencies(xmltest ${TARGET_DATA_COPY})
++		target_link_libraries(xmltest tinyxml2_static)
++	endif()
+ endif()
+ install(TARGETS DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 

diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
new file mode 100644
index 0000000..94b2668
--- /dev/null
+++ b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
@@ -0,0 +1,11 @@
+--- tinyxml2-4.0.1/xmltest.cpp
++++ tinyxml2-4.0.1/xmltest.cpp
+@@ -1618,7 +1618,7 @@
+ 
+ 		FILE* perfFP = fopen("resources/dream.xml", "r");
+ 		fseek(perfFP, 0, SEEK_END);
+-		long size = ftell(fp);
++		long size = ftell(perfFP);
+ 		fseek(perfFP, 0, SEEK_SET);
+ 
+ 		char* mem = new char[size + 1];

diff --git a/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
new file mode 100644
index 0000000..be95959
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+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/4"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-optional-tests.patch
+	"${FILESDIR}"/${P}-xmltest.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TEST=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+	./xmltest || die "Tests failed"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tinyxml2/, dev-libs/tinyxml2/files/
@ 2016-08-18  5:18 Tim Harder
  0 siblings, 0 replies; 5+ messages in thread
From: Tim Harder @ 2016-08-18  5:18 UTC (permalink / raw
  To: gentoo-commits

commit:     33542759d0dbd740d91cb251d1ef727c8e4fa239
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 05:18:06 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 05:18:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33542759

dev-libs/tinyxml2: remove old

 dev-libs/tinyxml2/Manifest                         |  1 -
 ...nyxml2-1.0.1_p20120531-test-return-status.patch |  9 ------
 dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild  | 35 ----------------------
 3 files changed, 45 deletions(-)

diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index f98ef54..5ba6a8f 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,3 +1,2 @@
-DIST tinyxml2-1.0.9_p20121123.tar.bz2 91204 SHA256 894b6b1136c86cc98bff77892ca077726b470432e871ca8c8c605177047272ea SHA512 054342b51141771c7611ae5aeb6ea332c42dff603aa6747f802d02bd010cad4b5c84fadf976576d2a604f1cccc7afe95ff23682a98c9294b032c94aa48b09aaf WHIRLPOOL 9aa505e7794b1fe1919b185d2080e63f3b01f44d2daeba94b7da6701f4931ec9188c0f92c9db9c6e8ac02772ef85f582b3a5d64227fd7b353da0a258c8a72eb7
 DIST tinyxml2-2.2.0.tar.gz 455226 SHA256 f891224f32e7a06bf279290619cec80cc8ddc335c13696872195ffb87f5bce67 SHA512 e06edb46f96dcc58cf16c8fef91dd072c9bd6dd296bb9ba3e082db059438f5f31e0689015deee7f1c390788d9bd0e64b6f5c0235c9d2839419ee2ab1784f53c4 WHIRLPOOL 6310e1492b180cc1a74f856dbf78897c5db7777d44ffd5ef785f85fb87a91462479a9da006d93ad7157763416863ed623b14cfc8d99f35494335de7252cda754
 DIST tinyxml2-4.0.1.tar.gz 344295 SHA256 14b38ef25cc136d71339ceeafb4856bb638d486614103453eccd323849267f20 SHA512 4add31a72c62b3f68bdb17fb90630bc51bf96b616f4beafb413082dc77bc699b8d516fa0955d001d5d69bc3371b7ca9ce5cd9696d91dd913b09a1c10681b819e WHIRLPOOL 76fd8f6d15f73845b1051385aaff64d33263639cc630eaaf2563d6f1c3fca1ffae277d7c540197c6eee65ac4429ac6f1f0541ab99520cf809afd655fbdacc9ab

diff --git a/dev-libs/tinyxml2/files/tinyxml2-1.0.1_p20120531-test-return-status.patch b/dev-libs/tinyxml2/files/tinyxml2-1.0.1_p20120531-test-return-status.patch
deleted file mode 100644
index 49d7d83..0000000
--- a/dev-libs/tinyxml2/files/tinyxml2-1.0.1_p20120531-test-return-status.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- tinyxml2-1.0.1_p20120531/xmltest.cpp
-+++ tinyxml2-1.0.1_p20120531/xmltest.cpp
-@@ -895,5 +895,5 @@
- 	#endif
- 
- 	printf ("\nPass %d, Fail %d\n", gPass, gFail);
--	return 0;
-+	return gFail;
- }

diff --git a/dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild b/dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild
deleted file mode 100644
index afc5e95..0000000
--- a/dev-libs/tinyxml2/tinyxml2-1.0.9_p20121123.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8.5"
-
-inherit cmake-utils
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/"
-SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${PN}-1.0.1_p20120531-test-return-status.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-		$(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./test || die "Tests failed"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tinyxml2/, dev-libs/tinyxml2/files/
@ 2018-09-07 20:34 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-09-07 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1dcd74707ec445b08636fee5d4a9f815bc8edf0f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 19:28:23 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  7 20:33:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcd7470

dev-libs/tinyxml2: Drop old

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 dev-libs/tinyxml2/Manifest                         |  5 ----
 .../files/tinyxml2-1.0.9_p20121123-test.patch      | 20 -------------
 .../files/tinyxml2-4.0.1-optional-tests.patch      | 30 --------------------
 .../tinyxml2/files/tinyxml2-4.0.1-xmltest.patch    | 11 --------
 dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild            | 32 ---------------------
 dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild            | 28 ------------------
 dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild            | 33 ----------------------
 dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild            | 23 ---------------
 dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild            | 23 ---------------
 9 files changed, 205 deletions(-)

diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index fe732aaae0e..09ad0b3d7bd 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,6 +1 @@
-DIST tinyxml2-2.2.0.tar.gz 455226 BLAKE2B b3e76f0cda38ad01186b85ffadc554398edaf593624b869a7954ddf4aebe484abf95596fc4e7e11c622a1a23716d38d117035237c8e2f3d4e1f2fbe5551199ce SHA512 e06edb46f96dcc58cf16c8fef91dd072c9bd6dd296bb9ba3e082db059438f5f31e0689015deee7f1c390788d9bd0e64b6f5c0235c9d2839419ee2ab1784f53c4
-DIST tinyxml2-3.0.0.tar.gz 339620 BLAKE2B 02c083462779467a40a30922b224634179d7feee19191a36d6106962e59d3cf2e29e6080628bd89881241d0010355bad619d8f47a31a0139bed219cd3476195b SHA512 724f1f6ea9bbc74b679067dfe69d156eb05f5d4a694cd825814b717dd676fe53ddc8707e0512a0c8449bb13586cc4bc085bbaca41bf8e29c304c5fafae53b1d2
-DIST tinyxml2-4.0.1.tar.gz 344295 BLAKE2B 58044e7898b4004aa0c1ec4b65d11a75c7a85568665baff419a23ac096596bf424c49d13318bee43c467de2e722c21ac3304eab8978e7ca3602e68a83fad4ac5 SHA512 4add31a72c62b3f68bdb17fb90630bc51bf96b616f4beafb413082dc77bc699b8d516fa0955d001d5d69bc3371b7ca9ce5cd9696d91dd913b09a1c10681b819e
-DIST tinyxml2-5.0.1.tar.gz 349622 BLAKE2B 13cec7ee49ad2fc2e74ce993e27de96fba45ed599b38a2d08463c2b6513be862e9f5f6c425549f0f07ee81e6fc8dc0ca1056295929c862b9da628d507dc9a3a1 SHA512 a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba
-DIST tinyxml2-6.0.0.tar.gz 576612 BLAKE2B e7ad757edae2d07504b76821caf7a68a8dcac90fc90dc3d0a2fedd082297e522e5cc1f294ba31f14c6046d9742a09e16a046f6d283d7e1ed165d8d35703c6cb2 SHA512 30c68f491830187738b01ca5db1a96e7b4907cf8fa09a533c90ea084ab5e73f798dff6305cfc4edccc8989926e91c0482677bb5796799113c839dbd0528c8ad5
 DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1

diff --git a/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch b/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch
deleted file mode 100644
index a6842eecb6e..00000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tinyxml2-1.0.9_p20121123/CMakeLists.txt
-+++ tinyxml2-1.0.9_p20121123/CMakeLists.txt
-@@ -55,10 +55,13 @@
- 	VERSION "${GENERIC_LIB_VERSION}"
- 	SOVERSION "${GENERIC_LIB_SOVERSION}")
- 
--add_executable(test xmltest.cpp)
--add_dependencies(test tinyxml2)
--add_dependencies(test ${TARGET_DATA_COPY})
--target_link_libraries(test tinyxml2)
-+set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests")
-+if(BUILD_TEST)
-+	add_executable(test xmltest.cpp)
-+	add_dependencies(test tinyxml2)
-+	add_dependencies(test ${TARGET_DATA_COPY})
-+	target_link_libraries(test tinyxml2)
-+endif(BUILD_TEST)
- 
- 
- if(BUILD_STATIC_LIBS)

diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
deleted file mode 100644
index 95e849fdc8f..00000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- tinyxml2-4.0.1/CMakeLists.txt
-+++ tinyxml2-4.0.1/CMakeLists.txt
-@@ -100,15 +100,18 @@
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
--add_executable(xmltest xmltest.cpp)
--if(BUILD_SHARED_LIBS)
--   add_dependencies(xmltest tinyxml2)
--   add_dependencies(xmltest ${TARGET_DATA_COPY})
--   target_link_libraries(xmltest tinyxml2)
--else(BUILD_STATIC_LIBS)
--   add_dependencies(xmltest tinyxml2_static)
--   add_dependencies(xmltest ${TARGET_DATA_COPY})
--   target_link_libraries(xmltest tinyxml2_static)
-+set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests")
-+if(BUILD_TEST)
-+	add_executable(xmltest xmltest.cpp)
-+	if(BUILD_SHARED_LIBS)
-+		add_dependencies(xmltest tinyxml2)
-+		add_dependencies(xmltest ${TARGET_DATA_COPY})
-+		target_link_libraries(xmltest tinyxml2)
-+	else(BUILD_STATIC_LIBS)
-+		add_dependencies(xmltest tinyxml2_static)
-+		add_dependencies(xmltest ${TARGET_DATA_COPY})
-+		target_link_libraries(xmltest tinyxml2_static)
-+	endif()
- endif()
- install(TARGETS DESTINATION ${CMAKE_INSTALL_BINDIR})
- 

diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
deleted file mode 100644
index 94b2668a1a4..00000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tinyxml2-4.0.1/xmltest.cpp
-+++ tinyxml2-4.0.1/xmltest.cpp
-@@ -1618,7 +1618,7 @@
- 
- 		FILE* perfFP = fopen("resources/dream.xml", "r");
- 		fseek(perfFP, 0, SEEK_END);
--		long size = ftell(fp);
-+		long size = ftell(perfFP);
- 		fseek(perfFP, 0, SEEK_SET);
- 
- 		char* mem = new char[size + 1];

diff --git a/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild
deleted file mode 100644
index 650e51c55b0..00000000000
--- a/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-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/2"
-KEYWORDS="amd64 arm hppa sparc x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9_p20121123-test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-		$(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./test || die "Tests failed"
-}

diff --git a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
deleted file mode 100644
index 6d692c8193b..00000000000
--- a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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/3"
-KEYWORDS="amd64 ~arm ~hppa sparc ~x86"
-IUSE="static-libs test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./xmltest || die "Tests failed"
-}

diff --git a/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
deleted file mode 100644
index ef4b25aabab..00000000000
--- a/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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/4"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-optional-tests.patch
-	"${FILESDIR}"/${P}-xmltest.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./xmltest || die "Tests failed"
-}

diff --git a/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild
deleted file mode 100644
index 29d2f704db5..00000000000
--- a/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-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/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
deleted file mode 100644
index adc1f1a46ed..00000000000
--- a/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-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/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tinyxml2/, dev-libs/tinyxml2/files/
@ 2023-07-11  4:35 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-07-11  4:35 UTC (permalink / raw
  To: gentoo-commits

commit:     942655e1b33d88253997d5a1174fff8e3d0c9230
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Thu Jun  8 15:23:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 04:34:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942655e1

dev-libs/tinyxml2: Fix build with musl 1.2.4

Closes: https://bugs.gentoo.org/905999
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31356
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch | 51 ++++++++++++++++++++++
 dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild         |  4 ++
 2 files changed, 55 insertions(+)

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
new file mode 100644
index 000000000000..2670d4ffa913
--- /dev/null
+++ b/dev-libs/tinyxml2/files/tinyxml2-9.0.0-musl-1.2.4.patch
@@ -0,0 +1,51 @@
+Bug: https://bugs.gentoo.org/905999
+Upstream: https://leethomason/tinyxml2/pull/945
+
+From dfcb914e8bbbb2dca146a3cee62f66fff7ea163b Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+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
index c7e2537dcb14..628efc0dcde4 100644
--- a/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild
@@ -16,6 +16,10 @@ 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)


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/tinyxml2/, dev-libs/tinyxml2/files/
@ 2024-10-04 17:37 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 17:37 UTC (permalink / raw
  To: gentoo-commits

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 <vimproved@inventati.org>
-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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-04 17:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-11  4:35 [gentoo-commits] repo/gentoo:master commit in: dev-libs/tinyxml2/, dev-libs/tinyxml2/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-10-04 17:37 Andreas Sturmlechner
2018-09-07 20:34 Andreas Sturmlechner
2016-08-18  5:18 Tim Harder
2016-08-04  3:52 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox