commit: 367d4e370678a1f9048d183cde7270a4a46a6729 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri Dec 18 09:49:14 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Dec 18 09:52:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367d4e37
dev-util/edb-debugger: drop old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-util/edb-debugger/Manifest | 1 - dev-util/edb-debugger/edb-debugger-1.2.0.ebuild | 54 ---------------------- .../files/edb-debugger-1.2.0-gcc-11.patch | 48 ------------------- .../files/edb-debugger-1.2.0-qt-5.15.patch | 20 -------- 4 files changed, 123 deletions(-) diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest index 7f5e52e234c..3b276413868 100644 --- a/dev-util/edb-debugger/Manifest +++ b/dev-util/edb-debugger/Manifest @@ -1,2 +1 @@ -DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9 DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild deleted file mode 100644 index 4d27f38f986..00000000000 --- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" -HOMEPAGE="https://github.com/eteran/edb-debugger"; -SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="graphviz" - -RDEPEND=" - dev-libs/capstone:= - dev-libs/double-conversion - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - graphviz? ( media-gfx/graphviz ) -" - -DEPEND=" - dev-libs/boost - virtual/pkgconfig - ${RDEPEND} -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch - "${FILESDIR}"/${PN}-1.2.0-gcc-11.patch -) - -S=${WORKDIR}/${PN} - -src_prepare() { - #Make the desktop's entries somewhat better - sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die - sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die - - if ! use graphviz; then - sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die - fi - - cmake_src_prepare -} diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch deleted file mode 100644 index 68d58b2b90e..00000000000 --- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://github.com/eteran/edb-debugger/pull/776 - -From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Fri, 11 Sep 2020 07:57:39 +0100 -Subject: [PATCH] x86-generic/PlatformThread.cpp: avoid non-constant offsetof - -On gcc-11 edb-debugger build fails as: - -``` -.../x86-generic/PlatformThread.cpp:332:79: error: 'n' is not a constant expression - 332 | return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value); - | ^ -``` - -The change workarounds by avoiding non-constant expression: -https://gcc.gnu.org/PR95942 - -Signed-off-by: Sergei Trofimovich <[email protected]> ---- - .../unix/linux/arch/x86-generic/PlatformThread.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp -+++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp -@@ -318,7 +318,8 @@ edb::address_t PlatformThread::instructionPointer() const { - * @return - */ - unsigned long PlatformThread::getDebugRegister(std::size_t n) { -- return ptrace(PTRACE_PEEKUSER, tid_, offsetof(struct user, u_debugreg[n]), 0); -+ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]); -+ return ptrace(PTRACE_PEEKUSER, tid_, drOffset, 0); - } - - /** -@@ -328,7 +329,8 @@ unsigned long PlatformThread::getDebugRegister(std::size_t n) { - * @return - */ - long PlatformThread::setDebugRegister(std::size_t n, unsigned long value) { -- return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value); -+ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]); -+ return ptrace(PTRACE_POKEUSER, tid_, drOffset, value); - } - - /** --- -2.28.0 - diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch deleted file mode 100644 index 795cb8fce68..00000000000 --- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/727530 -https://github.com/eteran/edb-debugger/pull/766 - -Fix build failure on qt-5.15. Typical build error is: - -src/widgets/QDisassemblyView.cpp:1503:17: - error: aggregate ‘QPainterPath path’ has incomplete type and cannot be defined - 1503 | QPainterPath path; - | ^~~~ - ---- a/src/widgets/QDisassemblyView.h -+++ b/src/widgets/QDisassemblyView.h -@@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. - #include <QAbstractScrollArea> - #include <QAbstractSlider> - #include <QCache> -+#include <QPainterPath> - #include <QPixmap> - #include <QSvgRenderer> -
