* [PR PATCH] New package: phonon-qt6
@ 2024-03-06 7:15 Luciogi
2024-03-06 7:27 ` [PR PATCH] [Updated] " Luciogi
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 7:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 657 bytes --]
There is a new pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 3795 bytes --]
From 076d8380f66d4782560af2c5f76bb421bafc0022 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..c708f1650f3193 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +21,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From c583f6ae3e6c86b4362cc66f695906a4c2c92eae Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/2] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..984b619f77dd09
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools"
+makedepends="glib-devel qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
@ 2024-03-06 7:27 ` Luciogi
2024-03-06 7:37 ` Luciogi
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 3892 bytes --]
From 9ed98a413f092f1922a4df43b5c01c1a59596d4c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..ef6c85f70ad5ed 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+post_install() {
+ # conflicts with phonon-qt6
+ rm ${DESTDIR}/usr/share/locale -rf
+}
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +26,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From 47e2f1a95d27945755c79fa8223697e78b95daa0 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/2] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..984b619f77dd09
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools"
+makedepends="glib-devel qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
2024-03-06 7:27 ` [PR PATCH] [Updated] " Luciogi
@ 2024-03-06 7:37 ` Luciogi
2024-03-06 8:00 ` [PR REVIEW] " meator
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 7:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 3901 bytes --]
From 9ed98a413f092f1922a4df43b5c01c1a59596d4c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..ef6c85f70ad5ed 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+post_install() {
+ # conflicts with phonon-qt6
+ rm ${DESTDIR}/usr/share/locale -rf
+}
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +26,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From d1a557ce5013d88069d1469d2d3ffc628000d521 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/2] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..c0121606692e0b
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base"
+makedepends="glib-devel qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
2024-03-06 7:27 ` [PR PATCH] [Updated] " Luciogi
2024-03-06 7:37 ` Luciogi
@ 2024-03-06 8:00 ` meator
2024-03-06 8:01 ` Luciogi
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: meator @ 2024-03-06 8:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New review comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/49141#discussion_r1513989452
Comment:
@Luciogi Are you @Johnnynator? If not, making someone else the maintainer of your template requires their consent.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (2 preceding siblings ...)
2024-03-06 8:00 ` [PR REVIEW] " meator
@ 2024-03-06 8:01 ` Luciogi
2024-03-06 8:07 ` [PR PATCH] [Updated] " Luciogi
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New review comment by Luciogi on void-packages repository
https://github.com/void-linux/void-packages/pull/49141#discussion_r1513990244
Comment:
Ops
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (3 preceding siblings ...)
2024-03-06 8:01 ` Luciogi
@ 2024-03-06 8:07 ` Luciogi
2024-03-06 8:09 ` Luciogi
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 3912 bytes --]
From 9ed98a413f092f1922a4df43b5c01c1a59596d4c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..ef6c85f70ad5ed 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+post_install() {
+ # conflicts with phonon-qt6
+ rm ${DESTDIR}/usr/share/locale -rf
+}
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +26,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From e06d9feec70b0c9a7c2c65a981fe1faec2d5a881 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/2] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..471c2f3a441a59
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base"
+makedepends="glib-devel qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="Luciogi <lucigithubcommit@skiff.com>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (4 preceding siblings ...)
2024-03-06 8:07 ` [PR PATCH] [Updated] " Luciogi
@ 2024-03-06 8:09 ` Luciogi
2024-03-06 8:20 ` Johnnynator
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 8:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 3922 bytes --]
From 9ed98a413f092f1922a4df43b5c01c1a59596d4c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..ef6c85f70ad5ed 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+post_install() {
+ # conflicts with phonon-qt6
+ rm ${DESTDIR}/usr/share/locale -rf
+}
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +26,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From db1dd4702fcad30fc1835df55a7fc67e3dbfb996 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/2] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..53f1d2f9a3ed32
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base"
+makedepends="glib-devel qt6-tools qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="Luciogi <lucigithubcommit@skiff.com>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (5 preceding siblings ...)
2024-03-06 8:09 ` Luciogi
@ 2024-03-06 8:20 ` Johnnynator
2024-03-06 8:27 ` [PR REVIEW] " sgn
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Johnnynator @ 2024-03-06 8:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/49141#issuecomment-1980314235
Comment:
https://github.com/void-linux/void-packages/pull/47609
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (6 preceding siblings ...)
2024-03-06 8:20 ` Johnnynator
@ 2024-03-06 8:27 ` sgn
2024-03-06 8:27 ` [PR PATCH] [Updated] " sgn
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2024-03-06 8:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/49141#discussion_r1514020898
Comment:
```suggestion
makedepends="glib-devel qt6-base-devel qt6-qt5compat-devel pulseaudio-devel"
```
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (7 preceding siblings ...)
2024-03-06 8:27 ` [PR REVIEW] " sgn
@ 2024-03-06 8:27 ` sgn
2024-03-06 8:44 ` Luciogi
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2024-03-06 8:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 658 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 4947 bytes --]
From 9ed98a413f092f1922a4df43b5c01c1a59596d4c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/3] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..ef6c85f70ad5ed 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+post_install() {
+ # conflicts with phonon-qt6
+ rm ${DESTDIR}/usr/share/locale -rf
+}
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +26,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From db1dd4702fcad30fc1835df55a7fc67e3dbfb996 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/3] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..53f1d2f9a3ed32
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base"
+makedepends="glib-devel qt6-tools qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="Luciogi <lucigithubcommit@skiff.com>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
From 60766b842682730c34a8ccdf3acaa988ecf00d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<sgn.danh@gmail.com>
Date: Wed, 6 Mar 2024 15:27:41 +0700
Subject: [PATCH 3/3] Update srcpkgs/phonon-qt6/template
---
srcpkgs/phonon-qt6/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
index 53f1d2f9a3ed32..da1391b9eb641b 100644
--- a/srcpkgs/phonon-qt6/template
+++ b/srcpkgs/phonon-qt6/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base"
-makedepends="glib-devel qt6-tools qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+makedepends="glib-devel qt6-base-devel qt6-qt5compat-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
maintainer="Luciogi <lucigithubcommit@skiff.com>"
license="LGPL-2.1-or-later"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (8 preceding siblings ...)
2024-03-06 8:27 ` [PR PATCH] [Updated] " sgn
@ 2024-03-06 8:44 ` Luciogi
2024-03-06 8:45 ` Luciogi
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 8:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 3922 bytes --]
From 9ed98a413f092f1922a4df43b5c01c1a59596d4c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..ef6c85f70ad5ed 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+post_install() {
+ # conflicts with phonon-qt6
+ rm ${DESTDIR}/usr/share/locale -rf
+}
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +26,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From db1dd4702fcad30fc1835df55a7fc67e3dbfb996 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/2] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..53f1d2f9a3ed32
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base"
+makedepends="glib-devel qt6-tools qt6-base-devel qt6-tools-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="Luciogi <lucigithubcommit@skiff.com>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (9 preceding siblings ...)
2024-03-06 8:44 ` Luciogi
@ 2024-03-06 8:45 ` Luciogi
2024-03-06 15:53 ` [PR PATCH] [Closed]: " Luciogi
2024-03-06 15:53 ` Luciogi
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 8:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages ph-qt6
https://github.com/void-linux/void-packages/pull/49141
New package: phonon-qt6
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ph-qt6-49141.patch --]
[-- Type: text/x-diff, Size: 3896 bytes --]
From 9ed98a413f092f1922a4df43b5c01c1a59596d4c Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:52 +0500
Subject: [PATCH 1/2] phonon-qt5: update to 4.12.0.
---
srcpkgs/phonon-qt5/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/phonon-qt5/template b/srcpkgs/phonon-qt5/template
index 150ef594bb8b8c..ef6c85f70ad5ed 100644
--- a/srcpkgs/phonon-qt5/template
+++ b/srcpkgs/phonon-qt5/template
@@ -1,9 +1,10 @@
# Template file for 'phonon-qt5'
pkgname=phonon-qt5
-version=4.11.1
-revision=2
+version=4.12.0
+revision=1
build_style=cmake
-configure_args="-DPHONON_BUILD_PHONON4QT5=ON -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+configure_args="-DPHONON_BUILD_QT6=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
+ -DPHONON_BUILD_SETTINGS=OFF"
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel"
makedepends="glib-devel qt5-devel qt5-tools-devel pulseaudio-devel"
short_desc="Multimedia framework for KDE"
@@ -11,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://phonon.kde.org/"
distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
-checksum=b4431ea2600df8137a717741ad9ebc7f7ec1649fa3e138541d8f42597144de2d
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+post_install() {
+ # conflicts with phonon-qt6
+ rm ${DESTDIR}/usr/share/locale -rf
+}
phonon-qt5-devel_package() {
depends="qt5-devel ${sourcepkg}-${version}_${revision}"
@@ -20,8 +26,7 @@ phonon-qt5-devel_package() {
vmove usr/lib/qt5/mkspecs
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
- vmove usr/share/phonon4qt5
- vmove usr/lib/qt5/plugins/designer/phononwidgets.so
+ vmove "usr/lib/qt5/plugins/designer/*.so"
vmove "usr/lib/*.so"
}
}
From 4a4b95758f203463e09ded16637704b9ece7de4f Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Wed, 6 Mar 2024 12:02:03 +0500
Subject: [PATCH 2/2] New package: phonon-qt6-4.12.0
---
srcpkgs/phonon-qt6-devel | 1 +
srcpkgs/phonon-qt6/template | 25 +++++++++++++++++++++++++
srcpkgs/phonon-qt6/update | 1 +
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/phonon-qt6-devel
create mode 100644 srcpkgs/phonon-qt6/template
create mode 100644 srcpkgs/phonon-qt6/update
diff --git a/srcpkgs/phonon-qt6-devel b/srcpkgs/phonon-qt6-devel
new file mode 120000
index 00000000000000..6ba9c6d3b3b3e0
--- /dev/null
+++ b/srcpkgs/phonon-qt6-devel
@@ -0,0 +1 @@
+phonon-qt6
\ No newline at end of file
diff --git a/srcpkgs/phonon-qt6/template b/srcpkgs/phonon-qt6/template
new file mode 100644
index 00000000000000..da1391b9eb641b
--- /dev/null
+++ b/srcpkgs/phonon-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'phonon-qt6'
+pkgname=phonon-qt6
+version=4.12.0
+revision=1
+build_style=cmake
+configure_args="-DPHONON_BUILD_QT5=OFF -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON"
+hostmakedepends="extra-cmake-modules qt6-tools qt6-base"
+makedepends="glib-devel qt6-base-devel qt6-qt5compat-devel pulseaudio-devel"
+short_desc="Multimedia framework for KDE"
+maintainer="Luciogi <lucigithubcommit@skiff.com>"
+license="LGPL-2.1-or-later"
+homepage="https://phonon.kde.org/"
+distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz"
+checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a
+
+phonon-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/qt6/plugins/designer/*.so"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/phonon-qt6/update b/srcpkgs/phonon-qt6/update
new file mode 100644
index 00000000000000..45bccdf8f38875
--- /dev/null
+++ b/srcpkgs/phonon-qt6/update
@@ -0,0 +1 @@
+pkgname=${pkgname%-*}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Closed]: New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (10 preceding siblings ...)
2024-03-06 8:45 ` Luciogi
@ 2024-03-06 15:53 ` Luciogi
2024-03-06 15:53 ` Luciogi
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There's a closed pull request on the void-packages repository
New package: phonon-qt6
https://github.com/void-linux/void-packages/pull/49141
Description:
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: New package: phonon-qt6
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
` (11 preceding siblings ...)
2024-03-06 15:53 ` [PR PATCH] [Closed]: " Luciogi
@ 2024-03-06 15:53 ` Luciogi
12 siblings, 0 replies; 14+ messages in thread
From: Luciogi @ 2024-03-06 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New comment by Luciogi on void-packages repository
https://github.com/void-linux/void-packages/pull/49141#issuecomment-1981190641
Comment:
closing
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-03-06 15:53 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-06 7:15 [PR PATCH] New package: phonon-qt6 Luciogi
2024-03-06 7:27 ` [PR PATCH] [Updated] " Luciogi
2024-03-06 7:37 ` Luciogi
2024-03-06 8:00 ` [PR REVIEW] " meator
2024-03-06 8:01 ` Luciogi
2024-03-06 8:07 ` [PR PATCH] [Updated] " Luciogi
2024-03-06 8:09 ` Luciogi
2024-03-06 8:20 ` Johnnynator
2024-03-06 8:27 ` [PR REVIEW] " sgn
2024-03-06 8:27 ` [PR PATCH] [Updated] " sgn
2024-03-06 8:44 ` Luciogi
2024-03-06 8:45 ` Luciogi
2024-03-06 15:53 ` [PR PATCH] [Closed]: " Luciogi
2024-03-06 15:53 ` Luciogi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).