Source: edb-debugger
Severity: normal
X-Debbugs-Cc: none, Hilko Bengen <ben...@debian.org>

Dear Maintainer,

I have just uploaded edb-debugger/1.3.0-2.1 to DELAYED/15-day, fixing
the FTBFS issues #1037641 and #1040795, see included debdiff. Please
feel free to reschedule or cancel my upload as you see fit.

Cheers,
-Hilko
diff -Nru edb-debugger-1.3.0/debian/changelog edb-debugger-1.3.0/debian/changelog
--- edb-debugger-1.3.0/debian/changelog	2022-09-19 05:12:37.000000000 +0200
+++ edb-debugger-1.3.0/debian/changelog	2023-07-11 13:10:57.000000000 +0200
@@ -1,3 +1,11 @@
+edb-debugger (1.3.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Add upstream patch to fix build with Capstone 5 (Closes: #1040795)
+  * Add upstream patch to fix build GCC 13 (Closes: #1037641)
+
+ -- Hilko Bengen <ben...@debian.org>  Tue, 11 Jul 2023 13:10:57 +0200
+
 edb-debugger (1.3.0-2) unstable; urgency=medium
 
   * debian/control:
diff -Nru edb-debugger-1.3.0/debian/patches/fix_capstone_5.patch edb-debugger-1.3.0/debian/patches/fix_capstone_5.patch
--- edb-debugger-1.3.0/debian/patches/fix_capstone_5.patch	1970-01-01 01:00:00.000000000 +0100
+++ edb-debugger-1.3.0/debian/patches/fix_capstone_5.patch	2023-07-10 20:01:07.000000000 +0200
@@ -0,0 +1,37 @@
+From: Sam James <s...@cmpct.info>
+Date: Tue, 13 Sep 2022 19:51:08 +0100
+Subject: Fix build with Capstone 5 (#824)
+
+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 them entirely as we have no idea what they are. They don't
+appear in any Intel documentation and there's very little reference
+to them online at all.
+
+Bug: https://bugs.gentoo.org/843755
+Closes: https://github.com/eteran/edb-debugger/issues/823
+Signed-off-by: Sam James <s...@gentoo.org>
+
+Signed-off-by: Sam James <s...@gentoo.org>
+---
+ src/capstone-edb/Instruction.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/capstone-edb/Instruction.cpp b/src/capstone-edb/Instruction.cpp
+index 6aa67c9..3495b81 100644
+--- a/src/capstone-edb/Instruction.cpp
++++ b/src/capstone-edb/Instruction.cpp
+@@ -879,8 +879,6 @@ bool is_SIMD_PD(const Operand &operand) {
+ 	case X86_INS_CVTPD2PI:
+ 	case X86_INS_CVTPD2PS:
+ 	case X86_INS_VCVTPD2PS:
+-	case X86_INS_VCVTPD2DQX: // FIXME: what's this?
+-	case X86_INS_VCVTPD2PSX: // FIXME: what's this?
+ 	// 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
diff -Nru edb-debugger-1.3.0/debian/patches/fix_gcc_13.patch edb-debugger-1.3.0/debian/patches/fix_gcc_13.patch
--- edb-debugger-1.3.0/debian/patches/fix_gcc_13.patch	1970-01-01 01:00:00.000000000 +0100
+++ edb-debugger-1.3.0/debian/patches/fix_gcc_13.patch	2023-07-11 13:10:57.000000000 +0200
@@ -0,0 +1,30 @@
+From d0d904383cb5baf607404178bc5632235e8e1ea7 Mon Sep 17 00:00:00 2001
+From: Sam James <s...@gentoo.org>
+Date: Mon, 17 Apr 2023 16:11:43 +0100
+Subject: [PATCH] Fix build with GCC 13 (#837)
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
+are no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Bug: https://bugs.gentoo.org/897890
+---
+ plugins/DebuggerCore/unix/linux/FeatureDetect.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/DebuggerCore/unix/linux/FeatureDetect.cpp b/plugins/DebuggerCore/unix/linux/FeatureDetect.cpp
+index 0e232e39..c7eb5bbd 100644
+--- a/plugins/DebuggerCore/unix/linux/FeatureDetect.cpp
++++ b/plugins/DebuggerCore/unix/linux/FeatureDetect.cpp
+@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include "FeatureDetect.h"
+ #include "version.h"
+ 
++#include <cstdint>
+ #include <fcntl.h>
+ #include <iomanip>
+ #include <iostream>
+-- 
+2.39.2
+
diff -Nru edb-debugger-1.3.0/debian/patches/series edb-debugger-1.3.0/debian/patches/series
--- edb-debugger-1.3.0/debian/patches/series	2022-09-19 05:12:37.000000000 +0200
+++ edb-debugger-1.3.0/debian/patches/series	2023-07-11 13:10:57.000000000 +0200
@@ -3,3 +3,5 @@
 fix_cmakelists.txt.patch
 0001-Gcc-12-includes-fix-815.patch
 #0004-widgets-QDisassemblyView-include-QPainterPath.patch
+fix_capstone_5.patch
+fix_gcc_13.patch

Reply via email to