diff options
author | Stephen Gregoratto | 2019-09-05 20:32:27 +1000 |
---|---|---|
committer | Adrian Perez de Castro | 2019-09-05 15:20:56 +0300 |
commit | 7458c2064a07bd7fbf85cd4c8706de275d695bf2 (patch) | |
tree | c3f70fd5720a3670d86301363361fc578b00ce13 | |
parent | 3928e17d38ce7ac3fcf37edee62bf5acc6d970d7 (diff) | |
download | aur-7458c2064a07bd7fbf85cd4c8706de275d695bf2.tar.gz |
update to new release, simplify PKGBUILD
- The ldflags patch has been merged upstream[1].
- Add extra arches for Arch Linux ARM.
- Use configure script to set PREFIX and MANDIR.
- Replace gawk dependancy with call to sed at package time.
[1] https://github.com/kristapsdz/sblg/pull/14
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | makefile-ldflags.patch | 11 |
3 files changed, 13 insertions, 34 deletions
@@ -1,16 +1,16 @@ pkgbase = sblg pkgdesc = simple off-line blog utility - pkgver = 0.5.4 + pkgver = 0.5.5 pkgrel = 1 url = https://kristaps.bsd.lv/sblg arch = x86_64 + arch = i686 + arch = armv6h + arch = armv7h license = custom:ISC - makedepends = gawk depends = expat - source = https://kristaps.bsd.lv/sblg/snapshots/sblg-0.5.4.tar.gz - source = makefile-ldflags.patch - sha512sums = 6d4eafb1c2c0ebbc6d6dc82bbc79d5a6d40d12baff21f49d891eae490625aa1c7bced7f3cfa59b026b592dfe1abde226ef56537c86a38927cc6c2d7edd4b9517 - sha512sums = 33593b6d744c57dfbb40bd51a1cbe923f73960dc5632184325486ffb920f4404947257408faa29a4ea9fa7fe3bcb1edf131a87fa9e786ac0d5012a70a4319151 + source = https://kristaps.bsd.lv/sblg/snapshots/sblg-0.5.5.tar.gz + sha512sums = fb18949985292b8db5fe82736fb25c14c1cb0ee19ff6b8764ad77cf745cfb8712fde74665d1efbca29fb7dfb9d4eb959a974bb30e840af78cf0e5e37a4e3520d pkgname = sblg @@ -1,35 +1,25 @@ # Maintainer: Adrián Pérez de Castro <aperez@igalia.com> +# Contributor: KingofToasters <dev at sgregoratto dot me> pkgname=sblg pkgdesc='simple off-line blog utility' -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 url='https://kristaps.bsd.lv/sblg' -source=("${url}/snapshots/${pkgname}-${pkgver}.tar.gz" makefile-ldflags.patch) +source=("${url}/snapshots/${pkgname}-${pkgver}.tar.gz") depends=(expat) -makedepends=(gawk) license=(custom:ISC) -arch=(x86_64) -sha512sums=('6d4eafb1c2c0ebbc6d6dc82bbc79d5a6d40d12baff21f49d891eae490625aa1c7bced7f3cfa59b026b592dfe1abde226ef56537c86a38927cc6c2d7edd4b9517' - '33593b6d744c57dfbb40bd51a1cbe923f73960dc5632184325486ffb920f4404947257408faa29a4ea9fa7fe3bcb1edf131a87fa9e786ac0d5012a70a4319151') - -prepare () { - cd "${pkgname}-${pkgver}" - patch -p0 < "${srcdir}/makefile-ldflags.patch" -} +arch=(x86_64 i686 armv6h armv7h) +sha512sums=('fb18949985292b8db5fe82736fb25c14c1cb0ee19ff6b8764ad77cf745cfb8712fde74665d1efbca29fb7dfb9d4eb959a974bb30e840af78cf0e5e37a4e3520d') build () { cd "${pkgname}-${pkgver}" - ./configure PREFIX=/usr MANDIR=/usr/share/man - cat >> Makefile.configure <<-EOF - CFLAGS += ${CFLAGS} - LDFLAGS += ${LDFLAGS} - EOF + ./configure PREFIX="/usr" MANDIR="/usr/share/man" LDFLAGS="$LDFLAGS -s" make - awk '/^\/\*/,/\*\// { print }' main.c > COPYING } package () { cd "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" make install + sed -n 3,15p main.c | cut -c4- > COPYING install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/makefile-ldflags.patch b/makefile-ldflags.patch deleted file mode 100644 index 3a3146a901c9..000000000000 --- a/makefile-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2019-08-23 10:52:26.476692171 +0300 -+++ Makefile 2019-08-23 10:52:53.027117958 +0300 -@@ -55,7 +55,7 @@ - all: sblg sblg.a sblg.1 - - sblg: $(OBJS) -- $(CC) -o $@ $(OBJS) -lexpat -+ $(CC) $(LDFLAGS) -s -o $@ $(OBJS) -lexpat - - sblg.a: $(OBJS) - $(AR) rs $@ $(OBJS) |