From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- dev-util/edb-debugger/Manifest | 6 +-- dev-util/edb-debugger/edb-debugger-1.2.0.ebuild | 54 ---------------------- dev-util/edb-debugger/edb-debugger-1.3.0.ebuild | 49 ++++++++++++++++++++ .../files/edb-debugger-1.2.0-gcc-11.patch | 48 ------------------- .../files/edb-debugger-1.2.0-qt-5.15.patch | 20 -------- 5 files changed, 51 insertions(+), 126 deletions(-) delete mode 100644 dev-util/edb-debugger/edb-debugger-1.2.0.ebuild create mode 100644 dev-util/edb-debugger/edb-debugger-1.3.0.ebuild delete mode 100644 dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch delete mode 100644 dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch (limited to 'dev-util/edb-debugger') diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest index f12b2c88ff0b..152528119e77 100644 --- a/dev-util/edb-debugger/Manifest +++ b/dev-util/edb-debugger/Manifest @@ -1,6 +1,4 @@ -AUX edb-debugger-1.2.0-gcc-11.patch 1849 BLAKE2B 5d9fa2dbd7738752bf95453442f0c1726fa395c2126bc0e4c8a2b7d9970e73c88334627938baf07d229937aac4de8ed13bf764e57d636df607262982fe1ae7a2 SHA512 e3eefa58075bb509b0d4721cd3484e4dd5ef38c180b5cc93c1ebef77a7c6f39eb0260566afbf288f65d8edc9c778e3c4fe872cfa961c9c33e8b268324aeb1736 -AUX edb-debugger-1.2.0-qt-5.15.patch 635 BLAKE2B b5f575f009bd81e5a9e7feb580e706b06e67f11dc0aba8a7c7473f2d1dd944bf6d56079e405403c8b64ee52c5e9e45d019c0219b2a90689cfab1fad41c3c70a3 SHA512 dc1a56a5b4e2d86bf4dd96bebd3e4272fe3c933fe462810028905e32be1056b7720c78443a5b7f82b266f204b10dd0fd8e3c77b68859dc1666cf73ec5047c6d6 -DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9 -EBUILD edb-debugger-1.2.0.ebuild 1220 BLAKE2B 6a0bcf405c881062268b85b047b13fc71d3b2d0f134b97dbd0544ffa54761f84d20414276295048c3cbe2618e13e41cfb0007d18c6497691bdd4f1963d873dfb SHA512 bfba99aa6125d3ce9b968ad03550c7502d6d5c6f95354a858e4aa1cfe5a35cb7eba873a317caefa5d84f7a6f00c6d2e5ea8c3e7427be70b6930f2a162b89f267 +DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d +EBUILD edb-debugger-1.3.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929 MISC metadata.xml 358 BLAKE2B eae911d14bc54d81aaf32eee088708b75027fe67c1dd9458ffeb1af3ecc429bbfa51805aab9a3ecbf8bfbc8e221b6411423852fc2fc61381ca381a61869521be SHA512 da7c4e88f58521bf9521b060b328498aa8e30be151671f5d81bbc15695e23b9a0bd75f7a98cee91866ccc4347d0fc18dd76259a8ac244bf5d0e9826b6cb8ca1e 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 4d27f38f9869..000000000000 --- 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/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild new file mode 100644 index 000000000000..21c906d48591 --- /dev/null +++ b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild @@ -0,0 +1,49 @@ +# 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} +" + +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 68d58b2b90eb..000000000000 --- 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 -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 ---- - .../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 795cb8fce681..000000000000 --- 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 . - #include - #include - #include -+#include - #include - #include - -- cgit v1.2.3