On 2024/04/14 11:30, Edd Barrett wrote:
> Hi,
>
> An update to cutter, to be committed with the rizin update.
>
> The local patch we had appears to have been applied upstream, so we no longer
> need it.
>
> Had a quick play around disassembling /bin/ls and looking at the control flow
> graph. All seems to work.
>
> OK?
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/cutter/Makefile,v
> diff -u -p -r1.20 Makefile
> --- Makefile 26 Sep 2023 17:58:05 -0000 1.20
> +++ Makefile 14 Apr 2024 09:44:30 -0000
> @@ -1,10 +1,9 @@
> COMMENT = RE platform powered by rizin
>
> -V = 2.1.0
> +V = 2.3.4
> GH_ACCOUNT = rizinorg
> GH_PROJECT = cutter
> GH_TAGNAME = v${V}
> -REVISION = 0
>
> # Requires the translations submodule. For the next release there should be a
> # proper vendored tarball and this step should not be needed.
Here's a slight tweak to use the upstream tarball with bundled
translations. OK
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cutter/Makefile,v
diff -u -p -r1.20 Makefile
--- Makefile 26 Sep 2023 17:58:05 -0000 1.20
+++ Makefile 14 Apr 2024 12:23:34 -0000
@@ -1,16 +1,10 @@
COMMENT = RE platform powered by rizin
-V = 2.1.0
-GH_ACCOUNT = rizinorg
-GH_PROJECT = cutter
-GH_TAGNAME = v${V}
-REVISION = 0
-
-# Requires the translations submodule. For the next release there should be a
-# proper vendored tarball and this step should not be needed.
-SITES.t = https://github.com/rizinorg/cutter-translations/archive/
-TRANSLATIONS_COMMIT = 97429865
-DISTFILES.t = cutter-translations-{}${TRANSLATIONS_COMMIT}.tar.gz
+V = 2.3.4
+DISTNAME = Cutter-v${V}-src
+WRKDIST = ${WRKDIR}/Cutter-v${V}
+
+SITES =
https://github.com/rizinorg/cutter/releases/download/v${V}/
CATEGORIES = devel
@@ -45,10 +39,6 @@ CONFIGURE_ARGS =-DCUTTER_ENABLE_GRAPHVIZ
-DCUTTER_USE_BUNDLED_RIZIN=OFF
NO_TEST = Yes
-
-post-extract:
- mv ${WRKDIR}/cutter-translations-${TRANSLATIONS_COMMIT}*/* \
- ${WRKSRC}/src/translations
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/cutter ${PREFIX}/bin/cutter
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cutter/distinfo,v
diff -u -p -r1.6 distinfo
--- distinfo 12 Aug 2022 20:12:51 -0000 1.6
+++ distinfo 14 Apr 2024 12:23:34 -0000
@@ -1,4 +1,2 @@
-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
+SHA256 (Cutter-v2.3.4-src.tar.gz) =
7cJmpfeh8cf3HPXGyXJ+BQCLco6uO7Qr630LJM4HxcM=
+SIZE (Cutter-v2.3.4-src.tar.gz) = 11608176
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 18 Aug 2022 12:47:56
-0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix build on 32-bit.
-
-Index: src/widgets/GraphGridLayout.cpp
---- src/widgets/GraphGridLayout.cpp.orig
-+++ src/widgets/GraphGridLayout.cpp
-@@ -547,7 +547,7 @@ void GraphGridLayout::calculateEdgeMainColumn(GraphGri
-
- struct Event
- {
-- size_t blockId;
-+ ut64 blockId;
- size_t edgeId;
- int row;
- enum Type { Edge = 0, Block = 1 } type;
