git: 7a1f829ebfc1 - main - emulators/ripes: unbundle devel/cereal to fix the armv7 build

The branch main has been updated by fuz:

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

commit 7a1f829ebfc1c5ed369eeeffb5ed30be769dc3b3
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2026-04-21 07:39:46 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-04-21 20:14:30 +0000

    emulators/ripes: unbundle devel/cereal to fix the armv7 build
    
    The bundled version of cereal is outdated and produces this build error:
    
    In file included from /wrkdirs/usr/ports/emulators/ripes/work/Ripes-2.2.6/external/VSRTL/graphics/vsrtl_componentgraphic.cpp:14:
    In file included from /wrkdirs/usr/ports/emulators/ripes/work/Ripes-2.2.6/external/VSRTL/external/cereal/include/cereal/archives/json.hpp:56:
    /wrkdirs/usr/ports/emulators/ripes/work/Ripes-2.2.6/external/VSRTL/external/cereal/include/cereal/external/rapidjson/document.h:319:82: error: cannot assign to non-static data member 'length' with const-qualified type 'const SizeType' (aka 'const unsigned int')
      319 |     GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
          |                                                                           ~~~~~~ ^
    /wrkdirs/usr/ports/emulators/ripes/work/Ripes-2.2.6/external/VSRTL/external/cereal/include/cereal/external/rapidjson/document.h:325:20: note: non-static data member 'length' declared const here
      325 |     const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
          |     ~~~~~~~~~~~~~~~^~~~~~
    1 error generated.
    
    Unbundle devel/cereal to get an up to date version which does not
    exhibit this issue and to follow our policy on unbundling.
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2026Q2
---
 emulators/ripes/Makefile                      |  4 +++-
 emulators/ripes/distinfo                      |  2 --
 emulators/ripes/files/patch-CMakeLists.txt    | 10 ++++++++++
 emulators/ripes/files/patch-src_io_iobase.h   | 11 +++++++++++
 emulators/ripes/files/patch-src_serializers.h | 10 ++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/emulators/ripes/Makefile b/emulators/ripes/Makefile
index 3ec3ece330c9..0ee7057db68c 100644
--- a/emulators/ripes/Makefile
+++ b/emulators/ripes/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	ripes
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.6
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	mclay@astate.edu
@@ -9,6 +10,8 @@ WWW=		https://github.com/mortbopet/ripes
 
 LICENSE=	MIT
 
+BUILD_DEPENDS=	${LOCALBASE}/include/cereal/cereal.hpp:devel/cereal
+
 USES=		cmake qmake qt:5
 
 USE_QT=		buildtools:build charts concurrent core gui svg testlib widgets
@@ -23,7 +26,6 @@ GH_TUPLE=	mortbopet:VSRTL:8fd0bce:VSRTL/external/VSRTL \
 		mortbopet:libelfin:49d1653:libelfin/external/libelfin \
 		yhirose:cpp-mmaplib:c517af7:cpp_mmaplib/external/libelfin/external/cpp-mmaplib \
 		pbhogan:Signals:17881fb:Signals/external/VSRTL/external/Signals \
-		USCiLab:cereal:51cbda5:cereal/external/VSRTL/external/cereal \
 		mortbopet:better-enums:52a694b:better_enums/external/VSRTL/external/better-enums
 
 PORTSCOUT=	ignore:continuous-master
diff --git a/emulators/ripes/distinfo b/emulators/ripes/distinfo
index e650cdfdd3e8..912913f8dbb2 100644
--- a/emulators/ripes/distinfo
+++ b/emulators/ripes/distinfo
@@ -11,7 +11,5 @@ SHA256 (yhirose-cpp-mmaplib-c517af7_GH0.tar.gz) = 1d3d52dadcd8a9478fa9a728ea6692
 SIZE (yhirose-cpp-mmaplib-c517af7_GH0.tar.gz) = 1848
 SHA256 (pbhogan-Signals-17881fb_GH0.tar.gz) = 7d2c420dc34471519306dd4070c571c74cb129cac782cb0a38ba07f0ba8488f8
 SIZE (pbhogan-Signals-17881fb_GH0.tar.gz) = 38528
-SHA256 (USCiLab-cereal-51cbda5_GH0.tar.gz) = efa214cfc850a4a2360baf4419b88c93be2a08b09ff5f9bac604a18498b83cfb
-SIZE (USCiLab-cereal-51cbda5_GH0.tar.gz) = 335754
 SHA256 (mortbopet-better-enums-52a694b_GH0.tar.gz) = 6fe24b59328a174eae7b4d755d606615a5bc0397a2b9846079a931486bf94cd3
 SIZE (mortbopet-better-enums-52a694b_GH0.tar.gz) = 136663
diff --git a/emulators/ripes/files/patch-CMakeLists.txt b/emulators/ripes/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1e259707f4ca
--- /dev/null
+++ b/emulators/ripes/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2026-04-21 07:38:19 UTC
++++ CMakeLists.txt
+@@ -66,7 +66,6 @@ qt5_add_resources(FONTS_SRC ${CMAKE_SOURCE_DIR}/resour
+ ######################################################################
+ 
+ # Header-only libraries used in the project must be included from top CMakeLists.txt file
+-include_directories(${RIPES_LIB} SYSTEM PUBLIC external/VSRTL/external/cereal/include)
+ include_directories(${RIPES_LIB} PUBLIC external/VSRTL/external)
+ include_directories(SYSTEM external/ELFIO)
+ include_directories(SYSTEM external/VSRTL/external/Signals)
diff --git a/emulators/ripes/files/patch-src_io_iobase.h b/emulators/ripes/files/patch-src_io_iobase.h
new file mode 100644
index 000000000000..dd6a977bd2e9
--- /dev/null
+++ b/emulators/ripes/files/patch-src_io_iobase.h
@@ -0,0 +1,11 @@
+--- src/io/iobase.h.orig	2026-04-21 08:39:58 UTC
++++ src/io/iobase.h
+@@ -8,7 +8,7 @@
+ #include "binutils.h"
+ #include "serializers.h"
+ 
+-#include "VSRTL/external/cereal/include/cereal/cereal.hpp"
++#include "cereal/cereal.hpp"
+ 
+ namespace Ripes {
+ 
diff --git a/emulators/ripes/files/patch-src_serializers.h b/emulators/ripes/files/patch-src_serializers.h
new file mode 100644
index 000000000000..398679a6ade0
--- /dev/null
+++ b/emulators/ripes/files/patch-src_serializers.h
@@ -0,0 +1,10 @@
+--- src/serializers.h.orig	2026-04-21 08:37:18 UTC
++++ src/serializers.h
+@@ -1,6 +1,6 @@
+ #pragma once
+ 
+-#include "VSRTL/external/cereal/include/cereal/cereal.hpp"
++#include "cereal/cereal.hpp"
+ 
+ #include <QDataStream>
+ #include <QVariant>