[arch-commits] Commit in aerc/repos/community-x86_64 (3 files)
Christian Rebischke
shibumi at gemini.archlinux.org
Sun Jul 24 14:38:21 UTC 2022
Date: Sunday, July 24, 2022 @ 14:38:20
Author: shibumi
Revision: 1255932
archrelease: copy trunk to community-x86_64
Added:
aerc/repos/community-x86_64/PKGBUILD
(from rev 1255931, aerc/trunk/PKGBUILD)
Deleted:
aerc/repos/community-x86_64/PKGBUILD
aerc/repos/community-x86_64/mk-rename-ambiguous-LDFLAGS-variable.patch
--------------------------------------------+
PKGBUILD | 72 +++++++++++++--------------
mk-rename-ambiguous-LDFLAGS-variable.patch | 60 ----------------------
2 files changed, 36 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-24 14:38:18 UTC (rev 1255931)
+++ PKGBUILD 2022-07-24 14:38:20 UTC (rev 1255932)
@@ -1,36 +0,0 @@
-# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
-# Contributor: Stefan Tatschner <stefan at rumpelsepp.org>
-# Contributor: Gökberk Yaltıraklı <aur at gkbrk dot com>
-# Contributor: Drew DeVault <sir at cmpwn.com>
-
-pkgname=aerc
-pkgver=0.10.0
-pkgrel=1
-pkgdesc='Email Client for your Terminal'
-arch=('x86_64')
-url='https://git.sr.ht/~rjarry/aerc'
-license=('MIT')
-depends=('notmuch-runtime' 'gawk')
-makedepends=('go' 'scdoc')
-optdepends=('w3m: for showing HTML messages'
- 'dante: for showing HTML messages')
-provides=('aerc')
-conflicts=('aerc')
-source=("$pkgname-$pkgver.tar.gz::https://git.sr.ht/~rjarry/${pkgname}/archive/${pkgver}.tar.gz")
-sha512sums=('016182847e1fb8198973aa8522d9a205a8589760d40b0177cb41a9b236277fb4aa11d2c0f14bd836be5a53f4b4d5ef65b407407e09399a2ad025fbf22d53bfbb')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export CGO_LDFLAGS="${LDFLAGS}"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export GOFLAGS="-buildmode=pie -trimpath -modcacherw -tags=notmuch"
- make PREFIX=/usr
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX=/usr DESTDIR=$pkgdir install
- install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/aerc/"
-}
Copied: aerc/repos/community-x86_64/PKGBUILD (from rev 1255931, aerc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-07-24 14:38:20 UTC (rev 1255932)
@@ -0,0 +1,36 @@
+# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
+# Contributor: Stefan Tatschner <stefan at rumpelsepp.org>
+# Contributor: Gökberk Yaltıraklı <aur at gkbrk dot com>
+# Contributor: Drew DeVault <sir at cmpwn.com>
+
+pkgname=aerc
+pkgver=0.11.0
+pkgrel=1
+pkgdesc='Email Client for your Terminal'
+arch=('x86_64')
+url='https://git.sr.ht/~rjarry/aerc'
+license=('MIT')
+depends=('notmuch-runtime' 'gawk')
+makedepends=('go' 'scdoc')
+optdepends=('w3m: for showing HTML messages'
+ 'dante: for showing HTML messages')
+provides=('aerc')
+conflicts=('aerc')
+source=("$pkgname-$pkgver.tar.gz::https://git.sr.ht/~rjarry/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('141c0300e60d81b725426f98d59ee645a2c24f478359587259ec645b6a710e6d292d1b8319a9f57f94d5be2f98cd48171dc6d99b54a20e49f16ed77199a2e127')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export GOFLAGS="-buildmode=pie -trimpath -modcacherw -tags=notmuch"
+ make PREFIX=/usr
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make PREFIX=/usr DESTDIR=$pkgdir install
+ install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/aerc/"
+}
Deleted: mk-rename-ambiguous-LDFLAGS-variable.patch
===================================================================
--- mk-rename-ambiguous-LDFLAGS-variable.patch 2022-07-24 14:38:18 UTC (rev 1255931)
+++ mk-rename-ambiguous-LDFLAGS-variable.patch 2022-07-24 14:38:20 UTC (rev 1255932)
@@ -1,60 +0,0 @@
-From 247c6c74380a9e56527ec0a87965a39142ffc213 Mon Sep 17 00:00:00 2001
-From: Robin Jarry <robin at jarry.cc>
-Date: Mon, 28 Mar 2022 14:33:17 +0200
-Subject: [PATCH] mk: rename ambiguous LDFLAGS variable
-
-The LDFLAGS environment variable is usually indented for C the linker
-flags which are not compatible with go -ldflags.
-
-Use a more explicit GO_LDFLAGS variable instead. Allow adding extra
-flags without overriding the default ones by specifying
-GO_EXTRA_LDFLAGS.
-
-This may break the build on some distros that rely on setting LDFLAGS to
-change the default shareDir or version. They will have to switch to
-GO_EXTRA_LDFLAGS.
-
-Link: https://salsa.debian.org/go-team/packages/aerc/-/commit/e9ed90beae9f
-Link: https://src.fedoraproject.org/rpms/aerc/blob/f36/f/aerc.spec#_86
-Fixes: e7e22aba60ce ("mk: rebuild if goflags or ldflags have changed")
-Signed-off-by: Robin Jarry <robin at jarry.cc>
----
- Makefile | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4967182..14adf89 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,11 @@ SHAREDIR?=$(PREFIX)/share/aerc
- MANDIR?=$(PREFIX)/share/man
- GO?=go
- GOFLAGS?=
--LDFLAGS+=-X main.Version=$(VERSION)
--LDFLAGS+=-X git.sr.ht/~rjarry/aerc/config.shareDir=$(SHAREDIR)
-+# ignore environment variable
-+GO_LDFLAGS:=
-+GO_LDFLAGS+=-X main.Version=$(VERSION)
-+GO_LDFLAGS+=-X git.sr.ht/~rjarry/aerc/config.shareDir=$(SHAREDIR)
-+GO_LDFLAGS+=$(GO_EXTRA_LDFLAGS)
-
- GOSRC!=find * -name '*.go'
- GOSRC+=go.mod go.sum
-@@ -31,7 +34,7 @@ DOCS := \
-
- all: aerc $(DOCS)
-
--build_cmd:=$(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o aerc
-+build_cmd:=$(GO) build $(GOFLAGS) -ldflags "$(GO_LDFLAGS)" -o aerc
-
- # the following command outputs nothing, we only want to execute it once
- # and force .aerc.d to be regenerated when build_cmd has changed
-@@ -63,7 +66,7 @@ debug: aerc.debug
- @echo ' dlv attach $$(pidof aerc.debug)'
-
- aerc.debug: $(GOSRC)
-- $(GO) build $(GOFLAGS) -gcflags=*=-N -gcflags=*=-l -ldflags="$(LDFLAGS)" -o aerc.debug
-+ $(GO) build $(GOFLAGS) -gcflags=*=-N -gcflags=*=-l -ldflags="$(GO_LDFLAGS)" -o aerc.debug
-
- .1.scd.1:
- scdoc < $< > $@
More information about the arch-commits
mailing list