denuvo-ref/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter synced 2026-08-11 16:23:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update rizin to latest dev. (#3514)

Browse source 
* Update rizin to latest stable.
* Remove: use_swift_demangler in `BundledRizin.cmake`
* Remove: `rz_bp` in `BundledRizin.cmake`
* Fix: use sys_path
* Bump `Rizin_VERSION` to 0.9
This commit is contained in:
Premade 2025-09-09 07:52:49 +05:00 • committed by GitHub
parent 8d424c620f
commit 4e53fd64d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmake/BundledRizin.cmake
View file

@ -22,10 +22,6 @@ if (CUTTER_ENABLE_SIGDB)
list(APPEND MESON_OPTIONS "-Dinstall_sigdb=true")
endif()
if (CUTTER_PACKAGE_RZ_LIBSWIFT AND CUTTER_ENABLE_DEPENDENCY_DOWNLOADS)
list(APPEND MESON_OPTIONS "-Duse_swift_demangler=false")
endif()
find_program(MESON meson)
if(NOT MESON)
message(FATAL_ERROR "Failed to find meson, which is required to build bundled rizin")
@ -57,10 +53,10 @@ endif()
# TODO: This version number should be fetched automatically
# instead of being hardcoded.
set (Rizin_VERSION 0.8)
set (Rizin_VERSION 0.9)
set (RZ_LIBS rz_core rz_config rz_cons rz_io rz_util rz_flag rz_arch rz_debug
rz_hash rz_bin rz_lang rz_il rz_bp rz_egg rz_reg rz_search rz_syscall
rz_hash rz_bin rz_lang rz_il rz_egg rz_reg rz_search rz_syscall
rz_socket rz_magic rz_crypto rz_type rz_diff rz_sign rz_demangler)
set (RZ_EXTRA_LIBS rz_main)
set (RZ_BIN rz-bin rizin rz-diff rz-find rz-gg rz-hash rz-run rz-asm rz-ax rz-sign)

2
rizin

@ -1 +1 @@
Subproject commit 1b6f736c65b9fb8b7ce8a05706edab0f4148985c
Subproject commit 4ec0863eabaff55c1c3896c24cf48439135f64d1

5
src/common/ColorThemeWorker.cpp
View file

@ -37,7 +37,8 @@ ColorThemeWorker::ColorThemeWorker(QObject *parent) : QObject(parent)
QDir().mkpath(customRzThemesLocationPath);
}
char *theme_dir = rz_path_prefix(RZ_THEMES);
RzPath *sys_path = rz_path_new();
const char *theme_dir = rz_path_system(sys_path, RZ_THEMES);
QDir currDir { theme_dir };
if (currDir.exists()) {
standardRzThemesLocationPath = currDir.absolutePath();
@ -47,7 +48,7 @@ ColorThemeWorker::ColorThemeWorker(QObject *parent) : QObject(parent)
"Most likely, Rizin is not properly installed.")
.arg(currDir.path()));
}
free(theme_dir);
rz_path_free(sys_path);
}
QColor ColorThemeWorker::mergeColors(const QColor &upper, const QColor &lower) const

10
src/core/Cutter.cpp
View file

@ -192,17 +192,18 @@ CutterCore *CutterCore::instance()
void CutterCore::initialize(bool loadPlugins)
{
rz_cons_new(); // initialize console
core_ = rz_core_new();
#if defined(MACOS_RZ_BUNDLED)
auto app_path = QDir(QCoreApplication::applicationDirPath());
app_path.cdUp();
app_path.cd("Resources");
qInfo() << "Setting Rizin prefix =" << app_path.absolutePath()
<< " for macOS Application Bundle.";
rz_path_set_prefix(app_path.absolutePath().toUtf8().constData());
rz_path_set_prefix(core_->sys_path, app_path.absolutePath().toUtf8().constData());
#endif
rz_cons_new(); // initialize console
core_ = rz_core_new();
char **env = rz_sys_get_environ();
core_->io->envprofile = rz_run_get_environ_profile(env);
rz_core_task_sync_begin(&core_->tasks);
@ -4628,7 +4629,7 @@ void CutterCore::loadScript(const QString &scriptname)
QString CutterCore::getRizinVersionReadable(const char *program)
{
return fromOwnedCharPtr(rz_version_str(program));
return fromOwnedCharPtr(rz_version_str(core_->sys_path, program));
}
QString CutterCore::getVersionInformation()
@ -4648,7 +4649,6 @@ QString CutterCore::getVersionInformation()
{ "rz_flag", &rz_flag_version },
{ "rz_core", &rz_core_version },
{ "rz_crypto", &rz_crypto_version },
{ "rz_bp", &rz_bp_version },
{ "rz_debug", &rz_debug_version },
{ "rz_hash", &rz_hash_version },
{ "rz_io", &rz_io_version },