[PR PATCH] cmt: update to 1.18 and make it buildable

[PR PATCH] cmt: update to 1.18 and make it buildable

[meator]

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

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

https://github.com/meator/void-packages cmt
https://github.com/void-linux/void-packages/pull/39583

cmt: update to 1.18 and make it buildable
The 1.17 version doesn't build:
```
=> xbps-src: updating repositories for host (x86_64)...
[*] Updating repository `https://repo-default.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/debug/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> cmt-1.17_2: removing autodeps, please wait...
=> cmt-1.17_2: building [gnu-makefile] for x86_64...
   [target] ladspa-sdk-1.15_3: found (https://repo-default.voidlinux.org/current)
=> cmt-1.17_2: installing target dependencies: ladspa-sdk-1.15_3 ...
=> cmt-1.17_2: running do-fetch hook: 00-distfiles ...
=> cmt-1.17_2: fetching distfile 'cmt_1.17.tgz' from 'http://www.ladspa.org/download/cmt_1.17.tgz'...
http://www.ladspa.org/download/cmt_1.17.tgz: Not Found
=> ERROR: cmt-1.17_2: failed to fetch 'cmt_1.17.tgz'.
```

#### Testing the changes
- I tested the changes in this PR: **NO**

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

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

From adf3104dcd3a2e3ec3426efdb3f009b93901c4aa Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 1 Oct 2022 15:22:50 +0200
Subject: [PATCH] cmt: update to 1.18.

---
 srcpkgs/cmt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cmt/template b/srcpkgs/cmt/template
index dccdac67e966..3ea9fc5a8e61 100644
--- a/srcpkgs/cmt/template
+++ b/srcpkgs/cmt/template
@@ -1,7 +1,7 @@
 # Template file for 'cmt'
 pkgname=cmt
-version=1.17
-revision=2
+version=1.18
+revision=1
 wrksrc="${pkgname}_${version}"
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-or-later"
 homepage="http://www.ladspa.org/cmt/overview.html"
 distfiles="http://www.ladspa.org/download/${pkgname}_${version}.tgz"
-checksum=eb56d7abebfdf8a6d0ad65d012238c9fc394dd41eeca11900812a8cb6b07ad1f
+checksum=a82f8636de1f4ada386a199a017a9cd775a49b49e716b11e8dd3f723c93df6ca
 
 post_extract() {
 	sed -e "/^CFLAGS/ s/-O2/${CFLAGS}/" \

Re: cmt: update to 1.18 and make it buildable

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#issuecomment-1368144977

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1059853962

Comment:
I cannot make any sense from these expressions.

It does seem that even with `make_use_env` applied, cmt's makefile ignores external variables (CFLAGS in this case) and the second expression attempts to stuff them into the file.

I would rather replace these crunches with

```sh
sed -e "/^CFLAGS/d; /^CXXFLAGS/d" -i "${build_wrksrc}/Makefile"
```

and remove `make_use_env=yes` as it does not fit its purpose here.

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1059849453

Comment:
```suggestion
```
`wrksrc` has been obsoleted at some point after your pull request. Please remove this line.

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1059860681

Comment:
The site now is accessible via `https`.

Re: [PR PATCH] [Updated] cmt: update to 1.18 and make it buildable

[meator]

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

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

https://github.com/meator/void-packages cmt
https://github.com/void-linux/void-packages/pull/39583

cmt: update to 1.18 and make it buildable
The 1.17 version doesn't build:
```
=> xbps-src: updating repositories for host (x86_64)...
[*] Updating repository `https://repo-default.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/debug/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> cmt-1.17_2: removing autodeps, please wait...
=> cmt-1.17_2: building [gnu-makefile] for x86_64...
   [target] ladspa-sdk-1.15_3: found (https://repo-default.voidlinux.org/current)
=> cmt-1.17_2: installing target dependencies: ladspa-sdk-1.15_3 ...
=> cmt-1.17_2: running do-fetch hook: 00-distfiles ...
=> cmt-1.17_2: fetching distfile 'cmt_1.17.tgz' from 'http://www.ladspa.org/download/cmt_1.17.tgz'...
http://www.ladspa.org/download/cmt_1.17.tgz: Not Found
=> ERROR: cmt-1.17_2: failed to fetch 'cmt_1.17.tgz'.
```

#### Testing the changes
- I tested the changes in this PR: **NO**

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

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

From b60b1c5ede8713f38dcb51ed29f95420c92ba98d Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 1 Oct 2022 15:22:50 +0200
Subject: [PATCH] cmt: update to 1.18.

This commit also switches URLs to https.
---
 srcpkgs/cmt/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cmt/template b/srcpkgs/cmt/template
index e87368e74671..a07ca8a06938 100644
--- a/srcpkgs/cmt/template
+++ b/srcpkgs/cmt/template
@@ -1,7 +1,7 @@
 # Template file for 'cmt'
 pkgname=cmt
-version=1.17
-revision=2
+version=1.18
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,9 +9,9 @@ makedepends="ladspa-sdk"
 short_desc="LADSPA plugins for use with software synthesis and recording packages"
 maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-or-later"
-homepage="http://www.ladspa.org/cmt/overview.html"
-distfiles="http://www.ladspa.org/download/${pkgname}_${version}.tgz"
-checksum=eb56d7abebfdf8a6d0ad65d012238c9fc394dd41eeca11900812a8cb6b07ad1f
+homepage="https://www.ladspa.org/cmt/overview.html"
+distfiles="https://www.ladspa.org/download/${pkgname}_${version}.tgz"
+checksum=a82f8636de1f4ada386a199a017a9cd775a49b49e716b11e8dd3f723c93df6ca
 
 post_extract() {
 	sed -e "/^CFLAGS/ s/-O2/${CFLAGS}/" \

Re: cmt: update to 1.18 and make it buildable

[meator]

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

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#issuecomment-1369749854

Comment:
Thanks for testing this @kruceter!

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1060577846

Comment:
I don't think `sed` would be even necessary when `make_use_env` wouldn't be set. Xbps will override it whether the lines are there or not (when `make_use_env` is unset). But both of these approaches (just unsetting `make_use_env` or unsetting `make_use_env` and then doing `sed -e "/^CFLAGS/d; /^CXXFLAGS/d" -i "${build_wrksrc}/Makefile"`) have a flaw: they remove the `-fPIC` flag from `CFLAGS`. This flag affects compilation in a major way and shouldn't be removed without reason. `-fPIC` could be added to `make_build_args`. What do You think?

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1060577846

Comment:
I don't think `sed` wouldn't even be necessary when `make_use_env` wouldn't be set. Xbps will override it whether the lines are there or not (when `make_use_env` is not set). But both of these approaches (just unsetting `make_use_env` or unsetting `make_use_env` and then doing `sed -e "/^CFLAGS/d; /^CXXFLAGS/d" -i "${build_wrksrc}/Makefile"`) have a flaw: they remove the `-fPIC` flag from `CFLAGS`. This flag affects compilation in a major way and shouldn't be removed without reason. `-fPIC` could be added to `make_build_args`. What do You think?

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1060577846

Comment:
I don't think `sed` would even be necessary when `make_use_env` wouldn't be set. Xbps will override it whether the lines are there or not (when `make_use_env` is not set). But both of these approaches (just unsetting `make_use_env` or unsetting `make_use_env` and then doing `sed -e "/^CFLAGS/d; /^CXXFLAGS/d" -i "${build_wrksrc}/Makefile"`) have a flaw: they remove the `-fPIC` flag from `CFLAGS`. This flag affects compilation in a major way and shouldn't be removed without reason. `-fPIC` could be added to `make_build_args`. What do You think?

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1064050817

Comment:
My apologies for the delay.

> I don't think sed would even be necessary when make_use_env wouldn't be set.

cmt's makefile defines CFLAGS and CXXFLAGS with `=` which completely overrides external variables as far as I can tell.

Here is what the makefile contains:
```
CFLAGS		=	$(INCLUDES) -Wall -Werror -O2 -fPIC
CXXFLAGS	=	$(CFLAGS)
PLUGIN_LIB	=	../plugins/cmt.so
```

> But both of these approaches have a flaw: they remove the `-fPIC` flag from `CFLAGS`.

That would be my fault for overlooking this.

Using sed to stuff it with void's flags just because `-fPIC` is present there looks overcomplicated and unnecessary.

In this case I can suggest the following (I forgot `vsed` must be used instead of `sed`):

```diff
diff --git a/srcpkgs/cmt/template b/srcpkgs/cmt/template
index a07ca8a069..6c676b62b9 100644
--- a/srcpkgs/cmt/template
+++ b/srcpkgs/cmt/template
@@ -14,9 +14,9 @@ distfiles="https://www.ladspa.org/download/${pkgname}_${version}.tgz"
 checksum=a82f8636de1f4ada386a199a017a9cd775a49b49e716b11e8dd3f723c93df6ca
 
 post_extract() {
-	sed -e "/^CFLAGS/ s/-O2/${CFLAGS}/" \
+	vsed -e "s,^\(CFLAGS.*\)=,\1+=," \
 	  -e 's|-Werror||g' \
-	  -i "${wrksrc}/src/Makefile"
+	  -i "${build_wrksrc}/Makefile"
 }
 
 do_install() {
```

`=` is substituted with `+=`, thus making externally defined `CFLAGS` and `CXXFLAGS` usable.

`make_use_env` now has its use here unlike earlier:
```markdown
This build style tries to compensate for makefiles
that do not respect environment variables, so well written makefiles, those
that do such things as append (`+=`) to variables, should have `make_use_env`
set in the body of the template.
```

With this approach only two lines have to be changed without meddling with upstream flags.

> `-fPIC` could be added to `make_build_args`

Based on my previous answer (I overlooked this flag for reasons unknown), I believe it should be left in the makefile since the fix above allows to use void's flags with those in the makefile together without that ugly hack.

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1064050817

Comment:
My apologies for the delay.

> I don't think sed would even be necessary when make_use_env wouldn't be set.

cmt's makefile defines CFLAGS and CXXFLAGS with `=` which completely overrides external variables as far as I can tell.

Here is what the makefile contains:
```
CFLAGS		=	$(INCLUDES) -Wall -Werror -O2 -fPIC
CXXFLAGS	=	$(CFLAGS)
PLUGIN_LIB	=	../plugins/cmt.so
```

> But both of these approaches have a flaw: they remove the `-fPIC` flag from `CFLAGS`.

That would be my fault for overlooking this.

Using sed to stuff it with void's flags just because `-fPIC` is present there looks overcomplicated and unnecessary.

In this case I can suggest the following (I forgot `vsed` must be used instead of `sed`):

```diff
diff --git a/srcpkgs/cmt/template b/srcpkgs/cmt/template
index a07ca8a069..6c676b62b9 100644
--- a/srcpkgs/cmt/template
+++ b/srcpkgs/cmt/template
@@ -14,9 +14,9 @@ distfiles="https://www.ladspa.org/download/${pkgname}_${version}.tgz"
 checksum=a82f8636de1f4ada386a199a017a9cd775a49b49e716b11e8dd3f723c93df6ca
 
 post_extract() {
-	sed -e "/^CFLAGS/ s/-O2/${CFLAGS}/" \
+	vsed -e "s,^\(CFLAGS.*\)=,\1+=," \
 	  -e 's|-Werror||g' \
-	  -i "${wrksrc}/src/Makefile"
+	  -i "${build_wrksrc}/Makefile"
 }
 
 do_install() {
```

`=` is substituted with `+=`, thus making externally defined `CFLAGS` and `CXXFLAGS` usable.

`make_use_env` now has its use here unlike earlier:
```markdown
This build style tries to compensate for makefiles
that do not respect environment variables, so well written makefiles, those
that do such things as append (`+=`) to variables, should have `make_use_env`
set in the body of the template.
```

With this approach only two lines have to be changed without meddling with upstream flags.

> `-fPIC` could be added to `make_build_args`

Based on my previous answer (I have had overlooked this flag for reasons unknown), I believe it should be left in the makefile since the fix above allows to use void's flags with those in the makefile together without that ugly hack.

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1065890177

Comment:
> cmt's makefile defines CFLAGS and CXXFLAGS with `=` which completely overrides external variables as far as I can tell.

When `$make_use_env` is unset, xbps-src [very explicitly](https://github.com/void-linux/void-packages/blob/master/common/build-style/gnu-makefile.sh#L7-L13) overrides all relevant variables set in the makefile. It doesn't matter what cmt's makefile wants to do, xbps-src will set it (unless it would be using the `override` keyword or other shenanigans but no one does that for `CFLAGS`).

But as I said it would still omit `-fPIC` which is undesirable.

> Using sed to stuff it with void's flags just because `-fPIC` is present there looks overcomplicated and unnecessary.
> 
> In this case I can suggest the following (I forgot `vsed` must be used instead of `sed`):

I agree that it looks overcomplicated. I think using sed in general isn't really fit for this situation. I'll make an actual patch that fixes this.

While I'm at it I'll try to contact upstream about this.

> > `-fPIC` could be added to `make_build_args`
> 
> Based on my previous answer (I have had overlooked this flag for reasons unknown), I believe it should be left in the makefile since the fix above allows to use void's flags with those in the makefile together without that ugly hack.

This is the best solution. Template files shouldn't be responsible for this.

I have experience with writing makefiles. The absolute best solution is https://www.gnu.org/software/make/manual/make.html#Command-Variables or (my favorite) presume that `CFLAGS` and similar variables are user input and put mandatory flags right into the rule from the beginning like this:
```makefile
a.o : a.c b.c
	$(CC) -c -fPIC --you-can't-override-me-when-I'm-hardcoded=true $(CFLAGS) $(CPPFLAGS) a.c b.c -o a.o
```
but it isn't xbps-src's responsibility to fix build system of other programs and both of these changes would require large patches so I'll make something simpler (probably just change `=` to `+=` but I'm not sure yet). I will propose one of the "correct" solutions to upstream.

Re: [PR REVIEW] cmt: update to 1.18 and make it buildable

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#discussion_r1065918270

Comment:
> probably just change `=` to `+=` but I'm not sure yet

That would be for the best *if* the upstream proves to be not amenable to your proposal.

Re: cmt: update to 1.18 and make it buildable

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/39583#issuecomment-1502574594

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: cmt: update to 1.18 and make it buildable

[github-actions]

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

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

cmt: update to 1.18 and make it buildable
https://github.com/void-linux/void-packages/pull/39583

Description:
The 1.17 version doesn't build:
```
=> xbps-src: updating repositories for host (x86_64)...
[*] Updating repository `https://repo-default.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/debug/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> cmt-1.17_2: removing autodeps, please wait...
=> cmt-1.17_2: building [gnu-makefile] for x86_64...
   [target] ladspa-sdk-1.15_3: found (https://repo-default.voidlinux.org/current)
=> cmt-1.17_2: installing target dependencies: ladspa-sdk-1.15_3 ...
=> cmt-1.17_2: running do-fetch hook: 00-distfiles ...
=> cmt-1.17_2: fetching distfile 'cmt_1.17.tgz' from 'http://www.ladspa.org/download/cmt_1.17.tgz'...
http://www.ladspa.org/download/cmt_1.17.tgz: Not Found
=> ERROR: cmt-1.17_2: failed to fetch 'cmt_1.17.tgz'.
```

#### Testing the changes
- I tested the changes in this PR: **NO**