dev-util/breakpad: fix for gcc13, remove old

Closes: https://bugs.gentoo.org/898576
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>

5 files changed, 11 insertions, 109 deletions

diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index c40a261b2261..b17d5765b09e 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1,2 +1 @@
-DIST breakpad-2022.06.04.tar.gz 5365322 BLAKE2B eec33092a9a75161d16554af22276195945f3e1c7ce9590f89010a4d11484fe4327849c1717e159a9e019ca44d437b601b7080c68bba8c95111b97d6662dfc3f SHA512 150e5e955dc9de55d5cb4c726ae6f1a2e79e9f7bb283bae2ba835b684e7fd7532a7070e9ba982b66b68c936592bc48550a22ed8ac40e829b11aa80530f338749
 DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
diff --git a/dev-util/breakpad/breakpad-2022.06.04.ebuild b/dev-util/breakpad/breakpad-2022.06.04.ebuild
deleted file mode 100644
index 66912e949d83..000000000000
--- a/dev-util/breakpad/breakpad-2022.06.04.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-CommitId=41a11409d6ba04e308adc66f5a33115e2d7c9174
-DESCRIPTION="implement a crash-reporting system."
-HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/"
-SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD BSD-4"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	net-misc/curl
-"
-DEPEND="${RDEPEND}
-	dev-libs/linux-syscall-support
-	dev-embedded/libdisasm
-"
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's|"third_party/lss\(.*\)"|<lss\1>|' \
-		$(find src -name '*.cc' -o -name '*.h') \
-		|| die
-	sed -i \
-		-e '/includelss/d' \
-		-e '/third_party\/curl/d' \
-		Makefile.am \
-		|| die
-	sed -i \
-		-e "/AC_INIT/s:0.1:${PVR}:" \
-		-e "/AS_VAR_APPEND/d" \
-		configure.ac \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-system-test-libs \
-		|| die
-}
diff --git a/dev-util/breakpad/breakpad-2022.07.12.ebuild b/dev-util/breakpad/breakpad-2022.07.12.ebuild
index 5fb691383145..eac86e3033e5 100644
--- a/dev-util/breakpad/breakpad-2022.07.12.ebuild
+++ b/dev-util/breakpad/breakpad-2022.07.12.ebuild
@@ -26,6 +26,7 @@ BDEPEND="test? ( dev-cpp/gtest )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-gcc13.patch
 	"${FILESDIR}"/${PN}-2022.06.04-gentoo.patch
 )
 
diff --git a/dev-util/breakpad/files/breakpad-2022.06.04-test.patch b/dev-util/breakpad/files/breakpad-2022.06.04-test.patch
deleted file mode 100644
index 7bf1d78290ab..000000000000
--- a/dev-util/breakpad/files/breakpad-2022.06.04-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/common/dwarf_cu_to_module_unittest.cc	2022-06-06 21:31:46.537946012 +0200
-+++ b/src/common/dwarf_cu_to_module_unittest.cc	2022-06-06 21:33:27.299716909 +0200
-@@ -780,7 +780,7 @@
-                0x2805c4531be6ca0eULL, 0x686b52155a8d4d2cULL);
- }
- 
--TEST_F(SimpleCU, UnknownAbstractOrigin) {
-+TEST_F(SimpleCU, DISABLED_UnknownAbstractOrigin) {
-   EXPECT_CALL(reporter_, UnknownAbstractOrigin(_, 1ULL)).WillOnce(Return());
-   EXPECT_CALL(reporter_, UnnamedFunction(0x11c70f94c6e87ccdLL))
-     .WillOnce(Return());
-@@ -798,7 +798,7 @@
-                0x1758a0f941b71efbULL, 0x1cf154f1f545e146ULL);
- }
- 
--TEST_F(SimpleCU, UnnamedFunction) {
-+TEST_F(SimpleCU, DISABLED_UnnamedFunction) {
-   EXPECT_CALL(reporter_, UnnamedFunction(0xe34797c7e68590a8LL))
-     .WillOnce(Return());
-   PushLine(0x72b80e41a0ac1d40ULL, 0x537174f231ee181cULL, "line-file", 14044850);
-@@ -1573,7 +1573,7 @@
-   EXPECT_STREQ("class_A::member_func_B", functions[0]->name.str().c_str());
- }
- 
--TEST_F(Specifications, UnhandledInterCU) {
-+TEST_F(Specifications, DISABLED_UnhandledInterCU) {
-   Module m("module-name", "module-os", "module-arch", "module-id");
-   DwarfCUToModule::FileContext fc("dwarf-filename", &m, false);
-   EXPECT_CALL(reporter_, UncoveredFunction(_)).WillOnce(Return());
-@@ -1630,7 +1630,7 @@
-   }
- }
- 
--TEST_F(Specifications, BadOffset) {
-+TEST_F(Specifications, DISABLED_BadOffset) {
-   PushLine(0xa0277efd7ce83771ULL, 0x149554a184c730c1ULL, "line-file", 56636272);
-   EXPECT_CALL(reporter_, UnknownSpecification(_, 0x2be953efa6f9a996ULL))
-     .WillOnce(Return());
---- a/src/common/module_unittest.cc	2022-06-06 21:33:46.167486242 +0200
-+++ b/src/common/module_unittest.cc	2022-06-06 21:34:02.480286684 +0200
-@@ -427,7 +427,7 @@
-                contents.c_str());
- }
- 
--TEST(Construct, FunctionsWithSameAddress) {
-+TEST(Construct, DISABLED_FunctionsWithSameAddress) {
-   stringstream s;
-   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
- 
diff --git a/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch b/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch
new file mode 100644
index 000000000000..9f989bf2907a
--- /dev/null
+++ b/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch
@@ -0,0 +1,10 @@
+--- a/src/client/linux/handler/minidump_descriptor.h	2023-03-11 08:49:06.385815254 +0100
++++ b/src/client/linux/handler/minidump_descriptor.h	2023-03-11 08:49:42.758139412 +0100
+@@ -33,6 +33,7 @@
+ #include <assert.h>
+ #include <sys/types.h>
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "client/linux/handler/microdump_extra_info.h"