[PR PATCH] New package: kstars

[PR PATCH] New package: kstars

[ericonr]

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

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

https://github.com/ericonr/void-packages kstars
https://github.com/void-linux/void-packages/pull/23824

New package: kstars
My first build errored out because it tried linking against `libsecret`, which wasn't available. Since `libsecret` is listed in `qtkeychain-qt5`'s cmake file, it should also be a dependency of `qtkeychain-qt5-devel`. This PR includes that fix and the removal of `libsecret-devel` from a few templates which don't need to be rebuilt.

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

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

From 58bb33f58ed52c243adb7dffdf292110acb25de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:39:44 -0300
Subject: [PATCH 1/5] qtkeychain-qt5-devel: add libsecret-devel as dep.

libsecret-1 is referenced in one of its cmake files, and some
applications that don't directly depend on it still try to link to it.

Also fix xlint.
---
 srcpkgs/qtkeychain-qt5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 847f074fc7f..9bac2f766d0 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,7 +1,7 @@
-# Template file for 'qtkeychain'
+# Template file for 'qtkeychain-qt5'
 pkgname=qtkeychain-qt5
 version=0.9.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -22,7 +22,7 @@ post_install() {
 }
 
 qtkeychain-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 063c0900eb3d1c6c33c7ed7f6ae45e9cf3460fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:03 -0300
Subject: [PATCH 2/5] tomahawk: remove libsecret-devel makedep, xlint.

---
 srcpkgs/tomahawk/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 3910267caa8..a44caf4db27 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -5,11 +5,6 @@ revision=20
 wrksrc=${pkgname}-${_commit}
 _commit=00f602e10203b76fc28b4615868c567e6bd4ced4
 build_style=cmake
-build_options="upower hatchet kde xmpp"
-desc_option_hatchet="Enable support for http://hatchet.is"
-desc_option_kde="Enable support for KDE"
-desc_option_xmpp="Enable support for XMPP"
-build_options_default="xmpp upower"
 configure_args="-Wno-dev -DBUILD_RELEASE=ON \
  $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \
  -DBUILD_WITH_QT4=OFF \
@@ -21,7 +16,7 @@ hostmakedepends="pkg-config extra-cmake-modules"
 makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
  libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
  qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
- quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
+ quazip-devel sparsehash taglib-devel vlc-devel
  $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
  $(vopt_if kde telepathy-qt5-devel)"
 depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
@@ -31,6 +26,11 @@ license="GPL-3.0-or-later"
 homepage="https://tomahawk-player.org/"
 distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz"
 checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79
+build_options="upower hatchet kde xmpp"
+desc_option_hatchet="Enable support for http://hatchet.is"
+desc_option_kde="Enable support for KDE"
+desc_option_xmpp="Enable support for XMPP"
+build_options_default="xmpp upower"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From a88073977ff3b118e9d457ee88435489dbf937e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:27 -0300
Subject: [PATCH 3/5] chatterino2: remove libsecret-devel makedepends.

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 53e41580dbc..9c38a6bf08b 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -11,7 +11,7 @@ hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
  libcommuni-devel pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
  boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel libsecret-devel"
+ qtkeychain-qt5-devel"
 short_desc="Qt-based twitch chat client"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="MIT"

From 8a4a9973531316de0a590e10003e89133c095cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:42 -0300
Subject: [PATCH 4/5] Quaternion: remove libsecret-devel makedepends.

---
 srcpkgs/Quaternion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 6aa90ef10de..0021dac6408 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
  qt5-multimedia-devel libqmatrixclient-devel
- $(vopt_if qtkeychain 'qtkeychain-qt5-devel libsecret-devel')"
+ $(vopt_if qtkeychain qtkeychain-qt5-devel)"
 depends="qt5-quickcontrols"
 short_desc="Qt5-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"

From da5dab491358f09fc739fcbfff9897b4684c91db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:47:17 -0300
Subject: [PATCH 5/5] New package: kstars-3.4.3.

---
 srcpkgs/kstars/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/kstars/template

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
new file mode 100644
index 00000000000..846f222164d
--- /dev/null
+++ b/srcpkgs/kstars/template
@@ -0,0 +1,21 @@
+# Template file for 'kstars'
+pkgname=kstars
+version=3.4.3
+revision=1
+build_style=cmake
+hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
+ kconfig"
+makedepends="extra-cmake-modules eigen qt5-devel qt5-declarative-devel
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+ qt5-plugin-tds qt5-svg-devel qt5-websockets-devel qt5-datavis3d-devel
+ cfitsio-devel  libnova-devel libraw-devel qtkeychain-qt5-devel
+ knotifyconfig-devel kauth-devel kconfig-devel kcrash-devel kdoctools-devel
+ kwidgetsaddons-devel knewstuff-devel ki18n-devel kio-devel kxmlgui-devel
+ kplotting-devel knotifications-devel"
+depends="xplanet"
+short_desc="Open source, cross-platform Astronomy Software by KDE"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://edu.kde.org/kstars/"
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c81119a85e9265991dd0fbfafdc6ba797bf3bedce64f4d5260511bafccebbe48

Re: New package: kstars

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23824#issuecomment-663782175

Comment:
Hmm Tomahawk needs to be updated for Qt 5.15. Should I add a patch, even though it shouldn't be rebuilt?

Re: [PR PATCH] [Updated] New package: kstars

[ericonr]

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

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

https://github.com/ericonr/void-packages kstars
https://github.com/void-linux/void-packages/pull/23824

New package: kstars
My first build errored out because it tried linking against `libsecret`, which wasn't available. Since `libsecret` is listed in `qtkeychain-qt5`'s cmake file, it should also be a dependency of `qtkeychain-qt5-devel`. This PR includes that fix and the removal of `libsecret-devel` from a few templates which don't need to be rebuilt.

Tested on x86_64-musl and built for armv7l-musl, since I'm not sure CI will manage to finish.

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

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

From 58bb33f58ed52c243adb7dffdf292110acb25de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:39:44 -0300
Subject: [PATCH 1/5] qtkeychain-qt5-devel: add libsecret-devel as dep.

libsecret-1 is referenced in one of its cmake files, and some
applications that don't directly depend on it still try to link to it.

Also fix xlint.
---
 srcpkgs/qtkeychain-qt5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 847f074fc7f..9bac2f766d0 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,7 +1,7 @@
-# Template file for 'qtkeychain'
+# Template file for 'qtkeychain-qt5'
 pkgname=qtkeychain-qt5
 version=0.9.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -22,7 +22,7 @@ post_install() {
 }
 
 qtkeychain-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From d9b756b720b0b74880cc057b3a1c7a92a8440975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:03 -0300
Subject: [PATCH 2/5] tomahawk: update to 0.8.4_21, xlintify.

Update to a new commit to allow it to build properly.
---
 srcpkgs/tomahawk/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 3910267caa8..99e7621909a 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,15 +1,10 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk
 version=0.8.4
-revision=20
+revision=21
 wrksrc=${pkgname}-${_commit}
-_commit=00f602e10203b76fc28b4615868c567e6bd4ced4
+_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
 build_style=cmake
-build_options="upower hatchet kde xmpp"
-desc_option_hatchet="Enable support for http://hatchet.is"
-desc_option_kde="Enable support for KDE"
-desc_option_xmpp="Enable support for XMPP"
-build_options_default="xmpp upower"
 configure_args="-Wno-dev -DBUILD_RELEASE=ON \
  $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \
  -DBUILD_WITH_QT4=OFF \
@@ -21,7 +16,7 @@ hostmakedepends="pkg-config extra-cmake-modules"
 makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
  libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
  qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
- quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
+ quazip-devel sparsehash taglib-devel vlc-devel
  $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
  $(vopt_if kde telepathy-qt5-devel)"
 depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
@@ -30,7 +25,12 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tomahawk-player.org/"
 distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz"
-checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79
+checksum=3305a8221af1bfa51cbf5256abf8ab3824393b684ce428a3c46409cf5e1d3fce
+build_options="upower hatchet kde xmpp"
+desc_option_hatchet="Enable support for http://hatchet.is"
+desc_option_kde="Enable support for KDE"
+desc_option_xmpp="Enable support for XMPP"
+build_options_default="xmpp upower"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 22c8140d592b8a218cad1fd56343d179e70dccf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:27 -0300
Subject: [PATCH 3/5] chatterino2: remove libsecret-devel makedepends.

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 53e41580dbc..9c38a6bf08b 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -11,7 +11,7 @@ hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
  libcommuni-devel pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
  boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel libsecret-devel"
+ qtkeychain-qt5-devel"
 short_desc="Qt-based twitch chat client"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="MIT"

From 84504ea5a3447e0a9603345d07e14e383a5f1ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:42 -0300
Subject: [PATCH 4/5] Quaternion: remove libsecret-devel makedepends.

---
 srcpkgs/Quaternion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 6aa90ef10de..0021dac6408 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
  qt5-multimedia-devel libqmatrixclient-devel
- $(vopt_if qtkeychain 'qtkeychain-qt5-devel libsecret-devel')"
+ $(vopt_if qtkeychain qtkeychain-qt5-devel)"
 depends="qt5-quickcontrols"
 short_desc="Qt5-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"

From d78c94eca7b091c255be9de6998c6590622f5b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:47:17 -0300
Subject: [PATCH 5/5] New package: kstars-3.4.3.

---
 srcpkgs/kstars/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/kstars/template

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
new file mode 100644
index 00000000000..846f222164d
--- /dev/null
+++ b/srcpkgs/kstars/template
@@ -0,0 +1,21 @@
+# Template file for 'kstars'
+pkgname=kstars
+version=3.4.3
+revision=1
+build_style=cmake
+hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
+ kconfig"
+makedepends="extra-cmake-modules eigen qt5-devel qt5-declarative-devel
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+ qt5-plugin-tds qt5-svg-devel qt5-websockets-devel qt5-datavis3d-devel
+ cfitsio-devel  libnova-devel libraw-devel qtkeychain-qt5-devel
+ knotifyconfig-devel kauth-devel kconfig-devel kcrash-devel kdoctools-devel
+ kwidgetsaddons-devel knewstuff-devel ki18n-devel kio-devel kxmlgui-devel
+ kplotting-devel knotifications-devel"
+depends="xplanet"
+short_desc="Open source, cross-platform Astronomy Software by KDE"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://edu.kde.org/kstars/"
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c81119a85e9265991dd0fbfafdc6ba797bf3bedce64f4d5260511bafccebbe48

Re: New package: kstars

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23824#issuecomment-664025674

Comment:
I went the lazy route with tomahawk and update the git commit we were using. Smoke-tested on x86_64-musl. chatterino2 and Quaternion are building just fine.

Re: [PR PATCH] [Updated] New package: kstars

[ericonr]

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

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

https://github.com/ericonr/void-packages kstars
https://github.com/void-linux/void-packages/pull/23824

New package: kstars
My first build errored out because it tried linking against `libsecret`, which wasn't available. Since `libsecret` is listed in `qtkeychain-qt5`'s cmake file, it should also be a dependency of `qtkeychain-qt5-devel`. This PR includes that fix and the removal of `libsecret-devel` from a few templates which don't need to be rebuilt.

Tested on x86_64-musl and built for armv7l-musl, since I'm not sure CI will manage to finish.

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

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

From 0efd1bedcac0a79d15b4e95e7fdc7734bf573db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:39:44 -0300
Subject: [PATCH 1/5] qtkeychain-qt5-devel: add libsecret-devel as dep.

libsecret-1 is referenced in one of its cmake files, and some
applications that don't directly depend on it still try to link to it.

Also fix xlint.
---
 srcpkgs/qtkeychain-qt5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 847f074fc7f..9bac2f766d0 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,7 +1,7 @@
-# Template file for 'qtkeychain'
+# Template file for 'qtkeychain-qt5'
 pkgname=qtkeychain-qt5
 version=0.9.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -22,7 +22,7 @@ post_install() {
 }
 
 qtkeychain-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 7e1e9b66d6eb4672b03b456adb5d3034d9d8ae85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:03 -0300
Subject: [PATCH 2/5] tomahawk: update to 0.8.4_21, xlintify.

Update to a new commit to allow it to build properly.
---
 srcpkgs/tomahawk/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 3910267caa8..99e7621909a 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,15 +1,10 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk
 version=0.8.4
-revision=20
+revision=21
 wrksrc=${pkgname}-${_commit}
-_commit=00f602e10203b76fc28b4615868c567e6bd4ced4
+_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
 build_style=cmake
-build_options="upower hatchet kde xmpp"
-desc_option_hatchet="Enable support for http://hatchet.is"
-desc_option_kde="Enable support for KDE"
-desc_option_xmpp="Enable support for XMPP"
-build_options_default="xmpp upower"
 configure_args="-Wno-dev -DBUILD_RELEASE=ON \
  $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \
  -DBUILD_WITH_QT4=OFF \
@@ -21,7 +16,7 @@ hostmakedepends="pkg-config extra-cmake-modules"
 makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
  libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
  qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
- quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
+ quazip-devel sparsehash taglib-devel vlc-devel
  $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
  $(vopt_if kde telepathy-qt5-devel)"
 depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
@@ -30,7 +25,12 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tomahawk-player.org/"
 distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz"
-checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79
+checksum=3305a8221af1bfa51cbf5256abf8ab3824393b684ce428a3c46409cf5e1d3fce
+build_options="upower hatchet kde xmpp"
+desc_option_hatchet="Enable support for http://hatchet.is"
+desc_option_kde="Enable support for KDE"
+desc_option_xmpp="Enable support for XMPP"
+build_options_default="xmpp upower"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From e023dd7002c284c426f1158c2d22225e6c6e9ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:27 -0300
Subject: [PATCH 3/5] chatterino2: remove libsecret-devel makedepends.

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 53e41580dbc..9c38a6bf08b 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -11,7 +11,7 @@ hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
  libcommuni-devel pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
  boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel libsecret-devel"
+ qtkeychain-qt5-devel"
 short_desc="Qt-based twitch chat client"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="MIT"

From ab18e567b457abeef602bcb0f01b49b8578625c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:42 -0300
Subject: [PATCH 4/5] Quaternion: remove libsecret-devel makedepends.

---
 srcpkgs/Quaternion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 6aa90ef10de..0021dac6408 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
  qt5-multimedia-devel libqmatrixclient-devel
- $(vopt_if qtkeychain 'qtkeychain-qt5-devel libsecret-devel')"
+ $(vopt_if qtkeychain qtkeychain-qt5-devel)"
 depends="qt5-quickcontrols"
 short_desc="Qt5-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"

From f9c647ba39deac31b85a1b0f8c3e6dbe84c1164e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:47:17 -0300
Subject: [PATCH 5/5] New package: kstars-3.4.3.

---
 srcpkgs/kstars/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/kstars/template

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
new file mode 100644
index 00000000000..846f222164d
--- /dev/null
+++ b/srcpkgs/kstars/template
@@ -0,0 +1,21 @@
+# Template file for 'kstars'
+pkgname=kstars
+version=3.4.3
+revision=1
+build_style=cmake
+hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
+ kconfig"
+makedepends="extra-cmake-modules eigen qt5-devel qt5-declarative-devel
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+ qt5-plugin-tds qt5-svg-devel qt5-websockets-devel qt5-datavis3d-devel
+ cfitsio-devel  libnova-devel libraw-devel qtkeychain-qt5-devel
+ knotifyconfig-devel kauth-devel kconfig-devel kcrash-devel kdoctools-devel
+ kwidgetsaddons-devel knewstuff-devel ki18n-devel kio-devel kxmlgui-devel
+ kplotting-devel knotifications-devel"
+depends="xplanet"
+short_desc="Open source, cross-platform Astronomy Software by KDE"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://edu.kde.org/kstars/"
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c81119a85e9265991dd0fbfafdc6ba797bf3bedce64f4d5260511bafccebbe48

Re: [PR PATCH] [Updated] New package: kstars

[ericonr]

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

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

https://github.com/ericonr/void-packages kstars
https://github.com/void-linux/void-packages/pull/23824

New package: kstars
My first build errored out because it tried linking against `libsecret`, which wasn't available. Since `libsecret` is listed in `qtkeychain-qt5`'s cmake file, it should also be a dependency of `qtkeychain-qt5-devel`. This PR includes that fix and the removal of `libsecret-devel` from a few templates which don't need to be rebuilt.

Tested on x86_64-musl and built for armv7l-musl, since I'm not sure CI will manage to finish.

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

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

From fda2d4dfb37f4068c497e5e2368746614d1e8cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:39:44 -0300
Subject: [PATCH 1/5] qtkeychain-qt5-devel: add libsecret-devel as dep.

libsecret-1 is referenced in one of its cmake files, and some
applications that don't directly depend on it still try to link to it.

Also fix xlint.
---
 srcpkgs/qtkeychain-qt5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 847f074fc7f..9bac2f766d0 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -1,7 +1,7 @@
-# Template file for 'qtkeychain'
+# Template file for 'qtkeychain-qt5'
 pkgname=qtkeychain-qt5
 version=0.9.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -22,7 +22,7 @@ post_install() {
 }
 
 qtkeychain-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libsecret-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 974e768217a4b53854276d30313fa386baf8b6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:03 -0300
Subject: [PATCH 2/5] tomahawk: update to 0.8.4_21, xlintify.

Update to a new commit to allow it to build properly.
---
 srcpkgs/tomahawk/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 3910267caa8..99e7621909a 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,15 +1,10 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk
 version=0.8.4
-revision=20
+revision=21
 wrksrc=${pkgname}-${_commit}
-_commit=00f602e10203b76fc28b4615868c567e6bd4ced4
+_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
 build_style=cmake
-build_options="upower hatchet kde xmpp"
-desc_option_hatchet="Enable support for http://hatchet.is"
-desc_option_kde="Enable support for KDE"
-desc_option_xmpp="Enable support for XMPP"
-build_options_default="xmpp upower"
 configure_args="-Wno-dev -DBUILD_RELEASE=ON \
  $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \
  -DBUILD_WITH_QT4=OFF \
@@ -21,7 +16,7 @@ hostmakedepends="pkg-config extra-cmake-modules"
 makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel
  libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel
  qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel
- quazip-devel sparsehash taglib-devel vlc-devel libsecret-devel
+ quazip-devel sparsehash taglib-devel vlc-devel
  $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)
  $(vopt_if kde telepathy-qt5-devel)"
 depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)"
@@ -30,7 +25,12 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://tomahawk-player.org/"
 distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz"
-checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79
+checksum=3305a8221af1bfa51cbf5256abf8ab3824393b684ce428a3c46409cf5e1d3fce
+build_options="upower hatchet kde xmpp"
+desc_option_hatchet="Enable support for http://hatchet.is"
+desc_option_kde="Enable support for KDE"
+desc_option_xmpp="Enable support for XMPP"
+build_options_default="xmpp upower"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 5a3a03f0cfe85b315fb7be6fa75eb9846c0018db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:27 -0300
Subject: [PATCH 3/5] chatterino2: remove libsecret-devel makedepends.

---
 srcpkgs/chatterino2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 53e41580dbc..9c38a6bf08b 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -11,7 +11,7 @@ hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
  libcommuni-devel pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
  boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel libsecret-devel"
+ qtkeychain-qt5-devel"
 short_desc="Qt-based twitch chat client"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
 license="MIT"

From 0c1db251ba715ce7514b54339d3db447d59575b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:41:42 -0300
Subject: [PATCH 4/5] Quaternion: remove libsecret-devel makedepends.

---
 srcpkgs/Quaternion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Quaternion/template b/srcpkgs/Quaternion/template
index 6aa90ef10de..0021dac6408 100644
--- a/srcpkgs/Quaternion/template
+++ b/srcpkgs/Quaternion/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols qt5-tools-devel
  qt5-multimedia-devel libqmatrixclient-devel
- $(vopt_if qtkeychain 'qtkeychain-qt5-devel libsecret-devel')"
+ $(vopt_if qtkeychain qtkeychain-qt5-devel)"
 depends="qt5-quickcontrols"
 short_desc="Qt5-based IM client for the Matrix protocol"
 maintainer="Julio Galvan <juliogalvan@protonmail.com>"

From bf3a3cd7b8179e4e7d6d61946ee5ac5be55869d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 19:47:17 -0300
Subject: [PATCH 5/5] New package: kstars-3.4.3.

---
 srcpkgs/kstars/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/kstars/template

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
new file mode 100644
index 00000000000..846f222164d
--- /dev/null
+++ b/srcpkgs/kstars/template
@@ -0,0 +1,21 @@
+# Template file for 'kstars'
+pkgname=kstars
+version=3.4.3
+revision=1
+build_style=cmake
+hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
+ kconfig"
+makedepends="extra-cmake-modules eigen qt5-devel qt5-declarative-devel
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+ qt5-plugin-tds qt5-svg-devel qt5-websockets-devel qt5-datavis3d-devel
+ cfitsio-devel  libnova-devel libraw-devel qtkeychain-qt5-devel
+ knotifyconfig-devel kauth-devel kconfig-devel kcrash-devel kdoctools-devel
+ kwidgetsaddons-devel knewstuff-devel ki18n-devel kio-devel kxmlgui-devel
+ kplotting-devel knotifications-devel"
+depends="xplanet"
+short_desc="Open source, cross-platform Astronomy Software by KDE"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-2.0-or-later"
+homepage="https://edu.kde.org/kstars/"
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c81119a85e9265991dd0fbfafdc6ba797bf3bedce64f4d5260511bafccebbe48