Hi,
Here's an update to a newer cutter. Requires the rizin port I recently posted.
Since we have all the parts we need for the radare2 and rizin ecosystems
update, I think we can probably skip the quirk that was proposed in the radare2
update and simply allow the old cutter to update to the new cutter.
Later I'll make an updated diff and outline a commit strategy.
For now, here's the cutter diff:
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cutter/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 28 May 2022 06:19:58 -0000 1.14
+++ Makefile 6 Aug 2022 14:19:04 -0000
@@ -1,52 +1,56 @@
-COMMENT = RE platform powered by radare2
+COMMENT = RE platform powered by rizin
-GH_ACCOUNT = radareorg
+V = 2.1.0
+GH_ACCOUNT = rizinorg
GH_PROJECT = cutter
-GH_TAGNAME = v1.12.0
-REVISION = 1
+GH_TAGNAME = v${V}
+
+# Requires the translations submodule. For the next release there should be a
+# proper vendored tarball and this step should not be needed.
+MASTER_SITES0 =
https://github.com/rizinorg/cutter-translations/archive/
+TRANSLATIONS_COMMIT = 97429865
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+ cutter-translations-{}${TRANSLATIONS_COMMIT}.tar.gz:0 \
CATEGORIES = devel
HOMEPAGE = https://cutter.re/
-MAINTAINER = Jasper Lievisse Adriaanse <jas...@openbsd.org>
-
# GPLv3
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
-WANTLIB += KF5SyntaxHighlighting Qt5Core Qt5Gui Qt5Network Qt5Svg
-WANTLIB += Qt5Widgets c capstone cdt cgraph crypto gvc m ssl z
-WANTLIB += zip
+WANTLIB += ${COMPILER_LIBCXX} KF5SyntaxHighlighting Qt5Core Qt5Gui
+WANTLIB += Qt5Network Qt5Svg Qt5Widgets c cdt cgraph gvc m python3.9
+WANTLIB += rz_analysis rz_asm rz_bin rz_bp rz_config rz_cons rz_core
+WANTLIB += rz_crypto rz_debug rz_demangler rz_diff rz_egg rz_flag
+WANTLIB += rz_hash rz_il rz_io rz_lang rz_magic rz_parse rz_reg
+WANTLIB += rz_search rz_sign rz_socket rz_syscall rz_type rz_util
MODULES = devel/cmake \
lang/python \
x11/qt5
BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = devel/radare2/main>=4.5.1
-LIB_DEPENDS = archivers/libzip \
- devel/capstone/main \
- devel/kf5/syntax-highlighting \
+RUN_DEPENDS = devel/rizin>=0.4.0
+LIB_DEPENDS = devel/kf5/syntax-highlighting \
math/graphviz \
x11/qt5/qtsvg
-WRKSRC = ${WRKDIST}/src
-
# XXX: Python-based plugins don't work yet, this needs
# CUTTER_ENABLE_PYTHON_BINDINGS which requires (unported) Shiboken2.
CONFIGURE_ARGS =-DCUTTER_ENABLE_GRAPHVIZ=ON \
-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON \
-DCUTTER_ENABLE_PYTHON=ON \
-DCUTTER_ENABLE_CRASH_REPORTS=OFF \
- -DCUTTER_USE_BUNDLED_RADARE2=OFF
+ -DCUTTER_USE_BUNDLED_RIZIN=OFF
NO_TEST = Yes
-CFLAGS += -I${LOCALBASE}/include/KF5
-CXXFLAGS += -I${LOCALBASE}/include/KF5
+post-extract:
+ mv ${WRKDIR}/cutter-translations-${TRANSLATIONS_COMMIT}*/* \
+ ${WRKSRC}/src/translations
do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/Cutter ${PREFIX}/bin/cutter
+ ${INSTALL_PROGRAM} ${WRKBUILD}/cutter ${PREFIX}/bin/cutter
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cutter/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 12 Sep 2020 08:47:43 -0000 1.5
+++ distinfo 6 Aug 2022 14:11:51 -0000
@@ -1,2 +1,4 @@
-SHA256 (cutter-1.12.0.tar.gz) = hoIT0uoLSim5sDybYFwrIVXEwDtic1qb03ag2ty0/hs=
-SIZE (cutter-1.12.0.tar.gz) = 2323732
+SHA256 (cutter-2.1.0.tar.gz) = YKrOrRYEwtyK+tQjlzKtENWIKrOIKOaVwPU9HhNMKlw=
+SHA256 (cutter-translations-97429865.tar.gz) =
mp1Cdpwek2TfxpSWiwWZTQLqhAgTozsWympsvoDJAGk=
+SIZE (cutter-2.1.0.tar.gz) = 2732264
+SIZE (cutter-translations-97429865.tar.gz) = 595073
Index: patches/patch-src_widgets_GraphGridLayout_cpp
===================================================================
RCS file: patches/patch-src_widgets_GraphGridLayout_cpp
diff -N patches/patch-src_widgets_GraphGridLayout_cpp
--- patches/patch-src_widgets_GraphGridLayout_cpp 11 Mar 2022 18:49:54
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/widgets/GraphGridLayout.cpp
---- src/widgets/GraphGridLayout.cpp.orig
-+++ src/widgets/GraphGridLayout.cpp
-@@ -526,7 +526,7 @@ void GraphGridLayout::calculateEdgeMainColumn(GraphGri
- // to contain blocks above sweep line and query for nearest column which
isn't blocked by a block.
-
- struct Event {
-- size_t blockId;
-+ ut64 blockId;
- size_t edgeId;
- int row;
- enum Type {
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
