Re: [PR PATCH] [Updated] [WIP] New package: drumstick

Github messages for voidlinux
 help / color / mirror / Atom feed

* Re: [PR PATCH] [Updated] [WIP] New package: drumstick
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
@ 2019-09-01 14:49 ` voidlinux-github
  2019-09-01 14:49 ` voidlinux-github
                   ` (23 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 14:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: drumstick


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/10] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/10] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/10] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/10] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/10] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/10] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/10] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/10] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/10] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/10] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: drumstick
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
  2019-09-01 14:49 ` [PR PATCH] [Updated] [WIP] New package: drumstick voidlinux-github
@ 2019-09-01 14:49 ` voidlinux-github
  2019-09-01 14:54 ` voidlinux-github
                   ` (22 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 14:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: drumstick


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/10] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/10] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/10] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/10] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/10] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/10] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/10] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/10] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/10] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/10] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [WIP] New package: drumstick
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
  2019-09-01 14:49 ` [PR PATCH] [Updated] [WIP] New package: drumstick voidlinux-github
  2019-09-01 14:49 ` voidlinux-github
@ 2019-09-01 14:54 ` voidlinux-github
  2019-09-01 16:38 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (21 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 14:54 UTC (permalink / raw)
  To: ml

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

New comment by mamins1376 on void-packages repository

https://github.com/void-linux/void-packages/pull/14113#issuecomment-526925765

Comment:
Why is this happening?
```
=> drumstick-1.1.2_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libdrumstick-file.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libQt5Core.so.5 <-> qt5>=5.6.0_1
   SONAME: libstdc++.so.6 <-> libstdc++>=4.4.0_1
   SONAME: libgcc_s.so.1 <-> libgcc>=4.4.0_1
   SONAME: libc.so <-> musl>=1.1.21_1
   SONAME: libasound.so.2 <-> alsa-lib>=1.0.20_1
   SONAME: libdrumstick-alsa.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libdrumstick-rt.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libQt5Svg.so.5 <-> qt5-svg>=5.6.0_1
   SONAME: libQt5Network.so.5 <-> qt5>=5.6.0_1
   SONAME: libQt5Widgets.so.5 <-> qt5>=5.6.0_1
   SONAME: libQt5Gui.so.5 <-> qt5>=5.6.0_1
=> ERROR: drumstick-1.1.2_1: cannot guess required shlibs, aborting!
```

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: drumstick
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2019-09-01 14:54 ` voidlinux-github
@ 2019-09-01 16:38 ` voidlinux-github
  2019-09-01 16:38 ` voidlinux-github
                   ` (20 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 16:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: drumstick


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/12] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/12] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/12] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/12] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/12] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/12] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/12] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/12] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/12] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/12] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/12] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/12] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: drumstick
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (3 preceding siblings ...)
  2019-09-01 16:38 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-01 16:38 ` voidlinux-github
  2019-09-01 17:06 ` [WIP] New package: libdrumstick-1.1.2 voidlinux-github
                   ` (19 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 16:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: drumstick


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/12] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/12] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/12] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/12] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/12] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/12] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/12] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/12] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/12] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/12] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/12] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/12] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (4 preceding siblings ...)
  2019-09-01 16:38 ` voidlinux-github
@ 2019-09-01 17:06 ` voidlinux-github
  2019-09-01 17:15 ` voidlinux-github
                   ` (18 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 17:06 UTC (permalink / raw)
  To: ml

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

New comment by mamins1376 on void-packages repository

https://github.com/void-linux/void-packages/pull/14113#issuecomment-526925765

Comment:
Why is this happening?
```
=> drumstick-1.1.2_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libdrumstick-file.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libQt5Core.so.5 <-> qt5>=5.6.0_1
   SONAME: libstdc++.so.6 <-> libstdc++>=4.4.0_1
   SONAME: libgcc_s.so.1 <-> libgcc>=4.4.0_1
   SONAME: libc.so <-> musl>=1.1.21_1
   SONAME: libasound.so.2 <-> alsa-lib>=1.0.20_1
   SONAME: libdrumstick-alsa.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libdrumstick-rt.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libQt5Svg.so.5 <-> qt5-svg>=5.6.0_1
   SONAME: libQt5Network.so.5 <-> qt5>=5.6.0_1
   SONAME: libQt5Widgets.so.5 <-> qt5>=5.6.0_1
   SONAME: libQt5Gui.so.5 <-> qt5>=5.6.0_1
=> ERROR: drumstick-1.1.2_1: cannot guess required shlibs, aborting!
```

*Edit*: https://travis-ci.org/void-linux/void-packages/jobs/579481364#L5584

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (5 preceding siblings ...)
  2019-09-01 17:06 ` [WIP] New package: libdrumstick-1.1.2 voidlinux-github
@ 2019-09-01 17:15 ` voidlinux-github
  2019-09-01 17:20 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (17 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 17:15 UTC (permalink / raw)
  To: ml

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

New comment by mamins1376 on void-packages repository

https://github.com/void-linux/void-packages/pull/14113#issuecomment-526925765

Comment:
Why is this happening?
```
=> drumstick-1.1.2_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libdrumstick-file.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libQt5Core.so.5 <-> qt5>=5.6.0_1
   SONAME: libstdc++.so.6 <-> libstdc++>=4.4.0_1
   SONAME: libgcc_s.so.1 <-> libgcc>=4.4.0_1
   SONAME: libc.so <-> musl>=1.1.21_1
   SONAME: libasound.so.2 <-> alsa-lib>=1.0.20_1
   SONAME: libdrumstick-alsa.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libdrumstick-rt.so.1 <-> UNKNOWN PKG PLEASE FIX!
   SONAME: libQt5Svg.so.5 <-> qt5-svg>=5.6.0_1
   SONAME: libQt5Network.so.5 <-> qt5>=5.6.0_1
   SONAME: libQt5Widgets.so.5 <-> qt5>=5.6.0_1
   SONAME: libQt5Gui.so.5 <-> qt5>=5.6.0_1
=> ERROR: drumstick-1.1.2_1: cannot guess required shlibs, aborting!
```

*Edit*: https://travis-ci.org/void-linux/void-packages/jobs/579481364#L5584
*Edit 2*: Got it :)

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (6 preceding siblings ...)
  2019-09-01 17:15 ` voidlinux-github
@ 2019-09-01 17:20 ` voidlinux-github
  2019-09-01 17:20 ` voidlinux-github
                   ` (16 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 17:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: libdrumstick-1.1.2


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/13] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/13] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/13] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/13] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/13] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/13] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/13] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/13] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/13] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/13] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/13] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/13] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

From b54c2f0230d5db236d66788bb5293cbc5a27c4fd Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:46:35 +0430
Subject: [PATCH 13/13] Add SONAMEs to common/shlibs

---
 common/shlibs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index d344f65c5a6..15f98659929 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 libdrumstick-1.1.2_1
+libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
+libdrumstick-rt.so.1 libdrumstick-1.1.2_1

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (7 preceding siblings ...)
  2019-09-01 17:20 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-01 17:20 ` voidlinux-github
  2019-09-02  6:02 ` voidlinux-github
                   ` (15 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-01 17:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: libdrumstick-1.1.2


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/13] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/13] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/13] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/13] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/13] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/13] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/13] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/13] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/13] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/13] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/13] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/13] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

From b54c2f0230d5db236d66788bb5293cbc5a27c4fd Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:46:35 +0430
Subject: [PATCH 13/13] Add SONAMEs to common/shlibs

---
 common/shlibs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index d344f65c5a6..15f98659929 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 libdrumstick-1.1.2_1
+libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
+libdrumstick-rt.so.1 libdrumstick-1.1.2_1

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (8 preceding siblings ...)
  2019-09-01 17:20 ` voidlinux-github
@ 2019-09-02  6:02 ` voidlinux-github
  2019-09-02  6:02 ` voidlinux-github
                   ` (14 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02  6:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: libdrumstick-1.1.2


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/16] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/16] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/16] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/16] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/16] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/16] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/16] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/16] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/16] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/16] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/16] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/16] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

From b54c2f0230d5db236d66788bb5293cbc5a27c4fd Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:46:35 +0430
Subject: [PATCH 13/16] Add SONAMEs to common/shlibs

---
 common/shlibs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index d344f65c5a6..15f98659929 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 libdrumstick-1.1.2_1
+libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
+libdrumstick-rt.so.1 libdrumstick-1.1.2_1

From 132994ead01e73ce3f845ccbdb1a2ecd0c672b2c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:54:15 +0430
Subject: [PATCH 14/16] Remove autodepped dep

---
 srcpkgs/libdrumstick/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 999695c2cbc..e33eb83c45b 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -33,7 +33,6 @@ libdrumstick-devel_package() {
 
 drumstick_package() {
 	short_desc+=" - applications"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		for section in doc licenses; do
 			mkdir -p ${PKGDESTDIR}/usr/share/${section}

From 9a38ffbb35aecdd9bfc394c6c4cb2f41d7de0fd5 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 09:55:58 +0430
Subject: [PATCH 15/16] Do not split package into three

---
 common/shlibs                                |  6 ++---
 srcpkgs/drumstick                            |  1 -
 srcpkgs/drumstick-devel                      |  1 +
 srcpkgs/{libdrumstick => drumstick}/template | 23 +++-----------------
 srcpkgs/libdrumstick-devel                   |  1 -
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 120000 srcpkgs/drumstick
 create mode 120000 srcpkgs/drumstick-devel
 rename srcpkgs/{libdrumstick => drumstick}/template (63%)
 delete mode 120000 srcpkgs/libdrumstick-devel

diff --git a/common/shlibs b/common/shlibs
index 15f98659929..0ba42c6b85b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,6 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
-libdrumstick-file.so.1 libdrumstick-1.1.2_1
-libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
-libdrumstick-rt.so.1 libdrumstick-1.1.2_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/drumstick
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/drumstick/template
similarity index 63%
rename from srcpkgs/libdrumstick/template
rename to srcpkgs/drumstick/template
index e33eb83c45b..7584a16b8a5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/drumstick/template
@@ -1,8 +1,7 @@
-# Template file for 'libdrumstick'
-pkgname=libdrumstick
+# Template file for 'drumstick'
+pkgname=drumstick
 version=1.1.2
 revision=1
-wrksrc="drumstick-${version}"
 build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
@@ -22,7 +21,7 @@ post_install() {
 	vlicense COPYING
 }
 
-libdrumstick-devel_package() {
+drumstick-devel_package() {
 	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
@@ -30,19 +29,3 @@ libdrumstick-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-drumstick_package() {
-	short_desc+=" - applications"
-	pkg_install() {
-		for section in doc licenses; do
-			mkdir -p ${PKGDESTDIR}/usr/share/${section}
-			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
-		done
-
-		vmove usr/bin
-		vmove usr/share/applications
-		vmove usr/share/mime
-		vmove usr/share/icons
-		vmove usr/share/man
-	}
-}
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/libdrumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file

From 32f374197e50ede2e413f823125b285a1dc08d03 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 10:32:22 +0430
Subject: [PATCH 16/16] Fix for ARM targets

---
 srcpkgs/drumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7584a16b8a5..7cd35b37968 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -13,6 +13,10 @@ homepage="http://drumstick.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake"
+esac
+
 post_install() {
 	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (9 preceding siblings ...)
  2019-09-02  6:02 ` voidlinux-github
@ 2019-09-02  6:02 ` voidlinux-github
  2019-09-02  9:32 ` voidlinux-github
                   ` (13 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02  6:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: libdrumstick-1.1.2


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/16] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/16] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/16] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/16] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/16] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/16] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/16] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/16] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/16] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/16] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/16] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/16] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

From b54c2f0230d5db236d66788bb5293cbc5a27c4fd Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:46:35 +0430
Subject: [PATCH 13/16] Add SONAMEs to common/shlibs

---
 common/shlibs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index d344f65c5a6..15f98659929 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 libdrumstick-1.1.2_1
+libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
+libdrumstick-rt.so.1 libdrumstick-1.1.2_1

From 132994ead01e73ce3f845ccbdb1a2ecd0c672b2c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:54:15 +0430
Subject: [PATCH 14/16] Remove autodepped dep

---
 srcpkgs/libdrumstick/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 999695c2cbc..e33eb83c45b 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -33,7 +33,6 @@ libdrumstick-devel_package() {
 
 drumstick_package() {
 	short_desc+=" - applications"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		for section in doc licenses; do
 			mkdir -p ${PKGDESTDIR}/usr/share/${section}

From 9a38ffbb35aecdd9bfc394c6c4cb2f41d7de0fd5 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 09:55:58 +0430
Subject: [PATCH 15/16] Do not split package into three

---
 common/shlibs                                |  6 ++---
 srcpkgs/drumstick                            |  1 -
 srcpkgs/drumstick-devel                      |  1 +
 srcpkgs/{libdrumstick => drumstick}/template | 23 +++-----------------
 srcpkgs/libdrumstick-devel                   |  1 -
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 120000 srcpkgs/drumstick
 create mode 120000 srcpkgs/drumstick-devel
 rename srcpkgs/{libdrumstick => drumstick}/template (63%)
 delete mode 120000 srcpkgs/libdrumstick-devel

diff --git a/common/shlibs b/common/shlibs
index 15f98659929..0ba42c6b85b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,6 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
-libdrumstick-file.so.1 libdrumstick-1.1.2_1
-libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
-libdrumstick-rt.so.1 libdrumstick-1.1.2_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/drumstick
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/drumstick/template
similarity index 63%
rename from srcpkgs/libdrumstick/template
rename to srcpkgs/drumstick/template
index e33eb83c45b..7584a16b8a5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/drumstick/template
@@ -1,8 +1,7 @@
-# Template file for 'libdrumstick'
-pkgname=libdrumstick
+# Template file for 'drumstick'
+pkgname=drumstick
 version=1.1.2
 revision=1
-wrksrc="drumstick-${version}"
 build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
@@ -22,7 +21,7 @@ post_install() {
 	vlicense COPYING
 }
 
-libdrumstick-devel_package() {
+drumstick-devel_package() {
 	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
@@ -30,19 +29,3 @@ libdrumstick-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-drumstick_package() {
-	short_desc+=" - applications"
-	pkg_install() {
-		for section in doc licenses; do
-			mkdir -p ${PKGDESTDIR}/usr/share/${section}
-			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
-		done
-
-		vmove usr/bin
-		vmove usr/share/applications
-		vmove usr/share/mime
-		vmove usr/share/icons
-		vmove usr/share/man
-	}
-}
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/libdrumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file

From 32f374197e50ede2e413f823125b285a1dc08d03 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 10:32:22 +0430
Subject: [PATCH 16/16] Fix for ARM targets

---
 srcpkgs/drumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7584a16b8a5..7cd35b37968 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -13,6 +13,10 @@ homepage="http://drumstick.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake"
+esac
+
 post_install() {
 	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (10 preceding siblings ...)
  2019-09-02  6:02 ` voidlinux-github
@ 2019-09-02  9:32 ` voidlinux-github
  2019-09-02  9:32 ` voidlinux-github
                   ` (12 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02  9:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: libdrumstick-1.1.2


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/17] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/17] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/17] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/17] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/17] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/17] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/17] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/17] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/17] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/17] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/17] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/17] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

From b54c2f0230d5db236d66788bb5293cbc5a27c4fd Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:46:35 +0430
Subject: [PATCH 13/17] Add SONAMEs to common/shlibs

---
 common/shlibs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index d344f65c5a6..15f98659929 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 libdrumstick-1.1.2_1
+libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
+libdrumstick-rt.so.1 libdrumstick-1.1.2_1

From 132994ead01e73ce3f845ccbdb1a2ecd0c672b2c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:54:15 +0430
Subject: [PATCH 14/17] Remove autodepped dep

---
 srcpkgs/libdrumstick/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 999695c2cbc..e33eb83c45b 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -33,7 +33,6 @@ libdrumstick-devel_package() {
 
 drumstick_package() {
 	short_desc+=" - applications"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		for section in doc licenses; do
 			mkdir -p ${PKGDESTDIR}/usr/share/${section}

From 9a38ffbb35aecdd9bfc394c6c4cb2f41d7de0fd5 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 09:55:58 +0430
Subject: [PATCH 15/17] Do not split package into three

---
 common/shlibs                                |  6 ++---
 srcpkgs/drumstick                            |  1 -
 srcpkgs/drumstick-devel                      |  1 +
 srcpkgs/{libdrumstick => drumstick}/template | 23 +++-----------------
 srcpkgs/libdrumstick-devel                   |  1 -
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 120000 srcpkgs/drumstick
 create mode 120000 srcpkgs/drumstick-devel
 rename srcpkgs/{libdrumstick => drumstick}/template (63%)
 delete mode 120000 srcpkgs/libdrumstick-devel

diff --git a/common/shlibs b/common/shlibs
index 15f98659929..0ba42c6b85b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,6 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
-libdrumstick-file.so.1 libdrumstick-1.1.2_1
-libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
-libdrumstick-rt.so.1 libdrumstick-1.1.2_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/drumstick
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/drumstick/template
similarity index 63%
rename from srcpkgs/libdrumstick/template
rename to srcpkgs/drumstick/template
index e33eb83c45b..7584a16b8a5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/drumstick/template
@@ -1,8 +1,7 @@
-# Template file for 'libdrumstick'
-pkgname=libdrumstick
+# Template file for 'drumstick'
+pkgname=drumstick
 version=1.1.2
 revision=1
-wrksrc="drumstick-${version}"
 build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
@@ -22,7 +21,7 @@ post_install() {
 	vlicense COPYING
 }
 
-libdrumstick-devel_package() {
+drumstick-devel_package() {
 	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
@@ -30,19 +29,3 @@ libdrumstick-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-drumstick_package() {
-	short_desc+=" - applications"
-	pkg_install() {
-		for section in doc licenses; do
-			mkdir -p ${PKGDESTDIR}/usr/share/${section}
-			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
-		done
-
-		vmove usr/bin
-		vmove usr/share/applications
-		vmove usr/share/mime
-		vmove usr/share/icons
-		vmove usr/share/man
-	}
-}
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/libdrumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file

From 32f374197e50ede2e413f823125b285a1dc08d03 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 10:32:22 +0430
Subject: [PATCH 16/17] Fix for ARM targets

---
 srcpkgs/drumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7584a16b8a5..7cd35b37968 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -13,6 +13,10 @@ homepage="http://drumstick.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake"
+esac
+
 post_install() {
 	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc

From dbffd623afacd7dc422fd22cb2777bd6cacac36b Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 10:53:17 +0430
Subject: [PATCH 17/17] Fix #2 for ARM

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7cd35b37968..c8aa2f7f009 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 case "$XBPS_TARGET_MACHINE" in
-	arm*|aarch*) hostmakedepends+=" qt5-qmake"
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
 esac
 
 post_install() {

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (11 preceding siblings ...)
  2019-09-02  9:32 ` voidlinux-github
@ 2019-09-02  9:32 ` voidlinux-github
  2019-09-02  9:56 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (11 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02  9:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

[WIP] New package: libdrumstick-1.1.2


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

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

From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH 01/17] New package: drumstick

---
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..86ae19b6471
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,31 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="http://${pkgname}.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+post_install() {
+	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib
+	}
+}

From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:18:32 +0430
Subject: [PATCH 02/17] Keep some libs for elf itself

---
 srcpkgs/drumstick/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 86ae19b6471..5b8659e5fc0 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -26,6 +26,7 @@ drumstick-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/drumstick
 	}
 }

From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:23:19 +0430
Subject: [PATCH 03/17] Fix license

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 5b8659e5fc0..7f426ce4108 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://${pkgname}.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e

From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:24:34 +0430
Subject: [PATCH 04/17] Hardcode ${pkgname}

---
 srcpkgs/drumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7f426ce4108..f7d99e2d2b1 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {

From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:25:42 +0430
Subject: [PATCH 05/17] Do not `vdoc` COPYING and INSTALL

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index f7d99e2d2b1..965200781e3 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 post_install() {
-	for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc
 	done
 

From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:26:27 +0430
Subject: [PATCH 06/17] Lint short_desc

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 965200781e3..1bf7b020807 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
-short_desc="a set of MIDI libraries using C++/Qt5 idioms and style"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://drumstick.sourceforge.net"

From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 11:36:45 +0430
Subject: [PATCH 07/17] Move libraries to its own package

---
 srcpkgs/drumstick                            |  1 +
 srcpkgs/drumstick-devel                      |  1 -
 srcpkgs/libdrumstick-devel                   |  1 +
 srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/drumstick
 delete mode 120000 srcpkgs/drumstick-devel
 create mode 120000 srcpkgs/libdrumstick-devel
 rename srcpkgs/{drumstick => libdrumstick}/template (75%)

diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/drumstick
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
deleted file mode 120000
index e953fd56e31..00000000000
--- a/srcpkgs/drumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
new file mode 120000
index 00000000000..6e9d58d1e45
--- /dev/null
+++ b/srcpkgs/libdrumstick-devel
@@ -0,0 +1 @@
+libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template
similarity index 75%
rename from srcpkgs/drumstick/template
rename to srcpkgs/libdrumstick/template
index 1bf7b020807..57c187cabb2 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,5 +1,5 @@
 # Template file for 'drumstick'
-pkgname=drumstick
+pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
@@ -21,12 +21,22 @@ post_install() {
 	vlicense COPYING
 }
 
-drumstick-devel_package() {
+libdrumstick-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/drumstick
+	}
+}
+
+drumstick_package() {
+	short_desc+=" - applications"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/applications
+		vmove usr/share/icons
+		vmove usr/share/man
 	}
 }

From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:03:50 +0430
Subject: [PATCH 08/17] Fix short_desc for libdrumstick-devel

---
 srcpkgs/libdrumstick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 57c187cabb2..83f67a7dd3d 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -1,4 +1,4 @@
-# Template file for 'drumstick'
+# Template file for 'libdrumstick'
 pkgname=libdrumstick
 version=1.1.2
 revision=1
@@ -22,7 +22,7 @@ post_install() {
 }
 
 libdrumstick-devel_package() {
-	short_desc+=" - development"
+	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 18:26:44 +0430
Subject: [PATCH 09/17] Fix wrksrc mismatch

---
 srcpkgs/libdrumstick/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 83f67a7dd3d..58c7b119151 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -3,6 +3,7 @@ pkgname=libdrumstick
 version=1.1.2
 revision=1
 build_style=cmake
+wrksrc="drumstick-${version}"
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 19:18:37 +0430
Subject: [PATCH 10/17] Point to libdrumstick for doc and licenses

---
 srcpkgs/libdrumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 58c7b119151..2d985c157c0 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,12 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
+		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+
 		vmove usr/bin
 		vmove usr/share/applications
+		vmove usr/share/mime
 		vmove usr/share/icons
 		vmove usr/share/man
 	}

From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:03:53 +0430
Subject: [PATCH 11/17] Fix lint issue

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

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 2d985c157c0..18deba22bb5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -2,8 +2,8 @@
 pkgname=libdrumstick
 version=1.1.2
 revision=1
-build_style=cmake
 wrksrc="drumstick-${version}"
+build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"

From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:06:16 +0430
Subject: [PATCH 12/17] Make sure section directory exists before symlinking

---
 srcpkgs/libdrumstick/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 18deba22bb5..999695c2cbc 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -35,8 +35,10 @@ drumstick_package() {
 	short_desc+=" - applications"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick
-		ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick
+		for section in doc licenses; do
+			mkdir -p ${PKGDESTDIR}/usr/share/${section}
+			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
+		done
 
 		vmove usr/bin
 		vmove usr/share/applications

From b54c2f0230d5db236d66788bb5293cbc5a27c4fd Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:46:35 +0430
Subject: [PATCH 13/17] Add SONAMEs to common/shlibs

---
 common/shlibs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index d344f65c5a6..15f98659929 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 libdrumstick-1.1.2_1
+libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
+libdrumstick-rt.so.1 libdrumstick-1.1.2_1

From 132994ead01e73ce3f845ccbdb1a2ecd0c672b2c Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 21:54:15 +0430
Subject: [PATCH 14/17] Remove autodepped dep

---
 srcpkgs/libdrumstick/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template
index 999695c2cbc..e33eb83c45b 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/libdrumstick/template
@@ -33,7 +33,6 @@ libdrumstick-devel_package() {
 
 drumstick_package() {
 	short_desc+=" - applications"
-	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		for section in doc licenses; do
 			mkdir -p ${PKGDESTDIR}/usr/share/${section}

From 9a38ffbb35aecdd9bfc394c6c4cb2f41d7de0fd5 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 09:55:58 +0430
Subject: [PATCH 15/17] Do not split package into three

---
 common/shlibs                                |  6 ++---
 srcpkgs/drumstick                            |  1 -
 srcpkgs/drumstick-devel                      |  1 +
 srcpkgs/{libdrumstick => drumstick}/template | 23 +++-----------------
 srcpkgs/libdrumstick-devel                   |  1 -
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 120000 srcpkgs/drumstick
 create mode 120000 srcpkgs/drumstick-devel
 rename srcpkgs/{libdrumstick => drumstick}/template (63%)
 delete mode 120000 srcpkgs/libdrumstick-devel

diff --git a/common/shlibs b/common/shlibs
index 15f98659929..0ba42c6b85b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,6 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
-libdrumstick-file.so.1 libdrumstick-1.1.2_1
-libdrumstick-alsa.so.1 libdrumstick-1.1.2_1
-libdrumstick-rt.so.1 libdrumstick-1.1.2_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/drumstick
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/drumstick/template
similarity index 63%
rename from srcpkgs/libdrumstick/template
rename to srcpkgs/drumstick/template
index e33eb83c45b..7584a16b8a5 100644
--- a/srcpkgs/libdrumstick/template
+++ b/srcpkgs/drumstick/template
@@ -1,8 +1,7 @@
-# Template file for 'libdrumstick'
-pkgname=libdrumstick
+# Template file for 'drumstick'
+pkgname=drumstick
 version=1.1.2
 revision=1
-wrksrc="drumstick-${version}"
 build_style=cmake
 configure_args="-DLIB_SUFFIX="
 hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
@@ -22,7 +21,7 @@ post_install() {
 	vlicense COPYING
 }
 
-libdrumstick-devel_package() {
+drumstick-devel_package() {
 	short_desc+=" - development libraries"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
@@ -30,19 +29,3 @@ libdrumstick-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-drumstick_package() {
-	short_desc+=" - applications"
-	pkg_install() {
-		for section in doc licenses; do
-			mkdir -p ${PKGDESTDIR}/usr/share/${section}
-			ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick
-		done
-
-		vmove usr/bin
-		vmove usr/share/applications
-		vmove usr/share/mime
-		vmove usr/share/icons
-		vmove usr/share/man
-	}
-}
diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel
deleted file mode 120000
index 6e9d58d1e45..00000000000
--- a/srcpkgs/libdrumstick-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdrumstick
\ No newline at end of file

From 32f374197e50ede2e413f823125b285a1dc08d03 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 10:32:22 +0430
Subject: [PATCH 16/17] Fix for ARM targets

---
 srcpkgs/drumstick/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7584a16b8a5..7cd35b37968 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -13,6 +13,10 @@ homepage="http://drumstick.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake"
+esac
+
 post_install() {
 	for doc in TODO NEWS ChangeLog README AUTHORS; do
 		vdoc $doc

From dbffd623afacd7dc422fd22cb2777bd6cacac36b Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Mon, 2 Sep 2019 10:53:17 +0430
Subject: [PATCH 17/17] Fix #2 for ARM

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index 7cd35b37968..c8aa2f7f009 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
 
 case "$XBPS_TARGET_MACHINE" in
-	arm*|aarch*) hostmakedepends+=" qt5-qmake"
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
 esac
 
 post_install() {

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (12 preceding siblings ...)
  2019-09-02  9:32 ` voidlinux-github
@ 2019-09-02  9:56 ` voidlinux-github
  2019-09-02  9:56 ` voidlinux-github
                   ` (10 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02  9:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: libdrumstick-1.1.2


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

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

From 90f7c8864431160b36aff4556e152a38c52c8f3a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..c8aa2f7f009
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
+esac
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: libdrumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (13 preceding siblings ...)
  2019-09-02  9:56 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-02  9:56 ` voidlinux-github
  2019-09-02 10:15 ` New package: drumstick-1.1.2 voidlinux-github
                   ` (9 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02  9:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: libdrumstick-1.1.2


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

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

From 90f7c8864431160b36aff4556e152a38c52c8f3a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..c8aa2f7f009
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
+esac
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (14 preceding siblings ...)
  2019-09-02  9:56 ` voidlinux-github
@ 2019-09-02 10:15 ` voidlinux-github
  2019-09-02 10:57 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (8 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02 10:15 UTC (permalink / raw)
  To: ml

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

New comment by mamins1376 on void-packages repository

https://github.com/void-linux/void-packages/pull/14113#issuecomment-527092051

Comment:
Successful build before squash: https://travis-ci.org/void-linux/void-packages/builds/579715316

Error cause: https://travis-ci.org/void-linux/void-packages/jobs/579724058#L4018

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (15 preceding siblings ...)
  2019-09-02 10:15 ` New package: drumstick-1.1.2 voidlinux-github
@ 2019-09-02 10:57 ` voidlinux-github
  2019-09-02 10:57 ` voidlinux-github
                   ` (7 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02 10:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From 60f67622ebb353aabece9da5a61fa8faebbb43b9 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..c8aa2f7f009
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
+esac
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (16 preceding siblings ...)
  2019-09-02 10:57 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-02 10:57 ` voidlinux-github
  2019-09-02 11:22 ` voidlinux-github
                   ` (6 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02 10:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From 60f67622ebb353aabece9da5a61fa8faebbb43b9 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..c8aa2f7f009
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
+esac
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (17 preceding siblings ...)
  2019-09-02 10:57 ` voidlinux-github
@ 2019-09-02 11:22 ` voidlinux-github
  2019-09-02 11:22 ` voidlinux-github
                   ` (5 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02 11:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From e1269968e932490bc959c5dd68e8cf2bfc0e2050 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..c8aa2f7f009
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
+esac
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (18 preceding siblings ...)
  2019-09-02 11:22 ` voidlinux-github
@ 2019-09-02 11:22 ` voidlinux-github
  2019-09-03  8:17 ` voidlinux-github
                   ` (4 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-02 11:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From e1269968e932490bc959c5dd68e8cf2bfc0e2050 Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..c8aa2f7f009
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools"
+esac
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (19 preceding siblings ...)
  2019-09-02 11:22 ` voidlinux-github
@ 2019-09-03  8:17 ` voidlinux-github
  2019-09-03  8:17 ` voidlinux-github
                   ` (3 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-03  8:17 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From a8b125f72fc14e225ffa07e28f991e90ec38685e Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..aa013aa22e4
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (20 preceding siblings ...)
  2019-09-03  8:17 ` voidlinux-github
@ 2019-09-03  8:17 ` voidlinux-github
  2019-09-03 12:08 ` voidlinux-github
                   ` (2 subsequent siblings)
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-03  8:17 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From a8b125f72fc14e225ffa07e28f991e90ec38685e Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..aa013aa22e4
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in TODO NEWS ChangeLog README AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (21 preceding siblings ...)
  2019-09-03  8:17 ` voidlinux-github
@ 2019-09-03 12:08 ` voidlinux-github
  2019-09-03 12:08 ` voidlinux-github
  2019-09-03 14:37 ` [PR PATCH] [Merged]: " voidlinux-github
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-03 12:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From 9e5b27c348bc5a42736b23e5f4ecdc100b89b33a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..1c49098e670
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in TODO NEWS ChangeLog AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (22 preceding siblings ...)
  2019-09-03 12:08 ` voidlinux-github
@ 2019-09-03 12:08 ` voidlinux-github
  2019-09-03 14:37 ` [PR PATCH] [Merged]: " voidlinux-github
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-03 12:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mamins1376/void-packages new/drumstick
https://github.com/void-linux/void-packages/pull/14113

New package: drumstick-1.1.2


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

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

From 9e5b27c348bc5a42736b23e5f4ecdc100b89b33a Mon Sep 17 00:00:00 2001
From: Mohammad Amin Sameti <mamins1376@gmail.com>
Date: Sun, 1 Sep 2019 00:04:42 +0430
Subject: [PATCH] New package: drumstick-1.1.2

---
 common/shlibs              |  3 +++
 srcpkgs/drumstick-devel    |  1 +
 srcpkgs/drumstick/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/drumstick-devel
 create mode 100644 srcpkgs/drumstick/template

diff --git a/common/shlibs b/common/shlibs
index e29b965c040..730f0c47800 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1
 libqb.so.0 libqb-1.0.5_1
 libusbguard.so.0 usbguard-0.7.5_1
 libknet.so.1 libknet1-1.11_1
+libdrumstick-file.so.1 drumstick-1.1.2_1
+libdrumstick-alsa.so.1 drumstick-1.1.2_1
+libdrumstick-rt.so.1 drumstick-1.1.2_1
diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel
new file mode 120000
index 00000000000..e953fd56e31
--- /dev/null
+++ b/srcpkgs/drumstick-devel
@@ -0,0 +1 @@
+drumstick
\ No newline at end of file
diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
new file mode 100644
index 00000000000..1c49098e670
--- /dev/null
+++ b/srcpkgs/drumstick/template
@@ -0,0 +1,35 @@
+# Template file for 'drumstick'
+pkgname=drumstick
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DLIB_SUFFIX="
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
+short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
+maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://drumstick.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
+checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-qmake qt5-host-tools"
+fi
+
+post_install() {
+	for doc in TODO NEWS ChangeLog AUTHORS; do
+		vdoc $doc
+	done
+
+	vlicense COPYING
+}
+
+drumstick-devel_package() {
+	short_desc+=" - development libraries"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Merged]: New package: drumstick-1.1.2
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
                   ` (23 preceding siblings ...)
  2019-09-03 12:08 ` voidlinux-github
@ 2019-09-03 14:37 ` voidlinux-github
  24 siblings, 0 replies; 25+ messages in thread
From: voidlinux-github @ 2019-09-03 14:37 UTC (permalink / raw)
  To: ml

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

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

New package: drumstick-1.1.2
https://github.com/void-linux/void-packages/pull/14113

Description:


^ permalink raw reply	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2019-09-03 14:37 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
2019-09-01 14:49 ` [PR PATCH] [Updated] [WIP] New package: drumstick voidlinux-github
2019-09-01 14:49 ` voidlinux-github
2019-09-01 14:54 ` voidlinux-github
2019-09-01 16:38 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-01 16:38 ` voidlinux-github
2019-09-01 17:06 ` [WIP] New package: libdrumstick-1.1.2 voidlinux-github
2019-09-01 17:15 ` voidlinux-github
2019-09-01 17:20 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-01 17:20 ` voidlinux-github
2019-09-02  6:02 ` voidlinux-github
2019-09-02  6:02 ` voidlinux-github
2019-09-02  9:32 ` voidlinux-github
2019-09-02  9:32 ` voidlinux-github
2019-09-02  9:56 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-02  9:56 ` voidlinux-github
2019-09-02 10:15 ` New package: drumstick-1.1.2 voidlinux-github
2019-09-02 10:57 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-02 10:57 ` voidlinux-github
2019-09-02 11:22 ` voidlinux-github
2019-09-02 11:22 ` voidlinux-github
2019-09-03  8:17 ` voidlinux-github
2019-09-03  8:17 ` voidlinux-github
2019-09-03 12:08 ` voidlinux-github
2019-09-03 12:08 ` voidlinux-github
2019-09-03 14:37 ` [PR PATCH] [Merged]: " voidlinux-github

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).