Skip to content

Update URLs to cppcheck GitHub project - #1619

Merged
b4n merged 3 commits into
geany:masterfrom
b4n:cppcheck-opensource
Oct 30, 2026
Merged

b4n merged 3 commits into
geany:masterfrom
b4n:cppcheck-opensource

Conversation

@b4n

@b4n b4n commented Oct 15, 2026

Copy link
Copy Markdown
Member

cppcheck migrated from danmar/cppcheck to cppcheck-opensource/cppcheck, so we should update the URLs.

It is especially needed in the cURL calls from the CI because cURL does not follow redirections and thus the downloads fail.

b4n added 3 commits October 15, 2026 21:36
cppcheck migrated from danmar/cppcheck to cppcheck-opensource/cppcheck,
so we should update the URLs.

It is especially needed in the cURL calls from the CI because cURL does
not follow redirections and thus the downloads fail.
Our own overrides for some GLib, GTK and Cairo are redundant with
cppcheck's own, and this now leads to an error on conflicting
declarations.

Thus, remove our own workaround ones and use cppcheck's ones.
@b4n

b4n commented Oct 15, 2026

Copy link
Copy Markdown
Member Author

OK so this fixes the Linux build.
Not the mingw one, but I don't really understand what's happening there: the package mingw-w64-x86_64-grep is missing, but there are also 3 other variants, ucrt-x86_64, clang-x86_64 and w64. @eht16 or @giuspen maybe you have some info on this?

@b4n

b4n commented Oct 15, 2026

Copy link
Copy Markdown
Member Author

See msys2/MINGW-packages#32459 -- yet I don't know for sure what we should do still.

@giuspen

giuspen commented Oct 17, 2026

Copy link
Copy Markdown
Contributor

Hi @b4n we decided to migrate to UCRT64 and we should stick to that, so the answer is https://packages.msys2.org/packages/mingw-w64-ucrt-x86_64-grep

@b4n

b4n commented Oct 17, 2026

Copy link
Copy Markdown
Member Author

Hi @b4n we decided to migrate to UCRT64 and we should stick to that, so the answer is https://packages.msys2.org/packages/mingw-w64-ucrt-x86_64-grep

OK, so we should either switch GP to build on Windows, or switch the cross builds to use ucrt64 tooling (that seems available on Debian Trixie, so that's probably doable).

I don't think we should really make the bundle creation process switch ABI just for that package, because that could maybe bring odd issues. But any solution is fine.

Regardless, this is an orthogonal problem to the one this PR actually fixes, so we could fix that (Windows builds) separately.

@techee (for the LSP part especially + always good advice) and @eht16 any objections to this PR as it is?

@b4n
b4n requested review from eht16 and techee October 17, 2026 20:05
@techee

techee commented Oct 22, 2026

Copy link
Copy Markdown
Member

@techee (for the LSP part especially + always good advice)

Yes, this is more or less a copy of

https://github.com/geany/geany/blob/2010df99c7a0a754d686cf3c50e0dc4b3e9b5c14/src/sidebar.c#L219-L223

and

https://github.com/geany/geany/blob/2010df99c7a0a754d686cf3c50e0dc4b3e9b5c14/src/sidebar.c#L1138

which also refs the widget after its creation so it's not a double-free. Maybe this extra ref isn't really necessary, I just copied the code without much thinking ;-)

@b4n
b4n merged commit 99a7751 into geany:master Oct 30, 2026
1 of 2 checks passed
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.

3 participants