commit:     1378bf2991b29cd8e691009d628b310a5079b3b0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  1 08:21:31 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 08:22:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1378bf29

media-sound/strawberry: fixed linking against qt

Closes: https://bugs.gentoo.org/914985
Thanks-to: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{strawberry-1.0.18.ebuild => strawberry-1.0.18-r1.ebuild}          | 3 +--
 .../{strawberry-1.0.20.ebuild => strawberry-1.0.20-r1.ebuild}          | 3 +--
 media-sound/strawberry/strawberry-9999.ebuild                          | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/media-sound/strawberry/strawberry-1.0.18.ebuild 
b/media-sound/strawberry/strawberry-1.0.18-r1.ebuild
similarity index 98%
rename from media-sound/strawberry/strawberry-1.0.18.ebuild
rename to media-sound/strawberry/strawberry-1.0.18-r1.ebuild
index e7b15325921c..3b9cb84b945d 100644
--- a/media-sound/strawberry/strawberry-1.0.18.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.18-r1.ebuild
@@ -102,8 +102,7 @@ src_configure() {
                -DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
                -DENABLE_UDISKS2="$(usex udisks)"
                -DENABLE_VLC="$(usex vlc)"
-               # Disable until we have qt6 in the tree
-               -DWITH_QT6=OFF
+               -DQT_VERSION_MAJOR=5
        )
 
        use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT

diff --git a/media-sound/strawberry/strawberry-1.0.20.ebuild 
b/media-sound/strawberry/strawberry-1.0.20-r1.ebuild
similarity index 98%
rename from media-sound/strawberry/strawberry-1.0.20.ebuild
rename to media-sound/strawberry/strawberry-1.0.20-r1.ebuild
index d228a9e4d370..3db9ec7c7628 100644
--- a/media-sound/strawberry/strawberry-1.0.20.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.20-r1.ebuild
@@ -102,8 +102,7 @@ src_configure() {
                -DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
                -DENABLE_UDISKS2="$(usex udisks)"
                -DENABLE_VLC="$(usex vlc)"
-               # Disable until we have qt6 in the tree
-               -DWITH_QT6=OFF
+               -DQT_VERSION_MAJOR=5
        )
 
        use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT

diff --git a/media-sound/strawberry/strawberry-9999.ebuild 
b/media-sound/strawberry/strawberry-9999.ebuild
index d228a9e4d370..3db9ec7c7628 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -102,8 +102,7 @@ src_configure() {
                -DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
                -DENABLE_UDISKS2="$(usex udisks)"
                -DENABLE_VLC="$(usex vlc)"
-               # Disable until we have qt6 in the tree
-               -DWITH_QT6=OFF
+               -DQT_VERSION_MAJOR=5
        )
 
        use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT

Reply via email to