[PR PATCH] Stk libexecdir

[PR PATCH] Stk libexecdir

[sgn]

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

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

https://github.com/sgn/void-packages stk-libexecdir
https://github.com/void-linux/void-packages/pull/28012

Stk libexecdir
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to include "[ci skip]' in
either the PR title or this description. When skipping CI, uncomment and complete
the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]
-->


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

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

From ac606bc9765adbfb9af33e37a159c37dea5b5fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 18 Jan 2021 20:43:00 +0700
Subject: [PATCH] stk: fix ftbfs, reconfigure libexecdir

We installed those files into /usr/libexec/stk for a long time.
---
 srcpkgs/stk/patches/lib-include-dir.patch | 21 +++++++++++++++++++++
 srcpkgs/stk/template                      | 12 +++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/stk/patches/lib-include-dir.patch

diff --git a/srcpkgs/stk/patches/lib-include-dir.patch b/srcpkgs/stk/patches/lib-include-dir.patch
new file mode 100644
index 00000000000..50fb53a77cc
--- /dev/null
+++ b/srcpkgs/stk/patches/lib-include-dir.patch
@@ -0,0 +1,21 @@
+--- src/Makefile.in.orig	2021-01-18 20:34:19.338872822 +0700
++++ src/Makefile.in	2021-01-18 20:35:11.314028147 +0700
+@@ -93,13 +93,13 @@
+ 	$(LN) -s @sharedname@ $(SHAREDLIB)
+ 
+ install-headers:
+-	install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
+-	cp -R ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
++	install -d $(DESTDIR)$(INCLUDEDIR)/stk
++	cp -R ../include/*.h $(DESTDIR)$(INCLUDEDIR)/stk
+ 
+ install: $(SHAREDLIB) install-headers
+-	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
+-	install -m 644 @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)
+-	ln -sf @sharedname@ $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB)
++	install -d $(DESTDIR)$(LIBDIR)
++	install -m 644 @sharedname@ $(DESTDIR)$(LIBDIR)
++	ln -sf @sharedname@ $(DESTDIR)$(LIBDIR)/$(SHAREDLIB)
+ 
+ 
+ $(OBJECTS) : Stk.h
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index f726e3a5340..3ef3e444a38 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -1,9 +1,12 @@
 # Template file for 'stk'
 pkgname=stk
 version=4.6.1
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--with-alsa --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
+configure_args="--with-alsa
+ --libexecdir=/usr/libexec/stk
+ --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
+make_install_args="prefix=/usr"
 hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
 depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
@@ -19,11 +22,6 @@ pre_configure() {
 }
 
 post_install() {
-	# Fix wrong 32 bit library install path
-	if [ -f "${DESTDIR}"/usr/usr/lib32/libstk.so ]; then
-		mv -v "${DESTDIR}"/usr/usr/lib32/* "${DESTDIR}"/usr/lib
-	fi
-
 	# Create a pkg-config file
 	vmkdir usr/lib/pkgconfig
 	sed ${FILESDIR}/stk.pc \

Re: Stk libexecdir

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/28012#issuecomment-762390404

Comment:
Built for all targets with *experimental* so LGTM.

Re: [PR PATCH] [Merged]: Stk libexecdir

[pullmoll]

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

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

Stk libexecdir
https://github.com/void-linux/void-packages/pull/28012

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to include "[ci skip]' in
either the PR title or this description. When skipping CI, uncomment and complete
the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

[ci skip]
-->