[PR PATCH] aerc: update to 0.8.1

[PR PATCH] aerc: update to 0.8.1

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.1
LDFLAGS are unset as workaround to error with unknown flags to go build.
Before this commit LDFLAGS were not used
https://git.sr.ht/~rjarry/aerc/commit/44f81c87e47f80d7f29018ac0f7254dbb233e429#Makefile-2-9

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From da978ad50efb16f986a79638f7a61e81db8ca8a9 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.8.1

LDFLAGS are unset as workaround to error with unknown flags to go build.
Before this commit LDFLAGS were not used
https://git.sr.ht/~rjarry/aerc/commit/44f81c87e47f80d7f29018ac0f7254dbb233e429#Makefile-2-9
---
 srcpkgs/aerc/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..a8b2830b4b0b 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,6 +1,6 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.8.1
 revision=1
 build_style=go
 hostmakedepends="scdoc git"
@@ -10,13 +10,14 @@ maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=5bea713b211dcd85599c697a0f6563e07e2c04fd1443416545eea0a9a83a4f8d
 
 do_configure() {
 	:
 }
 
 do_build() {
+	unset LDFLAGS
 	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
 }
 

Re: [PR REVIEW] aerc: update to 0.8.1

[TinfoilSubmarine]

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812148954

Comment:
```suggestion
build_style=go
go_import_path="git.sr.ht/~rjarry/aerc"
```

Re: [PR REVIEW] aerc: update to 0.8.1

[TinfoilSubmarine]

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812153460

Comment:
Why do we do custom `do_configure`, `do_build`, and `do_install` instead of just letting `build_style=go` do its thing? All you have to do is add
```
go_import_path="git.sr.ht/~rjarry/aerc"
```

to the template and remove the custom `do_configure`, `do_build`, and `do_install`.

Re: [PR REVIEW] aerc: update to 0.8.1

[TinfoilSubmarine]

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812153460

Comment:
Why do we do custom `do_configure`, `do_build`, and `do_install` instead of just letting `build_style=go` do its thing? All you have to do is add
```
go_import_path="git.sr.ht/~rjarry/aerc"
```

to the template and remove the custom `do_configure`, `do_build`, and `do_install`.

You'll need a custom `post_install` to include all of the docs and configuration files:
```
post_install() {
        make doc
        vman aerc.1
        vman aerc-search.1
        vman aerc-config.5
        vman aerc-imap.5
        vman aerc-maildir.5
        vman aerc-sendmail.5
        vman aerc-notmuch.5
        vman aerc-smtp.5
        vman aerc-tutorial.7
        vman aerc-templates.7
        vman aerc-stylesets.7

        vmkdir usr/share/aerc
        vcopy config/*.conf usr/share/aerc
        vcopy filters usr/share/aerc
        vcopy templates usr/share/aerc
        vinstall config/default_styleset 644 usr/share/aerc/stylesets default

        vinstall contrib/aerc.desktop 644 usr/share/applications

        vlicense LICENSE
}
```

Re: [PR REVIEW] aerc: update to 0.8.1

[TinfoilSubmarine]

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812153460

Comment:
Why do we do custom `do_configure`, `do_build`, and `do_install` instead of just letting `build_style=go` do its thing? All you have to do is add
```
go_import_path="git.sr.ht/~rjarry/aerc"
```

to the template and remove the custom `do_configure`, `do_build`, and `do_install`. 

You'll need a custom `post_install` to include all of the docs and configuration files:
```
post_install() {
        make doc
        vman aerc.1
        vman aerc-search.1
        vman aerc-config.5
        vman aerc-imap.5
        vman aerc-maildir.5
        vman aerc-sendmail.5
        vman aerc-notmuch.5
        vman aerc-smtp.5
        vman aerc-tutorial.7
        vman aerc-templates.7
        vman aerc-stylesets.7

        vmkdir usr/share/aerc
        vcopy config/*.conf usr/share/aerc
        vcopy filters usr/share/aerc
        vcopy templates usr/share/aerc
        vinstall config/default_styleset 644 usr/share/aerc/stylesets default

        vinstall contrib/aerc.desktop 644 usr/share/applications

        vlicense LICENSE
}
```

This fixes the LDFLAGS issue w/o needing to unset it.

Re: [PR REVIEW] aerc: update to 0.8.1

[TinfoilSubmarine]

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812153460

Comment:
Why do we do custom `do_configure`, `do_build`, and `do_install` instead of just letting `build_style=go` do its thing? All you have to do is add
```
go_import_path="git.sr.ht/~rjarry/aerc"
```

to the template and remove the custom `do_configure`, `do_build`, and `do_install`. 

You'll need a custom `post_install` to include all of the docs and configuration files:
```
post_install() {
        make doc
        for f in *.{1,5,7}; do
                vman $f
        done

        vmkdir usr/share/aerc
        vcopy config/*.conf usr/share/aerc
        vcopy filters usr/share/aerc
        vcopy templates usr/share/aerc
        vinstall config/default_styleset 644 usr/share/aerc/stylesets default

        vinstall contrib/aerc.desktop 644 usr/share/applications

        vlicense LICENSE
}
```

This fixes the LDFLAGS issue w/o needing to unset it.

Re: [PR REVIEW] aerc: update to 0.8.1

[TinfoilSubmarine]

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812153460

Comment:
EDIT: I see the history on this now, but it is working with `build_style=go` now, so I would recommend this change.

Why do we do custom `do_configure`, `do_build`, and `do_install` instead of just letting `build_style=go` do its thing? All you have to do is add
```
go_import_path="git.sr.ht/~rjarry/aerc"
```

to the template and remove the custom `do_configure`, `do_build`, and `do_install`. 

You'll need a custom `post_install` to include all of the docs and configuration files:
```
post_install() {
        make doc
        for f in *.{1,5,7}; do
                vman $f
        done

        vmkdir usr/share/aerc
        vcopy config/*.conf usr/share/aerc
        vcopy filters usr/share/aerc
        vcopy templates usr/share/aerc
        vinstall config/default_styleset 644 usr/share/aerc/stylesets default

        vinstall contrib/aerc.desktop 644 usr/share/applications

        vlicense LICENSE
}
```

This fixes the LDFLAGS issue w/o needing to unset it.

Re: [PR PATCH] [Updated] aerc: update to 0.8.1

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.1
LDFLAGS are unset as workaround to error with unknown flags to go build.
Before this commit LDFLAGS were not used
https://git.sr.ht/~rjarry/aerc/commit/44f81c87e47f80d7f29018ac0f7254dbb233e429#Makefile-2-9

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From e63c8a88e3468e7a32f7e84176b2d4ecf725fad4 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.8.1

---
 srcpkgs/aerc/template | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..aebb2b2c724b 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,8 +1,11 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.8.1
 revision=1
 build_style=go
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
 hostmakedepends="scdoc git"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
@@ -10,20 +13,21 @@ maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=5bea713b211dcd85599c697a0f6563e07e2c04fd1443416545eea0a9a83a4f8d
 
-do_configure() {
-	:
-}
+post_install() {
+	make doc
+	for f in *.{1,5,7}; do
+		vman $f
+	done
 
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
+	vmkdir usr/share/aerc
+	vcopy config/*.conf usr/share/aerc
+	vcopy filters usr/share/aerc
+	vcopy templates usr/share/aerc
+	vinstall config/default_styleset 644 usr/share/aerc/stylesets default
 
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+	vinstall contrib/aerc.desktop 644 usr/share/applications
 
-post_install() {
 	vlicense LICENSE
 }

Re: [PR REVIEW] aerc: update to 0.8.1

[shtayerc]

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

New review comment by shtayerc on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812246832

Comment:
You are right. Done

Re: aerc: update to 0.8.1

[novakne]

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

New comment by novakne on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#issuecomment-1048158146

Comment:
8.2 have been released https://git.sr.ht/~rjarry/aerc/refs/0.8.2

Re: aerc: update to 0.8.1

[novakne]

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

New comment by novakne on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#issuecomment-1048158146

Comment:
0.8.2 have been released https://git.sr.ht/~rjarry/aerc/refs/0.8.2

Re: [PR PATCH] [Updated] aerc: update to 0.8.1

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.1
LDFLAGS are unset as workaround to error with unknown flags to go build.
Before this commit LDFLAGS were not used
https://git.sr.ht/~rjarry/aerc/commit/44f81c87e47f80d7f29018ac0f7254dbb233e429#Makefile-2-9

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From 75662ea5510af721ac8d5f1ce0bac30379a050a8 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.8.2

---
 srcpkgs/aerc/template | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..84015d0070b1 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,8 +1,11 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.8.2
 revision=1
 build_style=go
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
 hostmakedepends="scdoc git"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
@@ -10,20 +13,21 @@ maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=1a35db08b90c35df7c211119a8d064500999dfe2e419ed5b753007f8f7382912
 
-do_configure() {
-	:
-}
+post_install() {
+	make doc
+	for f in *.{1,5,7}; do
+		vman $f
+	done
 
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
+	vmkdir usr/share/aerc
+	vcopy config/*.conf usr/share/aerc
+	vcopy filters usr/share/aerc
+	vcopy templates usr/share/aerc
+	vinstall config/default_styleset 644 usr/share/aerc/stylesets default
 
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+	vinstall contrib/aerc.desktop 644 usr/share/applications
 
-post_install() {
 	vlicense LICENSE
 }

Re: [PR REVIEW] aerc: update to 0.8.2

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r812472162

Comment:
git should not be needed

Re: [PR PATCH] [Updated] aerc: update to 0.8.2

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.2
LDFLAGS are unset as workaround to error with unknown flags to go build.
Before this commit LDFLAGS were not used
https://git.sr.ht/~rjarry/aerc/commit/44f81c87e47f80d7f29018ac0f7254dbb233e429#Makefile-2-9

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From 75662ea5510af721ac8d5f1ce0bac30379a050a8 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.8.2

---
 srcpkgs/aerc/template | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..84015d0070b1 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,8 +1,11 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.8.2
 revision=1
 build_style=go
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
 hostmakedepends="scdoc git"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
@@ -10,20 +13,21 @@ maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=1a35db08b90c35df7c211119a8d064500999dfe2e419ed5b753007f8f7382912
 
-do_configure() {
-	:
-}
+post_install() {
+	make doc
+	for f in *.{1,5,7}; do
+		vman $f
+	done
 
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
+	vmkdir usr/share/aerc
+	vcopy config/*.conf usr/share/aerc
+	vcopy filters usr/share/aerc
+	vcopy templates usr/share/aerc
+	vinstall config/default_styleset 644 usr/share/aerc/stylesets default
 
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+	vinstall contrib/aerc.desktop 644 usr/share/applications
 
-post_install() {
 	vlicense LICENSE
 }

Re: aerc: update to 0.8.2

[novakne]

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

New comment by novakne on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#issuecomment-1076148762

Comment:
0.9.0 have been released https://git.sr.ht/~rjarry/aerc/refs/0.9.0

Re: [PR PATCH] [Updated] aerc: update to 0.8.2

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From 4ea0f21a3fe72ad1aed11a9b3a3f681ed516e227 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.8.2

---
 srcpkgs/aerc/template | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..9be434104582 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,33 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.8.2
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=1a35db08b90c35df7c211119a8d064500999dfe2e419ed5b753007f8f7382912
 
-do_configure() {
-	:
-}
+post_install() {
+	make doc
+	for f in *.{1,5,7}; do
+		vman $f
+	done
 
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
+	vmkdir usr/share/aerc
+	vcopy config/*.conf usr/share/aerc
+	vcopy filters usr/share/aerc
+	vcopy templates usr/share/aerc
+	vinstall config/default_styleset 644 usr/share/aerc/stylesets default
 
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+	vinstall contrib/aerc.desktop 644 usr/share/applications
 
-post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] aerc: update to 0.8.2

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From 4ea0f21a3fe72ad1aed11a9b3a3f681ed516e227 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.8.2

---
 srcpkgs/aerc/template | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..9be434104582 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,33 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.8.2
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=1a35db08b90c35df7c211119a8d064500999dfe2e419ed5b753007f8f7382912
 
-do_configure() {
-	:
-}
+post_install() {
+	make doc
+	for f in *.{1,5,7}; do
+		vman $f
+	done
 
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
+	vmkdir usr/share/aerc
+	vcopy config/*.conf usr/share/aerc
+	vcopy filters usr/share/aerc
+	vcopy templates usr/share/aerc
+	vinstall config/default_styleset 644 usr/share/aerc/stylesets default
 
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+	vinstall contrib/aerc.desktop 644 usr/share/applications
 
-post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] aerc: update to 0.8.2

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From 362debf62c63e2edec06edb0fa905c6c17b3200a Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.9.0

---
 srcpkgs/aerc/template | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..5f9ebd241bfd 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,33 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.9.0
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
 
-do_configure() {
-	:
-}
+post_install() {
+	make doc
+	for f in *.{1,5,7}; do
+		vman $f
+	done
 
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
+	vmkdir usr/share/aerc
+	vcopy config/*.conf usr/share/aerc
+	vcopy filters usr/share/aerc
+	vcopy templates usr/share/aerc
+	vinstall config/default_styleset 644 usr/share/aerc/stylesets default
 
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+	vinstall contrib/aerc.desktop 644 usr/share/applications
 
-post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] aerc: update to 0.8.2

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.8.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From bb5c85f6231c4d3744a3d37767bf2ad6bae58efb Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.9.0

---
 srcpkgs/aerc/template | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..5f9ebd241bfd 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,33 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.9.0
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
+checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
 
-do_configure() {
-	:
-}
+post_install() {
+	make doc
+	for f in *.{1,5,7}; do
+		vman $f
+	done
 
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
+	vmkdir usr/share/aerc
+	vcopy config/*.conf usr/share/aerc
+	vcopy filters usr/share/aerc
+	vcopy templates usr/share/aerc
+	vinstall config/default_styleset 644 usr/share/aerc/stylesets default
 
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+	vinstall contrib/aerc.desktop 644 usr/share/applications
 
-post_install() {
 	vlicense LICENSE
 }

Re: [PR REVIEW] aerc: update to 0.9.0

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r834765628

Comment:
This is not really maintainable. Would something like this work? `do_install() { make install }`

Re: [PR REVIEW] aerc: update to 0.9.0

[shtayerc]

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

New review comment by shtayerc on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r834981761

Comment:
We would have to patch Makefile then. Just running `make install` starts building aerc again.

Re: [PR PATCH] [Updated] aerc: update to 0.9.0

[shtayerc]

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

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

https://github.com/shtayerc/void-packages aerc-081
https://github.com/void-linux/void-packages/pull/35736

aerc: update to 0.9.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->


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

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

From c55f92f912e0c76ff0ef4debf2cba39b176a07e7 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH] aerc: update to 0.9.0

---
 .../aerc/patches/makefile-only-install.patch  | 18 +++++++++++++++
 srcpkgs/aerc/template                         | 22 ++++++-------------
 2 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/aerc/patches/makefile-only-install.patch

diff --git a/srcpkgs/aerc/patches/makefile-only-install.patch b/srcpkgs/aerc/patches/makefile-only-install.patch
new file mode 100644
index 000000000000..696832fe736c
--- /dev/null
+++ b/srcpkgs/aerc/patches/makefile-only-install.patch
@@ -0,0 +1,18 @@
+Build style handles building and installing aerc binary.
+Makefile should only install remaining files.
+
+--- ./Makefile
++++ ./Makefile
+@@ -82,11 +82,10 @@
+ clean:
+ 	$(RM) $(DOCS) aerc
+ 
+-install: $(DOCS) aerc
++install: $(DOCS)
+ 	mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7 \
+ 		$(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR)/stylesets \
+ 		$(DESTDIR)$(PREFIX)/share/applications
+-	install -m755 aerc $(DESTDIR)$(BINDIR)/aerc
+ 	install -m644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1
+ 	install -m644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1
+ 	install -m644 aerc-config.5 $(DESTDIR)$(MANDIR)/man5/aerc-config.5
diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..30a431484026 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,21 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.9.0
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
-
-do_configure() {
-	:
-}
-
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
-
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
 
 post_install() {
+ 	make PREFIX=/usr DESTDIR=${DESTDIR} install
 	vlicense LICENSE
 }

Re: [PR REVIEW] aerc: update to 0.9.0

[shtayerc]

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

New review comment by shtayerc on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r835421999

Comment:
@paper42 Done.

Re: [PR REVIEW] aerc: update to 0.9.0

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r835638716

Comment:
Hmm, that's unfortunate, do you think we could convince upstream to have a install-data make target? Then we could drop the patch and just set `make_install_target="install-data"`

Re: [PR PATCH] [Merged]: aerc: update to 0.9.0

[paper42]

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

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

aerc: update to 0.9.0
https://github.com/void-linux/void-packages/pull/35736

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->

Re: [PR REVIEW] aerc: update to 0.9.0

[shtayerc]

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

New review comment by shtayerc on void-packages repository

https://github.com/void-linux/void-packages/pull/35736#discussion_r835749882

Comment:
I think not. We are not compiling in the recommended way (using make).