Update to v1.8

3 files changed, 33 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a8600e01702..450dbe8cbb23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,27 @@
 pkgbase = sfeed-git
 	pkgdesc = RSS and Atom parser
-	pkgver = 0.9.16.r9.g785a50c
+	pkgver = 1.8.r0.gaed4714
 	pkgrel = 1
 	url = https://codemadness.org/sfeed.html
 	arch = i686
+	arch = pentium4
 	arch = x86_64
-	arch = armv6h
+	arch = arm
 	arch = armv7h
+	arch = armv6h
+	arch = aarch64
 	license = ISC
 	makedepends = git
-	depends = curl
+	depends = sh
+	depends = ncurses
+	optdepends = curl: sfeed_update script
+	optdepends = xclip: used by sfeed_curses for yanking the URL or enclosure
+	optdepends = xdg-utils: for xdg-open, used by sfeed_curses as a plumber by default
+	optdepends = awk: used by the sfeed_content and sfeed_markread script
+	optdepends = lynx: used by the sfeed_content script to convert HTML content
 	provides = sfeed
-	source = sfeed::git+git://git.codemadness.org/sfeed
-	source = sfeed-git.patch
+	conflicts = sfeed
+	source = sfeed::git://git.codemadness.org/sfeed
 	sha256sums = SKIP
-	sha256sums = 5f2e89b58dd9bb70dfe27b696e1efaab1d94af443e9119ac79158f2871387f79
 
 pkgname = sfeed-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5297dac35ac3..abfbaa7ba4e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,37 @@
-# Maintainer: Stephen Gregoratto <dev@sgregoratto.me>
+# Contributor: Stephen Gregoratto <dev@sgregoratto.me>
+
+_pkgname=sfeed
 pkgname=sfeed-git
-pkgver=0.9.16.r9.g785a50c
+pkgver=1.8.r0.gaed4714
 pkgrel=1
 pkgdesc='RSS and Atom parser'
 url='https://codemadness.org/sfeed.html'
 license=('ISC')
 provides=('sfeed')
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
-depends=('curl')
+conflicts=('sfeed')
+arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64')
+depends=('sh' 'ncurses')
+optdepends=('curl: sfeed_update script'
+    'xclip: used by sfeed_curses for yanking the URL or enclosure'
+    'xdg-utils: for xdg-open, used by sfeed_curses as a plumber by default'
+    'awk: used by the sfeed_content and sfeed_markread script'
+    'lynx: used by the sfeed_content script to convert HTML content'
+)
 makedepends=('git')
-source=("${pkgname%-git}::git+git://git.codemadness.org/sfeed"
-        "sfeed-git.patch")
-sha256sums=('SKIP'
-            '5f2e89b58dd9bb70dfe27b696e1efaab1d94af443e9119ac79158f2871387f79')
+source=("$_pkgname::git://git.codemadness.org/sfeed")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${pkgname%-git}"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare(){
-  cd "${pkgname%-git}"
-  patch -Np1 -i "${srcdir}/sfeed-git.patch"
-}
-
 build() {
-  cd "${pkgname%-git}"
-  make
+  # To change the theme for sfeed_curses you can set SFEED_THEME. See the themes directory for the theme names.
+  make SFEED_CPPFLAGS="-D_DEFAULT_SOURCE" SFEED_THEME="mono" -C "${pkgname%-git}"
 }
 
 package() {
-  cd "${pkgname%-git}"
-  make DESTDIR="$pkgdir/" install
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENCE"
+  make DESTDIR="$pkgdir" PREFIX='/usr' MANPREFIX='/usr/share/man' -C "$_pkgname" install
+  install -Dvm644 "$_pkgname/LICENSE" -t "${pkgdir}/usr/share/licenses/$_pkgname"
 }
diff --git a/sfeed-git.patch b/sfeed-git.patch
deleted file mode 100644
index 4416bad445ea..000000000000
--- a/sfeed-git.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Chunk 1:	Change PREFIX and MANPREFIX variables
-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/${NAME}
-+PREFIX = /usr
-+MANPREFIX = ${PREFIX}/share/man
-+DOCPREFIX = ${PREFIX}/share/doc/sfeed-git
- 
- RANLIB = ranlib
- 
- # use system flags.
- SFEED_CFLAGS = ${CFLAGS}
- SFEED_LDFLAGS = ${LDFLAGS}
--SFEED_CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
-+SFEED_CPPFLAGS = ${CPPFLAGS} -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE
- 
- BIN = \
- 	sfeed\