Update core to 5.4.0 and switch to odr-only engine#480
Open
andiwand wants to merge 1 commit into
Open
Conversation
- Replace the OpenDocument.core submodule with a direct conan-odr-index submodule: the app only needs the recipe index to build the odrcore conan package (find_package(odrcore)), not the full core source. - Bump odrcore 5.2.0 -> 5.4.0. - Use only the odr decode engine; drop poppler/wvware from engine_priority and disable with_pdf2htmlEX / with_wvWare. - Set bundle_assets=False so odrcore does not bundle third-party data; the app ships magic.mgc from the libmagic package and wires the path at runtime via odr::GlobalParams. Drop the now-obsolete fontconfig/poppler/pdf2htmlex data handling from CoreWrapper and conandeployer. - Adapt AndroidLogger::log_impl to the const signature in odrcore 5.4.0. - Update CI and README for the new submodule layout. Requires conan-odr-index changes (5.4.0 recipe + bundle_assets option), already on its main branch. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XXRLLpHb7kGTr6tic2H9LZ
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
🤖 Generated with Claude Code
Summary
OpenDocument.coresubmodule with a directconan-odr-indexsubmodule. The app only needs the recipe index to build theodrcoreconan package (find_package(odrcore)) — it never used the core C++ source directly.engine_priority = {odr}, and disableswith_pdf2htmlEX/with_wvWare.bundle_assets=Falseso odrcore doesn't bundle third-party data at build time.magic.mgcships from the libmagic conan package viaconandeployer.pyand is wired at runtime throughodr::GlobalParams. The now-obsolete fontconfig/poppler/pdf2htmlex handling is removed fromCoreWrapperand the deployer.AndroidLogger::log_implto the newconstsignature in odrcore 5.4.0.build_test.yml) and README for the new single-submodule layout.Dependencies
Relies on
conan-odr-indexchanges already pushed to itsmain:5.3.0/5.4.0added torecipes/odrcore/config.ymlbundle_assetsoption on the odrcore recipeTesting
./gradlew assembleProDebug— builds odrcore 5.4.0 from source across all 4 ABIs; APK produced../gradlew connectedProDebugAndroidTest— 11/11 instrumented tests pass on a Pixel_6_Pro emulator (exercises real document loading + libmagic mimetype detection).Follow-up
odr.core's CMake takes
LIBMAGIC_DATABASE_PATHas an injected input rather than discovering the libmagic data file via CMake metadata; tracked as a separate issue on OpenDocument.core. Until that's resolved, we use unbundled assets (this PR).