-
Notifications
You must be signed in to change notification settings - Fork 108
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
thirdparty/lua-Spore 0.4.0 #2015
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
So 1/07/25-18:14:14 WARN Error when loading plugins/kosync.koplugin/main.lua common/Spore.lua:5: module 'dkjson' not found:
no field package.preload['dkjson']
no file 'plugins/kosync.koplugin/dkjson.lua'
no file 'common/dkjson.lua'
no file 'frontend/dkjson.lua'
no file 'plugins/exporter.koplugin/dkjson.lua'
no file './dkjson.lua'
no file '/usr/local/share/luajit-2.1/dkjson.lua'
no file '/usr/local/share/lua/5.1/dkjson.lua'
no file '/usr/local/share/lua/5.1/dkjson/init.lua'
no file 'plugins/kosync.koplugin/lib/dkjson.so'
no file 'common/dkjson.so'
no file 'common/dkjson.dll'
no file '/usr/lib/lua/dkjson.so'
no file './dkjson.so'
no file '/usr/local/lib/lua/5.1/dkjson.so'
no file '/usr/local/lib/lua/5.1/loadall.so' --- i/plugins/kosync.koplugin/main.lua
+++ w/plugins/kosync.koplugin/main.lua
@@ -16,6 +16,8 @@ local util = require("util")
local T = require("ffi/util").template
local _ = require("gettext")
+print('Spore', require("Spore"))
+
if G_reader_settings:hasNot("device_id") then
G_reader_settings:saveSetting("device_id", random.uuid())
end |
cmake/CMakeLists.txt | 4 +++-
thirdparty/dkjson/CMakeLists.txt | 10 ++++++++++
thirdparty/spec/dkjson/CMakeLists.txt | 4 ----
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git c/cmake/CMakeLists.txt i/cmake/CMakeLists.txt
index 1b841aeb8..3c1a71a95 100644
--- c/cmake/CMakeLists.txt
+++ i/cmake/CMakeLists.txt
@@ -185,6 +185,9 @@ declare_project(thirdparty/czmq DEPENDS libzmq ${EXCLUDE_FROM_ALL})
# djvulibre
declare_project(thirdparty/djvulibre DEPENDS libjpeg-turbo EXCLUDE_FROM_ALL)
+# dkjson
+declare_project(thirdparty/dkjson)
+
# dropbear
if(CERVANTES OR KINDLE OR KOBO OR POCKETBOOK)
set(EXCLUDE_FROM_ALL)
@@ -421,7 +424,6 @@ if(EMULATE_READER)
foreach(PRJ
busted
cluacov
- dkjson
lua-term
lua_cliargs
luacov
diff --git c/thirdparty/dkjson/CMakeLists.txt i/thirdparty/dkjson/CMakeLists.txt
new file mode 100644
index 000000000..4b1c3728d
--- /dev/null
+++ i/thirdparty/dkjson/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Build in source tree.
+set(BINARY_DIR ${SOURCE_DIR})
+
+append_install_commands(INSTALL_CMD dkjson.lua DESTINATION common)
+
+external_project(
+ DOWNLOAD URL d7754634dcbe6e95f3b6b55fd4ca5ceb
+ http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz
+ INSTALL_COMMAND ${INSTALL_CMD}
+)
diff --git c/thirdparty/spec/dkjson/CMakeLists.txt i/thirdparty/spec/dkjson/CMakeLists.txt
deleted file mode 100644
index 976f0e640..000000000
--- c/thirdparty/spec/dkjson/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-spec_rock(
- https://luarocks.org/manifests/dhkolf/dkjson-2.8-1.src.rock
- 4d002b7591658983248f8214e9459e1d
-) |
That wasn't necessary, but thanks. It did make it quicker. ;-) |
Frenzie
force-pushed
the
Frenzie-patch-1
branch
from
January 10, 2025 20:31
fb3206c
to
9e75e1f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://framagit.org/fperrad/lua-Spore/-/tags/0.4.0
https://framagit.org/fperrad/lua-Spore/-/compare/0.3.4...0.4.0
Edit: of note, "switch to dkjson"
https://framagit.org/fperrad/lua-Spore/-/commit/8e7ad16a772ce7e13a4fbc33de33b045426dcb51
This change is