2 files changed, 23 insertions, 18 deletions
diff --git a/audio/mixxx/files/patch-src_qml_qmlwaveformoverview.h b/audio/mixxx/files/patch-src_qml_qmlwaveformoverview.h
deleted file mode 100644
index beeeb4ed9f69..000000000000
--- a/audio/mixxx/files/patch-src_qml_qmlwaveformoverview.h
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix build with Qt >= 6.9.0
-
-https://github.com/mixxxdj/mixxx/issues/14122
-
---- src/qml/qmlwaveformoverview.h.orig	2024-12-24 01:32:09 UTC
-+++ src/qml/qmlwaveformoverview.h
-@@ -58,7 +58,11 @@ class QmlWaveformOverview : public QQuickPaintedItem {
-   signals:
-     void playerChanged();
-     void channelsChanged(mixxx::qml::QmlWaveformOverview::Channels channels);
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-+    void rendererChanged(Renderer renderer);
-+#else
-     void rendererChanged(mixxx::qml::QmlWaveformOverview::Renderer renderer);
-+#endif
-     void colorHighChanged(const QColor& color);
-     void colorMidChanged(const QColor& color);
-     void colorLowChanged(const QColor& color);
diff --git a/audio/mixxx/files/patch-src_widget_wcoverartlabel.cpp b/audio/mixxx/files/patch-src_widget_wcoverartlabel.cpp
new file mode 100644
index 000000000000..93f1c7defd39
--- /dev/null
+++ b/audio/mixxx/files/patch-src_widget_wcoverartlabel.cpp
@@ -0,0 +1,23 @@
+--- src/widget/wcoverartlabel.cpp.orig	2025-07-04 17:25:50 UTC
++++ src/widget/wcoverartlabel.cpp
+@@ -70,7 +70,7 @@ void WCoverArtLabel::setPixmapAndResize(const QPixmap&
+         m_fullSizeCover = px;
+         setPixmap(m_loadedCover);
+     }
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+     QSize newSize = pixmap().size() / devicePixelRatioF();
+ #else
+     QSize newSize = pixmap()->size() / devicePixelRatioF();
+@@ -92,7 +92,11 @@ void WCoverArtLabel::setMaxSize(const QSize newSize) {
+     // Skip resizing the pixmap and label if the pixmap already fits.
+     // Check if we got more space in one dimension and don't need it
+     // for the other.
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+     const QSize pixmapSize = pixmap().size() / devicePixelRatioF();
++#else
++    const QSize pixmapSize = pixmap()->size() / devicePixelRatioF();
++#endif
+     if (m_pixmapSizeMax == pixmapSize ||
+             (m_pixmapSizeMax.height() == pixmapSize.height() &&
+                     m_pixmapSizeMax.width() > pixmapSize.width()) ||