Added htmlparser Luarock for newsdownloader #1110
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
Frenzie
reviewed
Jun 4, 2020
There was a problem hiding this comment.
You're missing the definitions in Makefile.defs so right now this PR it's just some dead lines. ;-)
LUA_HTMLPARSER_ROCK isn't set to anything, so you're saying in order to do nothing at all, execute these commands. But nothing at all doesn't need doing anything.
Besides the more obvious (search for LUA_SPORE_ROCK in the source to see where it occurs), also do:
diff --git a/Makefile.defs b/Makefile.defs
index ba4ff31..383e831 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -911,7 +911,7 @@ LPEG_DYNLIB=$(OUTPUT_DIR)/rocks/lib/lua/5.1/lpeg.so
CMAKE_THIRDPARTY_LIBS := kpvcrlib,nanosvg
-CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),evernote-sdk-lua,luajit,lpeg,turbo
+CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),evernote-sdk-lua,lua-htmlparser,luajit,lpeg,turbo
CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),zyre,czmq,filemq,libzmq
CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),libk2pdfopt,tesseract,leptonica
CMAKE_THIRDPARTY_LIBS := $(CMAKE_THIRDPARTY_LIBS),lj-wpaclient
|
I have added the fixes, still, unable to check whether it works. |
Frenzie
reviewed
Jun 4, 2020
Frenzie
reviewed
Jun 4, 2020
Frenzie
reviewed
Jun 4, 2020
|
Any other changes needed? |
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
|
Nothing for the moment, but I'll have to test again if you still can't and I'll also wait for a second opinion just in case a second pair of eyes spots something I missed. |
|
LGTM, at a glance ;). EDIT: Or not? c.f., gcc debug bot. |
NiLuJe
requested changes
Jun 4, 2020
|
I hope this fix makes everything right, and then we can slowly think
about integrating the patch into the upstream.
|
NiLuJe
requested changes
Jun 4, 2020
NiLuJe
approved these changes
Jun 4, 2020
| LUA_SPORE_ROCK=$(LUAROCKS_DIR)/lua-spore/$(SPORE_VER)/lua-spore-$(LUA_SPORE_VER).rockspec | ||
| SPORE_VER=0.3.1-1 | ||
| LUA_SPORE_VER=$(SPORE_VER) | ||
| LUA_SPORE_ROCK=$(LUAROCKS_DIR)/lua-spore/$(SPORE_VER)/lua-spore-$(SPORE_VER).rockspec |
There was a problem hiding this comment.
Oh, I see I'd missed the intermediate folder there, nice ;).
Frenzie
requested changes
Jun 4, 2020
Frenzie
approved these changes
Jun 4, 2020
Frenzie
added a commit
to Frenzie/koreader
that referenced
this pull request
Jun 4, 2020
Cf. <koreader#6228> Includes: * Update to OpenSSH 8.3p1 koreader/koreader-base#1107 * Update zsync2 koreader/koreader-base#1108 * thirdparty/harfbuzz 2.6.7 koreader/koreader-base#1109 * Add thirdparty/lua-htmlparser for newsdownloader koreader/koreader-base#1110
Frenzie
added a commit
to koreader/koreader
that referenced
this pull request
Jun 4, 2020
Cf. <#6228> Includes: * Update to OpenSSH 8.3p1 koreader/koreader-base#1107 * Update zsync2 koreader/koreader-base#1108 * thirdparty/harfbuzz 2.6.7 koreader/koreader-base#1109 * Add thirdparty/lua-htmlparser for newsdownloader koreader/koreader-base#1110
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.
My setup does not allow me to check how does it integrate with the complete build (Raspberry Pi). So, would be thankful if someone could verify if it works and then is used by the patched newsdownloader.
This change is