Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Jun 2026 20:39:39 +0000
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ffd284aaf45f - main - devel/redasm: pending the update, unbreak the port's build
Message-ID:  <6a44298b.314d2.48d5e2c6@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ffd284aaf45f8686449e8d5c0b3aa4ba1e59e7ae

commit ffd284aaf45f8686449e8d5c0b3aa4ba1e59e7ae
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2026-06-30 20:38:56 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2026-06-30 20:38:56 +0000

    devel/redasm: pending the update, unbreak the port's build
    
    Relax REDasm::Emulator::remap() method access from private
    to protected, as it is being called from the derived class,
    and fix a minor GUI bug while I'm here.
    
    There are newer versions available, but those have various
    run-time (3.0.0-beta5 segfaults on start) or build (4.0.0-
    beta1 is a massive rewrite) issues to be taken care of.
    
    Reported by:    pkg-fallout
---
 devel/redasm/Makefile                                      |  3 +++
 .../redasm/files/patch-LibREDasm_redasm_plugins_emulator.h | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/devel/redasm/Makefile b/devel/redasm/Makefile
index a6b7c0b4ba9b..2deaed3a504b 100644
--- a/devel/redasm/Makefile
+++ b/devel/redasm/Makefile
@@ -25,6 +25,9 @@ PLIST_FILES=	bin/REDasm lib/LibREDasm.so bin/redasm
 post-patch:
 	@${REINPLACE_CMD} -e '/Git/s,find_package,#&, ; \
 		s|unknown|8848416|' ${WRKSRC}/CMakeLists.txt
+# Ampersands are rendered as is for window titles, whack them
+	@${REINPLACE_CMD} -e '/property name="windowTitle"/,+1 \
+		s,&amp;,,' ${WRKSRC}/mainwindow.ui
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/REDasm ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/redasm/files/patch-LibREDasm_redasm_plugins_emulator.h b/devel/redasm/files/patch-LibREDasm_redasm_plugins_emulator.h
new file mode 100644
index 000000000000..d500795ba857
--- /dev/null
+++ b/devel/redasm/files/patch-LibREDasm_redasm_plugins_emulator.h
@@ -0,0 +1,14 @@
+--- LibREDasm/redasm/plugins/emulator.h.orig	2019-05-23 14:58:04 UTC
++++ LibREDasm/redasm/plugins/emulator.h
+@@ -28,11 +28,7 @@ class Emulator
+         MemoryBuffer* getSegmentMemory(address_t address, offset_t* offset);
+         BufferView getMemory(address_t address);
+         BufferView getStack(offset_t sp);
+-
+-    private:
+         void remap();
+-
+-    protected:
+         InstructionPtr m_currentinstruction;
+         DisassemblerAPI* m_disassembler;
+         DispatcherType m_dispatcher;


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a44298b.314d2.48d5e2c6>