[PR PATCH] strawberry: default to qt6

[PR PATCH] strawberry: default to qt6

[slymattz]

[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]

There is a new pull request by slymattz against master on the void-packages repository

https://github.com/slymattz/void-packages strawberry-qt6
https://github.com/void-linux/void-packages/pull/51851

strawberry: default to qt6
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
  - x86_64-musl: build
  - aarch64: cross build
  - aarch64-musl: cross build
  - armv7l: cross build
  - armv6l-musl: cross build
  - i686: cross build

Please advise whether `desc_option_qt6` should belong here or perhaps in _common/options.description_


A patch file from https://github.com/void-linux/void-packages/pull/51851.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-qt6-51851.patch --]
[-- Type: text/x-diff, Size: 1067 bytes --]

From 0a97fc531d77cfb347530d436e3dc122c89e95a0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 14 Aug 2024 20:43:43 +0200
Subject: [PATCH] strawberry: default to qt6

---
 srcpkgs/strawberry/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index dd69bd35fabb63..d003633e52206c 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
 # Template file for 'strawberry'
 pkgname=strawberry
 version=1.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
@@ -17,6 +17,8 @@ distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
 checksum=ec0deff3c332aaa79dc9fb6dddd694480695cc6c97e7a7aba48e45cdde11f302
 
 build_options="qt6"
+desc_option_qt6="Use Qt6 GUI"
+build_options_default="qt6"
 
 if [ "$build_option_qt6" ]; then
 	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"

Re: [PR PATCH] [Updated] strawberry: default to qt6

[slymattz]

[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]

There is an updated pull request by slymattz against master on the void-packages repository

https://github.com/slymattz/void-packages strawberry-qt6
https://github.com/void-linux/void-packages/pull/51851

strawberry: default to qt6
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
  - x86_64-musl: build
  - aarch64: cross build
  - aarch64-musl: cross build
  - armv7l: cross build
  - armv6l-musl: cross build
  - i686: cross build

Please advise whether `desc_option_qt6` should belong here or perhaps in _common/options.description_


A patch file from https://github.com/void-linux/void-packages/pull/51851.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-qt6-51851.patch --]
[-- Type: text/x-diff, Size: 2204 bytes --]

From f469f2519cc3705ad6c87be4f1f86302487a9e8b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 14 Aug 2024 20:43:43 +0200
Subject: [PATCH] strawberry: switch to qt6

---
 srcpkgs/strawberry/template | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index dd69bd35fabb63..2b57525bb62aa0 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,13 +1,15 @@
 # Template file for 'strawberry'
 pkgname=strawberry
 version=1.1.1
-revision=1
+revision=2
 build_style=cmake
-hostmakedepends="pkg-config protobuf gettext"
+configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel taglib-devel"
-depends="desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+depends="desktop-file-utils qt6-plugin-sqlite"
 short_desc="Audio player and music collection organizer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -15,19 +17,3 @@ homepage="https://www.strawberrymusicplayer.org/"
 changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
 checksum=ec0deff3c332aaa79dc9fb6dddd694480695cc6c97e7a7aba48e45cdde11f302
-
-build_options="qt6"
-
-if [ "$build_option_qt6" ]; then
-	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
-	hostmakedepends+=" qt6-base qt6-tools"
-	makedepends+=" qt6-base-devel qt6-plugin-mysql
-	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
-	depends+=" qt6-plugin-sqlite"
-else
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-	makedepends+=" qt5-tools-devel qt5-plugin-mysql
-	 qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
-	 qt5-plugin-tds qt5-x11extras-devel"
-	depends+=" qt5-plugin-sqlite"
-fi

Re: [PR PATCH] [Merged]: strawberry: default to qt6

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1263 bytes --]

There's a merged pull request on the void-packages repository

strawberry: default to qt6
https://github.com/void-linux/void-packages/pull/51851

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I built this PR locally for these architectures:
  - x86_64-musl: build
  - aarch64: cross build
  - aarch64-musl: cross build
  - armv7l: cross build
  - armv6l-musl: cross build
  - i686: cross build

Please advise whether `desc_option_qt6` should belong here or perhaps in _common/options.description_