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

fix: build when compiling with GTKMM-4 #6393

Merged
merged 2 commits into from
Dec 17, 2023

Conversation

Coeur
Copy link
Collaborator

@Coeur Coeur commented Dec 16, 2023

Fix #6392

@mikedld
Copy link
Member

mikedld commented Dec 16, 2023

This makes no sense, at least not in main — as noted by @GaryElshaw, minimum is 4.11.1 so checking for 4.10 is pointless. If applicable to 4.0.x (where minimum is lower), feel free to retarget.

@Coeur Coeur changed the base branch from main to 4.0.x December 16, 2023 23:12
@Coeur
Copy link
Collaborator Author

Coeur commented Dec 16, 2023

@mikedld retarget done

@GaryElshaw
Copy link
Contributor

@Coeur Yep, this needs to be done on the 4.0 branch. This is from the 4.1 branch, i'm wondering if those 3 and 4 designations need to be included in the 4.0 branch cmakelists file.

set(GTKMM3_MINIMUM 3.24.0) set(GTKMM4_MINIMUM 4.11.1)

@mikedld
Copy link
Member

mikedld commented Dec 16, 2023

get_files() in 4.0-4.10 returns a model, not a vector, so IIUC this won't compile. I thought we had get_files2() reverted in 4.0.x, looking at #6144, why would it still be there?..

@mikedld
Copy link
Member

mikedld commented Dec 17, 2023

I think @ckerr may have unnecessarily cherry-picked bd31d80 (seeing how there was no PR and the one referred to in commit subject line is against main), reverting it should do the trick.

EDIT: To be fair, #6131 does state that it targets 4.0.x milestone, just that the fix in two branches was meant to be different...

@ckerr
Copy link
Member

ckerr commented Dec 17, 2023

@mikedld yes, agreed. I think I goofed that one.

@Coeur Coeur changed the title build fix get_files2 behind IF_GTKMM4_10 build fix for GTKMM-4 Dec 17, 2023
@ckerr ckerr changed the title build fix for GTKMM-4 fix: build when compiling with GTKMM-4 Dec 17, 2023
@ckerr
Copy link
Member

ckerr commented Dec 17, 2023

Notes: Fixed build when compiling with GTKMM 4.

@ckerr ckerr merged commit e116672 into transmission:4.0.x Dec 17, 2023
1 check passed
@Coeur Coeur deleted the coeur/IF_GTKMM4_10 branch December 17, 2023 23:35
davidxuang added a commit to davidxuang/transmission that referenced this pull request Jan 11, 2024
davidxuang added a commit to davidxuang/transmission that referenced this pull request Jan 11, 2024
davidxuang added a commit to davidxuang/transmission that referenced this pull request Jan 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

4.0.5 fails to build with gtkmm-4
4 participants