Skip to content

CI: Updated include path for OSGeo4W cairo 1.18 - #7507

Merged
echoix merged 2 commits into
OSGeo:mainfrom
cwhite911:mswindows-ci-cairo
Jun 6, 2026
Merged

echoix merged 2 commits into
OSGeo:mainfrom
cwhite911:mswindows-ci-cairo

Conversation

@cwhite911

Copy link
Copy Markdown
Contributor

Fixed Windows OSGeo4W build by updating --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include to --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include/cairo.

The change is from OSGeo4W migrating its cairo package to Meson and bumped it to 1.18.4 (jef-n/OSGeo4W@c3b8830).

@github-actions github-actions Bot added the windows Microsoft Windows specific label Jun 5, 2026
@cwhite911

Copy link
Copy Markdown
Contributor Author

Whoops need to update .github/workflows/build_osgeo4w.sh

@echoix

echoix commented Jun 6, 2026 •

Copy link
Copy Markdown
Member

Whoops need to update .github/workflows/build_osgeo4w.sh

This line:
https://github.com/cwhite911/grass/blob/e9d159febfcfe952f6f759eb45e80805b973de80/mswindows/osgeo4w/build_osgeo4w.sh#L43

@cwhite911

Copy link
Copy Markdown
Contributor Author

Whoops need to update .github/workflows/build_osgeo4w.sh

This line:

https://github.com/cwhite911/grass/blob/e9d159febfcfe952f6f759eb45e80805b973de80/mswindows/osgeo4w/build_osgeo4w.sh#L43

Yes.

@cwhite911 cwhite911 changed the title mswindows: Updated include path for OSGeo4W cairo 1.18 CI: Updated include path for OSGeo4W cairo 1.18 Jun 6, 2026
@cwhite911 cwhite911 self-assigned this Jun 6, 2026
@echoix
echoix merged commit 2eabe86 into OSGeo:main Jun 6, 2026
26 of 27 checks passed
@github-actions github-actions Bot added this to the 8.6.0 milestone Jun 6, 2026
@echoix

echoix commented Jun 6, 2026

Copy link
Copy Markdown
Member

A backport is probably needed. And maybe needs to be rereleased unless osgeo4w adds a patch for 8.5. But 8.5 is not released yet on osgeo4w yet. Only the 8.6dev and 8.4.x one

@echoix echoix added backport to 8.4 PR needs to be backported to release branch 8.4 backport to 8.5 PR needs to be backported to release branch 8.5 labels Jun 8, 2026
@echoix

echoix commented Jun 8, 2026

Copy link
Copy Markdown
Member

Backport should be done, so builds can continue to be made in CI

jef-n added a commit to jef-n/OSGeo4W that referenced this pull request Jun 12, 2026
@echoix

echoix commented Jun 14, 2026

Copy link
Copy Markdown
Member

@neteler can we have this backported to all where we can? No ci can run through the configure step without this.

neteler pushed a commit that referenced this pull request Jun 14, 2026
Fixed Windows OSGeo4W build by updating `--with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include` to `--with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include/cairo`.

The change is from OSGeo4W migrating its cairo package to Meson and bumped it to 1.18.4 (jef-n/OSGeo4W@c3b8830).

* mswindows: Updated include path for OSGeo4W cairo 1.18

* Updated include path for OSGeo4W cairo 1.18
neteler added a commit that referenced this pull request Jun 14, 2026
@neteler

neteler commented Jun 14, 2026

Copy link
Copy Markdown
Member

@echoix backported to G8.5 and (manually due to the major file differences) to G8.4 in 6e3346b

@neteler neteler removed backport to 8.4 PR needs to be backported to release branch 8.4 backport to 8.5 PR needs to be backported to release branch 8.5 labels Jun 14, 2026
@echoix

echoix commented Jun 14, 2026

Copy link
Copy Markdown
Member

@echoix backported to G8.5 and (manually due to the major file differences) to G8.4 in 6e3346b

Thanks!

ninsbl pushed a commit to ninsbl/grass that referenced this pull request Jul 7, 2026
Fixed Windows OSGeo4W build by updating `--with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include` to `--with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include/cairo`.

The change is from OSGeo4W migrating its cairo package to Meson and bumped it to 1.18.4 (jef-n/OSGeo4W@c3b8830).

* mswindows: Updated include path for OSGeo4W cairo 1.18

* Updated include path for OSGeo4W cairo 1.18
petrasovaa added a commit to petrasovaa/grass-addons that referenced this pull request Nov 3, 2026
OSGeo4W moved the cairo headers to include/cairo after 8.5.0 was
released; main has the fix from OSGeo/grass#7507. Apply the same
one-line change the OSGeo4W grass package recipe applies to the
8.5.0 sources before compiling.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

windows Microsoft Windows specific

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants