* [gentoo-commits] repo/gentoo:master commit in: dev-util/edb-debugger/, dev-util/edb-debugger/files/
@ 2019-12-07 18:02 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2019-12-07 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 58252a6ffe48778d7dcfd2ca86894dac68f7e4ce
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 18:00:01 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 18:00:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58252a6f
dev-util/edb-debugger: fix manpage install path, bug #701080
While at it mode to EAPI=7
Closes: https://bugs.gentoo.org/701080
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild | 48 ++++++++++++++++++++++
.../files/edb-debugger-1.0.0-man1.patch | 21 ++++++++++
2 files changed, 69 insertions(+)
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
new file mode 100644
index 00000000000..97f78c594be
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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-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}"/${P}-man1.patch)
+
+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-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
new file mode 100644
index 00000000000..92625ac3701
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/701080
+
+From c84c5a28adaacaeee65a20e1bd8a90762cbe843c Mon Sep 17 00:00:00 2001
+From: Ruslan Kabatsayev <b7.10110111@gmail.com>
+Date: Thu, 5 Jul 2018 23:45:03 +0300
+Subject: [PATCH] Fix installation path of the man page
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,6 +123,6 @@ endif()
+ add_subdirectory(src)
+ add_subdirectory(plugins)
+
+-install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
++install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ install (FILES ${CMAKE_SOURCE_DIR}/edb.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/)
+ install (FILES ${CMAKE_SOURCE_DIR}/src/images/edb.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/edb-debugger/, dev-util/edb-debugger/files/
@ 2019-12-07 18:08 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2019-12-07 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 719a5c644cd901c387139cb6bf9bb110f27bbb3c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 18:07:25 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 18:07:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719a5c64
dev-util/edb-debugger: add missing climits header, bug #701112
Picked upstream f5e0bce1c1d3 commit ("fix for issue #719").
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/701112
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild | 5 ++++-
.../files/edb-debugger-1.0.0-climits.patch | 24 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
index 97f78c594be..c5dadbd7bf7 100644
--- a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
@@ -33,7 +33,10 @@ DEPEND="
${RDEPEND}
"
-PATCHES=("${FILESDIR}"/${P}-man1.patch)
+PATCHES=(
+ "${FILESDIR}"/${P}-man1.patch
+ "${FILESDIR}"/${P}-climits.patch
+)
src_prepare() {
#Make the desktop's entries somewhat better
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
new file mode 100644
index 00000000000..929492ae670
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/701112
+
+From f5e0bce1c1d33e11062fd61a3bbad52ee18e8a8b Mon Sep 17 00:00:00 2001
+From: Evan Teran <evan.teran@gmail.com>
+Date: Mon, 15 Jul 2019 14:44:25 -0400
+Subject: [PATCH] fix for issue #719
+
+---
+ src/ByteShiftArray.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/ByteShiftArray.cpp
++++ b/src/ByteShiftArray.cpp
+@@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ #include "ByteShiftArray.h"
++#include <climits>
+
+ //------------------------------------------------------------------------------
+ // Name: ByteShiftArray
+--
+2.24.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/edb-debugger/, dev-util/edb-debugger/files/
@ 2020-06-08 17:46 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-06-08 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 72be8cee8b4fb6b8a2632ca7ad035409ff3b9c40
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 17:45:43 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 17:45:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72be8cee
dev-util/edb-debugger: tweak for qt-5.15
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/727530
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/edb-debugger/edb-debugger-1.2.0.ebuild | 2 ++
.../files/edb-debugger-1.2.0-qt-5.15.patch | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
index 21c906d4859..9fd3eb915ec 100644
--- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
@@ -34,6 +34,8 @@ DEPEND="
${RDEPEND}
"
+PATCHES=("${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch)
+
S=${WORKDIR}/${PN}
src_prepare() {
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
new file mode 100644
index 00000000000..795cb8fce68
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
@@ -0,0 +1,20 @@
+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>
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/edb-debugger/, dev-util/edb-debugger/files/
@ 2020-10-31 10:16 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-10-31 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 9444dcb0033689a493c681a8f5ce5660bc143df8
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 10:16:16 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 10:16:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9444dcb0
dev-util/edb-debugger: backport gcc-11 fix
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-util/edb-debugger/edb-debugger-1.2.0.ebuild | 5 ++-
.../files/edb-debugger-1.2.0-gcc-11.patch | 48 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
index 9fd3eb915ec..4d27f38f986 100644
--- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
@@ -34,7 +34,10 @@ DEPEND="
${RDEPEND}
"
-PATCHES=("${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch)
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch
+ "${FILESDIR}"/${PN}-1.2.0-gcc-11.patch
+)
S=${WORKDIR}/${PN}
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
new file mode 100644
index 00000000000..68d58b2b90e
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
@@ -0,0 +1,48 @@
+https://github.com/eteran/edb-debugger/pull/776
+
+From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+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 <slyfox@gentoo.org>
+---
+ .../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
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/edb-debugger/, dev-util/edb-debugger/files/
@ 2022-05-07 4:20 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-07 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 1ec95586a5708ea3652b1f6893204d0f55281ece
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 04:00:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 7 04:00:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec95586
dev-util/edb-debugger: fix build with GCC 12
Closes: https://bugs.gentoo.org/841839
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/edb-debugger/edb-debugger-1.3.0.ebuild | 24 +++---
.../files/edb-debugger-1.3.0-gcc12.patch | 88 ++++++++++++++++++++++
2 files changed, 99 insertions(+), 13 deletions(-)
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
index 21c906d48591..e550d9ad3f47 100644
--- a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,14 +8,14 @@ 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"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="graphviz"
-RDEPEND="
- dev-libs/capstone:=
+RDEPEND="dev-libs/capstone:=
dev-libs/double-conversion
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -25,19 +25,17 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
- graphviz? ( media-gfx/graphviz )
-"
+ graphviz? ( media-gfx/graphviz )"
+DEPEND="dev-libs/boost
+ ${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-DEPEND="
- dev-libs/boost
- virtual/pkgconfig
- ${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc12.patch
+)
src_prepare() {
- #Make the desktop's entries somewhat better
+ # 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
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch
new file mode 100644
index 000000000000..df037193310f
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.3.0-gcc12.patch
@@ -0,0 +1,88 @@
+https://github.com/eteran/edb-debugger/commit/da04c339559f82257ff54ea62b1d403ee98c1ba0
+https://bugs.gentoo.org/841839
+
+From da04c339559f82257ff54ea62b1d403ee98c1ba0 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sat, 2 Apr 2022 22:36:50 +0000
+Subject: [PATCH] Gcc 12 includes fix (#815)
+
+* RegisterViewModelBase.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+ [ 20%] Building CXX object src/CMakeFiles/edb.dir/RegisterViewModelBase.cpp.o
+ In file included from edb-debugger/src/RegisterViewModelBase.cpp:18:
+ edb-debugger/include/RegisterViewModelBase.h:162:14: error:
+ 'unique_ptr' in namespace 'std' does not name a template type
+ 162 | std::unique_ptr<CategoriesHolder> rootItem;
+ | ^~~~~~~~~~
+ edb-debugger/include/RegisterViewModelBase.h:9:1: note:
+ 'std::unique_ptr' is defined in header '<memory>';
+ did you forget to '#include <memory>'?
+ 8 | #include <deque>
+ +++ |+#include <memory>
+
+* State.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+ [ 21%] Building CXX object src/CMakeFiles/edb.dir/State.cpp.o
+ In file included from edb-debugger/src/State.cpp:19:
+ edb-debugger/include/State.h:93:14:
+ error: 'unique_ptr' in namespace 'std' does not name a template type
+ 93 | std::unique_ptr<IState> impl_;
+ | ^~~~~~~~~~
+ edb-debugger/include/State.h:24:1:
+ note: 'std::unique_ptr' is defined in header '<memory>';
+ did you forget to '#include <memory>'?
+ 23 | #include "Types.h"
+ +++ |+#include <memory>
+ 24 |
+
+* IState.h: add <memory> for unique_ptr
+
+Without the change gcc-12 fails to build edb-debugger as:
+
+ [ 69%] Building CXX object plugins/DebuggerCore/CMakeFiles/DebuggerCore.dir/unix/linux/arch/x86-generic/PlatformState.cpp.o
+ In file included from edb-debugger/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformState.h:22,
+ from edb-debugger/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformState.cpp:19:
+ edb-debugger/include/IState.h:33:22:
+ error: 'unique_ptr' in namespace 'std' does not name a template type
+ 33 | virtual std::unique_ptr<IState> clone() const = 0;
+ | ^~~~~~~~~~
+ edb-debugger/include/IState.h:23:1:
+ note: 'std::unique_ptr' is defined in header '<memory>';
+ did you forget to '#include <memory>'?
+ 22 | #include "Register.h"
+ +++ |+#include <memory>
+ 23 | #include "Types.h"
+--- a/include/IState.h
++++ b/include/IState.h
+@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #ifndef ISTATE_H_20110315_
+ #define ISTATE_H_20110315_
+
++#include <memory>
+ #include "Register.h"
+ #include "Types.h"
+
+--- a/include/RegisterViewModelBase.h
++++ b/include/RegisterViewModelBase.h
+@@ -6,6 +6,7 @@
+ #include "util/Integer.h"
+ #include <QAbstractItemModel>
+ #include <deque>
++#include <memory>
+ #include <vector>
+
+ Q_DECLARE_METATYPE(std::vector<NumberDisplayMode>)
+--- a/include/State.h
++++ b/include/State.h
+@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #ifndef STATE_H_20060715_
+ #define STATE_H_20060715_
+
++#include <memory>
+ #include "API.h"
+ #include "Types.h"
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/edb-debugger/, dev-util/edb-debugger/files/
@ 2022-09-13 16:56 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-09-13 16:56 UTC (permalink / raw
To: gentoo-commits
commit: b044751f25eeeeabe1e9c636b2c071855cbf1dad
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 16:55:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 16:56:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b044751f
dev-util/edb-debugger: fix build with Capstone 5
.. and add missing double-conversion slot dep
Closes: https://bugs.gentoo.org/843755
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/edb-debugger/edb-debugger-1.3.0.ebuild | 3 ++-
.../files/edb-debugger-1.3.0-capstone-5.patch | 29 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
index e550d9ad3f47..cf000cdee218 100644
--- a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="graphviz"
RDEPEND="dev-libs/capstone:=
- dev-libs/double-conversion
+ dev-libs/double-conversion:=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -32,6 +32,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-gcc12.patch
+ "${FILESDIR}"/${PN}-1.3.0-capstone-5.patch
)
src_prepare() {
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch b/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch
new file mode 100644
index 000000000000..d900ae335242
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.3.0-capstone-5.patch
@@ -0,0 +1,29 @@
+From cb1da3fb1d2e45e279118ee8e68468373b71dbc8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 13 Sep 2022 17:52:01 +0100
+Subject: [PATCH] Fix build with Capstone 5
+
+Capstone 5 drops X86_INS_VCVTPD2DQX and X86_INS_VCVTPD2PSX from
+x86.h (happened in https://github.com/capstone-engine/capstone/commit/dd91f03fef5102492352756e2adb5972dd79a70f
+but no real explanation).
+
+Given:
+1. these instructions had no wiring up;
+2. other Capstone consumers have done the same
+let's drop based on a macro for the Capstone version.
+
+Bug: https://bugs.gentoo.org/843755
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/capstone-edb/Instruction.cpp
++++ b/src/capstone-edb/Instruction.cpp
+@@ -880,8 +880,10 @@ bool is_SIMD_PD(const Operand &operand) {
+ case X86_INS_CVTPD2PI:
+ case X86_INS_CVTPD2PS:
+ case X86_INS_VCVTPD2PS:
++#if CS_API_MAJOR < 5
+ case X86_INS_VCVTPD2DQX: // FIXME: what's this?
+ case X86_INS_VCVTPD2PSX: // FIXME: what's this?
++#endif
+ // case X86_INS_VCVTPD2QQ: // FIXME: Capstone seems to not support it
+ case X86_INS_VCVTPD2UDQ:
+ // case X86_INS_VCVTPD2UQQ: // FIXME: Capstone seems to not support it
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-13 16:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-13 16:56 [gentoo-commits] repo/gentoo:master commit in: dev-util/edb-debugger/, dev-util/edb-debugger/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-05-07 4:20 Sam James
2020-10-31 10:16 Sergei Trofimovich
2020-06-08 17:46 Sergei Trofimovich
2019-12-07 18:08 Sergei Trofimovich
2019-12-07 18:02 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox