Skip to content

[upstream] Bump to 2026.08.27-18-android - #5

Merged
MNThomson merged 2 commits into
masterfrom
bump/2026.08.27-18-android
Sep 17, 2026
Merged

MNThomson merged 2 commits into
masterfrom
bump/2026.08.27-18-android

Conversation

@MNThomson

Copy link
Copy Markdown
Owner

Organic Maps published a new Android release. This bumps the pinned tag only - patches/ is untouched.

From 2026.07.23-6-android
To 2026.08.27-18-android
Release https://github.com/organicmaps/organicmaps/releases/tag/2026.08.27-18-android
Changes organicmaps/organicmaps@2026.07.23-6-android...2026.08.27-18-android

The Build check replays patches/ onto the new tag and builds the beta APK, so it is the
real test of this bump.

organicmaps#13316 replaced the 3party/boost submodule with the
pre-generated boost_headers one and deleted configure.sh, so
src:bootstrap-boost failed before `git am` ever ran. Drop it -
`git submodule update` is now the whole of the boost setup - along with
the Boost cache steps in CI, matching what upstream did to its own
workflows.

Replaying onto the new tag then needed two patch fixes:

- 0003: re-anchor the Connect IQ .gitignore block, which upstream's
  .gitignore rewrite left without context, and drop the
  tools/hooks/format-config.bash hunk - the per-module lists it edited
  are now plain extension globs that already cover the garmin module.

- 0002: qualify the std::bind placeholders, since upstream dropped
  `using namespace std::placeholders` from SearchEngine.cpp.
@MNThomson
MNThomson merged commit 8714832 into master Sep 17, 2026
2 checks passed
@MNThomson
MNThomson deleted the bump/2026.08.27-18-android branch September 17, 2026 19:37
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.

1 participant