summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gregoratto2020-03-25 13:40:34 +1100
committerStephen Gregoratto2020-03-25 13:40:34 +1100
commit487a97691e9ba9274762f952b71738598c123f1e (patch)
tree854a83cd8c8e92ddcb8124fa7626942152acd8cc
parent269211bba630be513f81a841202f28cdb1d04a89 (diff)
downloadaur-487a97691e9ba9274762f952b71738598c123f1e.tar.gz
Fix building due to upstream makefile changes.
Thanks to upstream (Hiltjo Posthuma) for letting me know about this.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--sfeed-git.patch27
3 files changed, 18 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07f5f9cc074..9a8600e0170 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = sfeed-git
pkgdesc = RSS and Atom parser
- pkgver = 0.9.11.r3.g16a6611
+ pkgver = 0.9.16.r9.g785a50c
pkgrel = 1
- url = https://codemadness.org/sfeed-simple-feed-parser.html
+ url = https://codemadness.org/sfeed.html
arch = i686
arch = x86_64
arch = armv6h
@@ -14,7 +14,7 @@ pkgbase = sfeed-git
source = sfeed::git+git://git.codemadness.org/sfeed
source = sfeed-git.patch
sha256sums = SKIP
- sha256sums = 1700a32d9c79b63d48ee4a84fe8d9127a368c8e7c9911108a49df140f000b8ce
+ sha256sums = 5f2e89b58dd9bb70dfe27b696e1efaab1d94af443e9119ac79158f2871387f79
pkgname = sfeed-git
diff --git a/PKGBUILD b/PKGBUILD
index 7e7926b02a6..5297dac35ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: KingofToasters <dev at sgregoratto dot me>
+# Maintainer: Stephen Gregoratto <dev@sgregoratto.me>
pkgname=sfeed-git
-pkgver=0.9.11.r3.g16a6611
+pkgver=0.9.16.r9.g785a50c
pkgrel=1
pkgdesc='RSS and Atom parser'
-url='https://codemadness.org/sfeed-simple-feed-parser.html'
+url='https://codemadness.org/sfeed.html'
license=('ISC')
provides=('sfeed')
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -12,7 +12,7 @@ makedepends=('git')
source=("${pkgname%-git}::git+git://git.codemadness.org/sfeed"
"sfeed-git.patch")
sha256sums=('SKIP'
- '1700a32d9c79b63d48ee4a84fe8d9127a368c8e7c9911108a49df140f000b8ce')
+ '5f2e89b58dd9bb70dfe27b696e1efaab1d94af443e9119ac79158f2871387f79')
pkgver() {
cd "${pkgname%-git}"
diff --git a/sfeed-git.patch b/sfeed-git.patch
index 44942dfcf00..4416bad445e 100644
--- a/sfeed-git.patch
+++ b/sfeed-git.patch
@@ -1,31 +1,26 @@
Chunk 1: Change PREFIX and MANPREFIX variables
-Chunk 2: Append local (C|CXX|LD)FLAGS, use _DEFALUT SOURCE
-diff -ura sfeed.old/config.mk sfeed.new/config.mk
---- sfeed.old/config.mk 2019-02-26 10:16:47.944146690 +1100
-+++ sfeed.new/config.mk 2019-02-26 10:17:47.225309885 +1100
-@@ -1,9 +1,9 @@
- # customize below to fit your system
+Chunk 2: Append local CPPFLAGS, use _DEFALUT SOURCE
+diff -ura sfeed.old/.git/index sfeed.new/.git/index
+--- sfeed.old/Makefile 2020-03-25 13:29:05.092599907 +1100
++++ sfeed.new/Makefile 2020-03-25 13:27:09.328856315 +1100
+@@ -4,16 +4,16 @@
+ VERSION = 0.9.16
# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/man
--DOCPREFIX = ${PREFIX}/share/doc/sfeed
+-DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+PREFIX = /usr
+MANPREFIX = ${PREFIX}/share/man
+DOCPREFIX = ${PREFIX}/share/doc/sfeed-git
- # compiler and linker
- CC = cc
-@@ -11,9 +11,9 @@
RANLIB = ranlib
# use system flags.
--SFEED_CFLAGS = ${CFLAGS}
--SFEED_LDFLAGS = ${LDFLAGS}
+ SFEED_CFLAGS = ${CFLAGS}
+ SFEED_LDFLAGS = ${LDFLAGS}
-SFEED_CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
-+SFEED_CFLAGS = ${CFLAGS}
-+SFEED_LDFLAGS = ${LDFLAGS}
+SFEED_CPPFLAGS = ${CPPFLAGS} -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE
- # debug
- #SFEED_CFLAGS = -fstack-protector-all -O0 -g -std=c99 -Wall -Wextra -pedantic \
+ BIN = \
+ sfeed\