Skip to content

Minor third-party bumps#1162

Merged
Frenzie merged 2 commits into
koreader:masterfrom
NiLuJe:master
Aug 20, 2020
Merged

Minor third-party bumps#1162
Frenzie merged 2 commits into
koreader:masterfrom
NiLuJe:master

Conversation

@NiLuJe

@NiLuJe NiLuJe commented Aug 18, 2020

Copy link
Copy Markdown
Member
  • SQLite 3.33.0
  • LuaJIT

This change is Reviewable

Comment thread thirdparty/sqlite/CMakeLists.txt Outdated
DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
URL https://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_VER}.tar.gz
URL_HASH SHA1=ea14ef2dc4cc7fcbc5ebbb018d3a03faa3a41cb4
URL_HASH SHA3=6e94e9453cedf8f2023e3923f856741d1e28a2271e9f93d24d95fa48870edaad

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not happy about it. ;-)

CMake Error at /usr/share/cmake-3.5/Modules/ExternalProject.cmake:1850 (message):
  URL_HASH is set to

    SHA3=6e94e9453cedf8f2023e3923f856741d1e28a2271e9f93d24d95fa48870edaad

  but must be ALGO=value where ALGO is

    MD5|SHA1|SHA224|SHA256|SHA384|SHA512

  and value is a hex string.
Call Stack (most recent call first):
  /usr/share/cmake-3.5/Modules/ExternalProject.cmake:2459 (_ep_add_download_command)
  CMakeLists.txt:37 (ExternalProject_Add)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sadface

@Frenzie

Frenzie commented Aug 19, 2020 via email

Copy link
Copy Markdown
Member

@NiLuJe

NiLuJe commented Aug 19, 2020

Copy link
Copy Markdown
Member Author

Might work in newer Cmake, dunno if the time is quite right to bump it. Need to check what fdroid uses.

It does ;)

(After jumping down the rabbit hole that is CMake's doc... https://cmake.org/cmake/help/latest/command/string.html#supported-hash-algorithms)

NiLuJe added 2 commits August 19, 2020 12:15
Switch to manual MD5 checksums because upstream moved to SHA3 and CMake
is terrible.
@Frenzie Frenzie changed the title Minor third-party bumpds Minor third-party bumps Aug 19, 2020
@Frenzie

Frenzie commented Aug 19, 2020

Copy link
Copy Markdown
Member

Assuming the docs are correct it looks like it should be supported in 3.8 and up.

@Frenzie Frenzie merged commit bf9180c into koreader:master Aug 20, 2020
NiLuJe added a commit to koreader/koreader that referenced this pull request Aug 25, 2020
* \o/

* Make sure the (debug) event log doesn't end up in the fd table of our child processes...
Otherwise, it breaks USBMS.

* Close suspicious fds in the Wi-Fi scripts
To prevent any and all issues w/ USBMS down the road...

* Minor USBMS UI tweaks

* Always ask for confirmation to start on USBMS session on plug

* Bump base

koreader/koreader-base#1161
koreader/koreader-base#1162
koreader/koreader-base#1163
koreader/koreader-base#1165
koreader/koreader-base#1167
0xstillb pushed a commit to 0xstillb/koreader-thai that referenced this pull request May 9, 2026
* \o/

* Make sure the (debug) event log doesn't end up in the fd table of our child processes...
Otherwise, it breaks USBMS.

* Close suspicious fds in the Wi-Fi scripts
To prevent any and all issues w/ USBMS down the road...

* Minor USBMS UI tweaks

* Always ask for confirmation to start on USBMS session on plug

* Bump base

koreader/koreader-base#1161
koreader/koreader-base#1162
koreader/koreader-base#1163
koreader/koreader-base#1165
koreader/koreader-base#1167
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants