[gentoo-commits] repo/gentoo:master commit in: dev-util/breakpad/, dev-util/breakpad/files/
commit: 891282ee23ea491f4212b9b4ccb95a807205af99 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Oct 29 20:39:28 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Oct 29 20:39:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891282ee dev-util/breakpad: add 2023.01.27 Closes: https://bugs.gentoo.org/916215 Signed-off-by: Alfredo Tupone gentoo.org> dev-util/breakpad/Manifest | 1 + dev-util/breakpad/breakpad-2023.01.27.ebuild | 55 ++ .../files/breakpad-2023.01.27-gentoo.patch | 119 + 3 files changed, 175 insertions(+) diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest index b17d5765b09e..71ea12e876ac 100644 --- a/dev-util/breakpad/Manifest +++ b/dev-util/breakpad/Manifest @@ -1 +1,2 @@ DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f +DIST breakpad-2023.01.27.tar.gz 5455242 BLAKE2B 650f9c2ff4ee5e50f9d51573706757cc56a4d64171a5aea7b825327c55b05b9122d375e718951eee26c2bde7aae69d385205fa777fa23e61e5c97683f3c76120 SHA512 c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4 diff --git a/dev-util/breakpad/breakpad-2023.01.27.ebuild b/dev-util/breakpad/breakpad-2023.01.27.ebuild new file mode 100644 index ..398f79e86f23 --- /dev/null +++ b/dev-util/breakpad/breakpad-2023.01.27.ebuild @@ -0,0 +1,55 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="implement a crash-reporting system." +HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/; +SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.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 )" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's|"third_party/lss\(.*\)"||' \ + $(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/files/breakpad-2023.01.27-gentoo.patch b/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch new file mode 100644 index ..83a4e824c970 --- /dev/null +++ b/dev-util/breakpad/files/breakpad-2023.01.27-gentoo.patch @@ -0,0 +1,119 @@ +--- a/src/common/linux/libcurl_wrapper.h 2022-06-07 21:55:00.387396660 +0200 b/src/common/linux/libcurl_wrapper.h 2022-06-07 21:55:18.450145751 +0200 +@@ -36,7 +36,7 @@ + #include + + #include "common/using_std_string.h" +-#include "third_party/curl/curl.h" ++#include + + namespace google_breakpad { + +--- a/src/common/linux/http_upload.cc 2022-06-07 21:53:55.505298529 +0200 b/src/common/linux/http_upload.cc 2022-06-07 21:54:17.944986506 +0200 +@@ -30,7 +30,7 @@ + + #include + #include +-#include "third_party/curl/curl.h" ++#include + + namespace { + +--- a/src/processor/disassembler_x86.h 2022-06-08 08:41:45.569686249 +0200 b/src/processor/disassembler_x86.h 2022-06-08 08:42:09.049377873 +0200 +@@ -42,7 +42,7 @@ + #include "google_breakpad/common/breakpad_types.h" + + namespace libdis { +-#include "third_party/libdisasm/libdis.h" ++#include + } + + namespace google_breakpad { +--- a/Makefile.am 2022-06-08 08:51:35.221948155 +0200 b/Makefile.am 2022-06-08 08:53:21.679551745 +0200 +@@ -176,7 +176,6 @@ + + lib_LIBRARIES += src/libbreakpad.a + pkgconfig_DATA += breakpad.pc +-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a + + ## Programs + bin_PROGRAMS += \ +@@ -944,7 +943,7 @@ + src/processor/stackwalker_x86.o \ + src/processor/symbolic_constants_win.o \ + src/processor/tokenize.o \ +- src/third_party/libdisasm/libdisasm.a \ ++ -ldisasm \ + $(TEST_LIBS) \ + $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) + +@@ -967,7 +966,7 @@ + $(AM_CPPFLAGS) $(TEST_CFLAGS) + src_processor_disassembler_x86_unittest_LDADD = \ + src/processor/disassembler_x86.o \ +-
[gentoo-commits] repo/gentoo:master commit in: dev-util/breakpad/, dev-util/breakpad/files/
commit: 30338cce2bd18f35a1ab8d31a60285b7f79a3a66 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Mar 11 07:56:18 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Mar 11 07:57:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30338cce dev-util/breakpad: fix for gcc13, remove old Closes: https://bugs.gentoo.org/898576 Signed-off-by: Alfredo Tupone gentoo.org> dev-util/breakpad/Manifest | 1 - dev-util/breakpad/breakpad-2022.06.04.ebuild | 59 -- dev-util/breakpad/breakpad-2022.07.12.ebuild | 1 + .../breakpad/files/breakpad-2022.06.04-test.patch | 49 -- .../breakpad/files/breakpad-2022.07.12-gcc13.patch | 10 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.. --- 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\(.*\)"||' \ - $(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.. --- 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.cc2022-06-06 21:31:46.537946012 +0200 -+++ b/src/common/dwarf_cu_to_module_unittest.cc2022-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",