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

Add qt5svg to deps #18

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Add qt5svg to deps #18

merged 2 commits into from
Jan 28, 2025

Conversation

tresf
Copy link
Member

@tresf tresf commented Jan 27, 2025

Prerequisite for LMMS/lmms#7667.

@messmerd
Copy link
Member

messmerd commented Jan 27, 2025

I can create and upload new Linux and MinGW images based on this branch tomorrow.

Should I also update Wine to Wine 10?

@tresf
Copy link
Member Author

tresf commented Jan 27, 2025

I can create and upload new Linux and MinGW images based on this branch tomorrow.

Thanks!

Should I also update Wine to Wine 10?

Maybe to winehq-stable 10 since we haven't yet isolated the cause of LMMS/lmms#7669?

@messmerd
Copy link
Member

messmerd commented Jan 27, 2025

@tresf I've created and pushed the new images, so builds should start using them.

The packages are using the latest version of CMake from Kitware's repo, which I believe is v3.31.5.

I also updated Linux to Wine 10 stable:

diff --git a/linux.gcc/Dockerfile b/linux.gcc/Dockerfile
index cc105ce..f98a7db 100644
--- a/linux.gcc/Dockerfile
+++ b/linux.gcc/Dockerfile
@@ -20,6 +20,6 @@ RUN mkdir -pm755 /etc/apt/keyrings \
 # VST dependencies
 RUN apt-get update && apt-get install -y    \
     --install-recommends                    \
-        winehq-staging                      \
-        wine-staging-dev                    \
+        winehq-stable                       \
+        wine-stable-dev                     \
     && rm -rf /var/lib/apt/lists/*

If you apply that patch, I think this is good to merge.

@tresf
Copy link
Member Author

tresf commented Jan 28, 2025

Maybe to winehq-stable 10 since we haven't yet isolated the cause of LMMS/lmms#7669?

If you apply that patch, I think this is good to merge.

Thanks for the new images. Testing LMMS/lmms#7667, I can confirm that winehq-stable/ wine 10 did NOT fix #7669 so this change isn't going to help that cause specifically.

I'll add it to this PR, but only so they're in sync with eachother.

@tresf tresf merged commit 6726465 into master Jan 28, 2025
0 of 2 checks passed
@tresf tresf deleted the qt5-svg branch January 28, 2025 07:00
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