From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] New package: drumstick
Date: Sun, 01 Sep 2019 16:49:42 +0200 [thread overview]
Message-ID: <20190901144942.jZQ7Bn6dMFqOmn8IE4ivIziDALgTN0pDcrzpUak4Igg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
[-- 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
}
next parent reply other threads:[~2019-09-01 14:49 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14113@inbox.vuxu.org>
2019-09-01 14:49 ` voidlinux-github [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190901144942.jZQ7Bn6dMFqOmn8IE4ivIziDALgTN0pDcrzpUak4Igg@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).