Skip to content
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

ODS: fix parsing of large cells on Windows (at least with mingw64) with new expat 2.6.0 release #9207

Merged
merged 8 commits into from
Feb 7, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Feb 7, 2024

and harmonize on a 8192 byte large parsing buffer on all platforms in GeoRSS, GPX, JML, KML, LVBAG, SVG and XLSX drivers

@coveralls
Copy link
Collaborator

Coverage Status

coverage: 68.805% (+0.004%) from 68.801%
when pulling 0da58f2 on rouault:expat_2_6_compatibility
into 0c15b18 on OSGeo:master.

@rouault rouault merged commit 0255b1d into OSGeo:master Feb 7, 2024
33 checks passed
@rouault
Copy link
Member Author

rouault commented Feb 7, 2024

The backport to release/3.8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2c1b8dfc82... GPX: harmonize on a 8192 byte large parsing buffer on all platforms
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp
[backport-9207-to-release/3.8 4e10b21c72] ODS: fix parsing of large cells on Windows (at least with mingw64) with new expat 2.6.0 release
 Author: Even Rouault <[email protected]>
 Date: Wed Feb 7 17:59:15 2024 +0100
 1 file changed, 10 insertions(+), 8 deletions(-)
Auto-merging ogr/ogrsf_frmts/georss/ogr_georss.h
Auto-merging ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp
[backport-9207-to-release/3.8 efe853034e] GeoRSS: harmonize on a 8192 byte large parsing buffer on all platforms
 Author: Even Rouault <[email protected]>
 Date: Wed Feb 7 17:59:38 2024 +0100
 3 files changed, 21 insertions(+), 17 deletions(-)
Auto-merging ogr/ogrsf_frmts/gpx/ogr_gpx.h
Auto-merging ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
CONFLICT (content): Merge conflict in ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp
Auto-merging ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
CONFLICT (content): Merge conflict in ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.8 release/3.8
# Navigate to the new working tree
cd .worktrees/backport-release/3.8
# Create a new branch
git switch --create backport-9207-to-release/3.8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 108584f7cc976701171b7ba2d1233b4c3df2693c,196534c2e10bc0ba8bc598018621675d1a4a7dfa,2c1b8dfc8254ce56e4d6e0f2be707603abc5ee94,68f00ffb9c9645ada83fef815054409ae7f70f29,caed0dd4540c856e6c0ac09d86c48ba6cc91cbd7,c47f664e43ce4f124d4d2b125015a8176a8a3c65,05bf41a3ee006ebc1ff5b0d760ab2767f7daa1f8,0da58f282a46694286fd73a367577d79207bd13c
# Push it to GitHub
git push --set-upstream origin backport-9207-to-release/3.8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.8

Then, create a pull request where the base branch is release/3.8 and the compare/head branch is backport-9207-to-release/3.8.

@rouault
Copy link
Member Author

rouault commented Feb 7, 2024

backport to 3.8 in #9210

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