From a52640934982af65209dcc1a312501476c172f89 Mon Sep 17 00:00:00 2001 From: Evelyn Marie Date: Thu, 6 Apr 2023 17:19:21 -0600 Subject: [PATCH 1/2] dependencies: update loot --- mob.ini | 4 +--- src/tasks/libloot.cpp | 14 +++----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/mob.ini b/mob.ini index d56de59..0e2145e 100644 --- a/mob.ini +++ b/mob.ini @@ -99,9 +99,7 @@ boost = 1.80.0 boost_vs = 14.3 fmt = 8.1.1 gtest = main -libloot = 0.18.1 -libloot_hash = gc4cdfbb -libloot_branch = 0.18.1 +libloot = 0.19.3 lz4 = v1.9.4 nmm = 0.71.2 openssl = 1.1.1q diff --git a/src/tasks/libloot.cpp b/src/tasks/libloot.cpp index 877099f..d9eb5ad 100644 --- a/src/tasks/libloot.cpp +++ b/src/tasks/libloot.cpp @@ -9,17 +9,9 @@ namespace std::string release_name() { - // the naming convention is `libloot-version-commit_branch-win64.7z`, - // such as: - // - // libloot-0.14.6-0-g8fed4b0_dev-win64.7z - // libloot-0.15.1-0-gf725dd7_0.15.1-win64.7z - // libloot-0.15.2-0-g3baa0e8_master-win64.7z - - return - "libloot-" + libloot::version() + "-" + "0-" + - libloot::hash() + "_" + libloot::branch() + "-" + - "win64"; + // the naming convention is `libloot-version-win64.7z`, + // such as libloot-0.19.3-win64.7z. + return "libloot-" + libloot::version() + "-" + "win64"; } url source_url() From abcd5aef0326b2be2c78583e58f26ffbb8ae44fe Mon Sep 17 00:00:00 2001 From: Evelyn Marie Date: Thu, 6 Apr 2023 17:22:31 -0600 Subject: [PATCH 2/2] tasks(libloot): remove unnecessary hash(), branch() --- src/tasks/libloot.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/tasks/libloot.cpp b/src/tasks/libloot.cpp index d9eb5ad..6b42009 100644 --- a/src/tasks/libloot.cpp +++ b/src/tasks/libloot.cpp @@ -34,16 +34,6 @@ std::string libloot::version() return conf().version().get("libloot"); } -std::string libloot::hash() -{ - return conf().version().get("libloot_hash"); -} - -std::string libloot::branch() -{ - return conf().version().get("libloot_branch"); -} - bool libloot::prebuilt() { return false;