Skip to content

Commit 043cd45

Browse files
limo-applimo-app
committed
update Limo to 1.2
Updated the dependencies where needed
1 parent a0d3f33 commit 043cd45

File tree

2 files changed

+53
-67
lines changed

2 files changed

+53
-67
lines changed

‎io.github.limo_app.limo.json

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"app-id": "io.github.limo_app.limo",
33
"runtime": "org.kde.Platform",
4-
"runtime-version": "5.15-23.08",
4+
"runtime-version": "5.15-24.08",
55
"sdk": "org.kde.Sdk",
66
"sdk-extensions" :
77
[
88
"org.freedesktop.Sdk.Extension.rust-stable",
9-
"org.freedesktop.Sdk.Extension.llvm16"
9+
"org.freedesktop.Sdk.Extension.llvm18"
1010
],
1111
"build-options":
1212
{
13-
"append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
13+
"append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin",
1414
"env": {
1515
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
1616
"CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold",
@@ -128,7 +128,7 @@
128128
{
129129
"type": "git",
130130
"url": "https://github.com/libcpr/cpr.git",
131-
"tag": "1.10.5"
131+
"tag": "1.11.2"
132132
}
133133
],
134134
"cleanup":
@@ -202,7 +202,7 @@
202202
{
203203
"type": "git",
204204
"url": "https://github.com/mozilla/cbindgen.git",
205-
"tag": "0.26.0"
205+
"tag": "0.28.0"
206206
},
207207
"dependencies/cbindgen-sources.json"
208208
],
@@ -241,14 +241,40 @@
241241
"buildsystem": "cmake-ninja",
242242
"config-opts":
243243
[
244-
"-DCMAKE_BUILD_TYPE=Release"
244+
"-DCMAKE_BUILD_TYPE=Release",
245+
"-DSPDLOG_BUILD_SHARED=OFF",
246+
"-DSPDLOG_BUILD_PIC=ON"
245247
],
246248
"sources":
247249
[
248250
{
249251
"type": "git",
250252
"url": "https://github.com/gabime/spdlog.git",
251-
"tag": "v1.14.1"
253+
"tag": "v1.15.1"
254+
}
255+
],
256+
"cleanup":
257+
[
258+
"*"
259+
]
260+
},
261+
{
262+
"name": "fmt",
263+
"buildsystem": "cmake-ninja",
264+
"config-opts":
265+
[
266+
"-DCMAKE_BUILD_TYPE=Release",
267+
"-DBUILD_SHARED_LIBS=OFF",
268+
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
269+
"-DFMT_TEST=OFF",
270+
"-DFMT_DOC=OFF"
271+
],
272+
"sources":
273+
[
274+
{
275+
"type": "git",
276+
"url": "https://github.com/fmtlib/fmt.git",
277+
"tag": "11.1.3"
252278
}
253279
],
254280
"cleanup":
@@ -264,9 +290,9 @@
264290
"-DCMAKE_BUILD_TYPE=Release",
265291
"-DLIBLOOT_BUILD_TESTS=OFF",
266292
"-DLIBLOOT_INSTALL_DOCS=OFF",
267-
"-DESPLUGIN_URL=/run/build/libloot/6.1.0.tar.gz",
268-
"-DLIBLOADORDER_URL=/run/build/libloot/17.0.1.tar.gz",
269-
"-DLOOT_CONDITION_INTERPRETER_URL=/run/build/libloot/4.0.1.tar.gz"
293+
"-DESPLUGIN_URL=/run/build/libloot/6.1.1.tar.gz",
294+
"-DLIBLOADORDER_URL=/run/build/libloot/18.2.2.tar.gz",
295+
"-DLOOT_CONDITION_INTERPRETER_URL=/run/build/libloot/5.2.0.tar.gz"
270296
],
271297
"build-options":
272298
{
@@ -280,28 +306,28 @@
280306
{
281307
"type": "git",
282308
"url": "https://github.com/loot/libloot.git",
283-
"tag": "0.23.0"
309+
"tag": "0.25.5"
284310
},
285311
{
286312
"type": "patch",
287313
"path": "patches/libloot/CMakeLists.txt.patch"
288314
},
289315
{
290316
"type": "file",
291-
"url": "https://github.com/Ortham/esplugin/archive/refs/tags/6.1.0.tar.gz",
292-
"sha256": "52dec796d98426e1c75c5cf3c41351c0b3431a6301137e00fcf6023f4e47b502"
317+
"url": "https://github.com/Ortham/esplugin/archive/refs/tags/6.1.1.tar.gz",
318+
"sha256": "8896859a6469e810c6e5430ed910fa8f8c31d39e032703b87ab090759663a240"
293319
},
294320
"dependencies/esplugin-sources.json",
295321
{
296322
"type": "file",
297-
"url": "https://github.com/Ortham/libloadorder/archive/refs/tags/17.0.1.tar.gz",
298-
"sha256": "36d90eb5cd53cbbf9d04de7ead561d69ea6aadcf3363d425a3c8370dc566c1b6"
323+
"url": "https://github.com/Ortham/libloadorder/archive/refs/tags/18.2.2.tar.gz",
324+
"sha256": "5e4c12e91180abbf201be70b3073fce791bdee2d70f33f89b35942446d3b5782"
299325
},
300326
"dependencies/libloadorder-sources.json",
301327
{
302328
"type": "file",
303-
"url": "https://github.com/loot/loot-condition-interpreter/archive/refs/tags/4.0.1.tar.gz",
304-
"sha256": "12bf0b108e4734baa3634e98cd7952a9411352539be3ec270aeee97c1b8db92f"
329+
"url": "https://github.com/loot/loot-condition-interpreter/archive/refs/tags/5.2.0.tar.gz",
330+
"sha256": "48db9d1022c65c6ea53b5febbbb8a45d089ac8e8773f8e14b069387fab80948d"
305331
},
306332
"dependencies/loot-condition-interpreter-sources.json"
307333
]
@@ -345,7 +371,7 @@
345371
{
346372
"type": "git",
347373
"url": "https://github.com/limo-app/limo.git",
348-
"tag": "v1.1"
374+
"tag": "v1.2"
349375
}
350376
]
351377
}

‎patches/libloot/CMakeLists.txt.patch

Lines changed: 9 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,10 @@
1-
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 3698be1..86e3cf3 100644
3-
--- a/CMakeLists.txt
1+
diff --git a/CMakeLists.txt.orig b/CMakeLists.txt
2+
index 5a192be..8411e02 100644
3+
--- a/CMakeLists.txt.orig
44
+++ b/CMakeLists.txt
5-
@@ -47,24 +47,6 @@ set(Boost_USE_STATIC_LIBS ON)
6-
set(Boost_USE_MULTITHREADED ON)
7-
set(Boost_USE_STATIC_RUNTIME OFF)
8-
9-
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
10-
- if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
11-
- if(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")
12-
- set(RUST_TARGET i686-pc-windows-msvc)
13-
- else()
14-
- set(RUST_TARGET x86_64-pc-windows-msvc)
15-
- endif()
16-
- else()
17-
- if(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")
18-
- set(RUST_TARGET i686-pc-windows-gnu)
19-
- else()
20-
- set(RUST_TARGET x86_64-pc-windows-gnu)
21-
- endif()
22-
- endif()
23-
-else()
24-
- set(RUST_TARGET x86_64-unknown-linux-gnu)
25-
-endif()
26-
-
27-
find_package(Boost REQUIRED)
28-
29-
if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
30-
@@ -83,14 +65,13 @@ ExternalProject_Add(esplugin
31-
URL_HASH ${ESPLUGIN_HASH}
32-
CONFIGURE_COMMAND ""
33-
BUILD_IN_SOURCE 1
34-
- BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml --target ${RUST_TARGET} &&
35-
+ BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml &&
5+
@@ -96,10 +96,10 @@ ExternalProject_Add(esplugin
366
cbindgen ffi/ -o ffi/include/esplugin.hpp
37-
- COMMAND ${CMAKE_COMMAND} -E rm -r "target/${RUST_TARGET}/release/deps" "target/release"
7+
COMMAND ${RUST_CLEANUP_COMMAND}
388
INSTALL_COMMAND ""
399
- BUILD_BYPRODUCTS "<SOURCE_DIR>/target/${RUST_TARGET}/release/${CMAKE_STATIC_LIBRARY_PREFIX}esplugin_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}")
4010
+ BUILD_BYPRODUCTS "<SOURCE_DIR>/target/release/${CMAKE_STATIC_LIBRARY_PREFIX}esplugin_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -45,14 +15,9 @@ index 3698be1..86e3cf3 100644
4515
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
4616
set(ESPLUGIN_LIBRARIES ${ESPLUGIN_LIBRARIES} userenv ntdll)
4717
else()
48-
@@ -108,14 +89,13 @@ ExternalProject_Add(libloadorder
49-
URL_HASH ${LIBLOADORDER_HASH}
50-
CONFIGURE_COMMAND ""
51-
BUILD_IN_SOURCE 1
52-
- BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml --target ${RUST_TARGET} &&
53-
+ BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml &&
18+
@@ -121,10 +121,10 @@ ExternalProject_Add(libloadorder
5419
cbindgen ffi/ -l c++ -o ffi/include/libloadorder.hpp
55-
- COMMAND ${CMAKE_COMMAND} -E rm -r "target/${RUST_TARGET}/release/deps" "target/release"
20+
COMMAND ${RUST_CLEANUP_COMMAND}
5621
INSTALL_COMMAND ""
5722
- BUILD_BYPRODUCTS "<SOURCE_DIR>/target/${RUST_TARGET}/release/${CMAKE_STATIC_LIBRARY_PREFIX}loadorder_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}")
5823
+ BUILD_BYPRODUCTS "<SOURCE_DIR>/target/release/${CMAKE_STATIC_LIBRARY_PREFIX}loadorder_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -63,14 +28,9 @@ index 3698be1..86e3cf3 100644
6328
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
6429
set(LIBLOADORDER_LIBRARIES ${LIBLOADORDER_LIBRARIES} ntdll propsys userenv windowsapp)
6530
else()
66-
@@ -133,14 +113,13 @@ ExternalProject_Add(loot-condition-interpreter
67-
URL_HASH ${LOOT_CONDITION_INTERPRETER_HASH}
68-
CONFIGURE_COMMAND ""
69-
BUILD_IN_SOURCE 1
70-
- BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml --target ${RUST_TARGET} &&
71-
+ BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml &&
31+
@@ -146,10 +146,10 @@ ExternalProject_Add(loot-condition-interpreter
7232
cbindgen ffi/ -o ffi/include/loot_condition_interpreter.h
73-
- COMMAND ${CMAKE_COMMAND} -E rm -r "target/${RUST_TARGET}/release/deps" "target/release"
33+
COMMAND ${RUST_CLEANUP_COMMAND}
7434
INSTALL_COMMAND ""
7535
- BUILD_BYPRODUCTS "<SOURCE_DIR>/target/${RUST_TARGET}/release/${CMAKE_STATIC_LIBRARY_PREFIX}loot_condition_interpreter_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}")
7636
+ BUILD_BYPRODUCTS "<SOURCE_DIR>/target/release/${CMAKE_STATIC_LIBRARY_PREFIX}loot_condition_interpreter_ffi${CMAKE_STATIC_LIBRARY_SUFFIX}")

0 commit comments

Comments
 (0)