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

[Backport release_3.34] Remove "trademarked" word #9297

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

qgis-bot
Copy link
Collaborator

@qgis-bot qgis-bot commented Oct 8, 2024

Backport #9296
Authored by: @nyalldawson

@nyalldawson
Copy link
Contributor

Ping @rouault

@rouault
Copy link

rouault commented Oct 8, 2024

The build failure due to "WARNING: unsupported theme option 'display_version' given" is due to sphinx-rtd-theme update to 3.0.0.
I've fixed this in GDAL per https://github.com/OSGeo/gdal/pull/10954/files . A more conservative alternative would be to pin to <3.0.0

@rouault
Copy link

rouault commented Oct 8, 2024

A more conservative alternative would be to pin to <3.0.0

I see this is what has been done in master per 40032ea

@DelazJ
Copy link
Collaborator

DelazJ commented Oct 9, 2024

I see this is what has been done in master per 40032ea

Which was backported to #9295, and is now merged.

@DelazJ DelazJ merged commit 1f251ab into release_3.34 Oct 9, 2024
2 of 6 checks passed
@DelazJ DelazJ deleted the backport-9296-to-release_3.34 branch October 9, 2024 05:20
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.

4 participants