summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD40
-rw-r--r--sfeed-git.patch31
3 files changed, 37 insertions, 58 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07f5f9cc0744..5ccac7c79fb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,28 @@
pkgbase = sfeed-git
pkgdesc = RSS and Atom parser
- pkgver = 0.9.11.r3.g16a6611
+ pkgver = 1.8.r0.gaed4714
pkgrel = 1
- url = https://codemadness.org/sfeed-simple-feed-parser.html
+ 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
+ replaces = sfeed-curses-git
+ source = sfeed::git://git.codemadness.org/sfeed
sha256sums = SKIP
- sha256sums = 1700a32d9c79b63d48ee4a84fe8d9127a368c8e7c9911108a49df140f000b8ce
pkgname = sfeed-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 7e7926b02a6c..d209d293a34f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,38 @@
-# Maintainer: KingofToasters <dev at sgregoratto dot me>
+# Contributor: Stephen Gregoratto <dev@sgregoratto.me>
+
+_pkgname=sfeed
pkgname=sfeed-git
-pkgver=0.9.11.r3.g16a6611
+pkgver=1.8.r0.gaed4714
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')
-depends=('curl')
+conflicts=('sfeed')
+replaces=('sfeed-curses-git')
+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'
- '1700a32d9c79b63d48ee4a84fe8d9127a368c8e7c9911108a49df140f000b8ce')
+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 44942dfcf00f..000000000000
--- a/sfeed-git.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/man
--DOCPREFIX = ${PREFIX}/share/doc/sfeed
-+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_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 \