feh: update to 2.23
Add patch to fix building on musl environments: need to define _BSD_SOURCE so that when string.h is included, strings.h is also included. Closes: #10524 [via git-merge-pr]
This commit is contained in:
parent
c1a6049d0a
commit
3a46cfacf4
2 changed files with 18 additions and 2 deletions
16
srcpkgs/feh/patches/musl-strings.patch
Normal file
16
srcpkgs/feh/patches/musl-strings.patch
Normal file
|
@ -0,0 +1,16 @@
|
|||
feh.h includes X11/Xos.h which in turn includes string.h. In musl
|
||||
environments, strings.h is not implicitly included unless we define either
|
||||
_BSD_SOURCE or _GNU_SOURCE. Therefore, add -D_BSD_SOURCE so that when string.h
|
||||
is included, it also includes strings.h.
|
||||
|
||||
--- ./config.mk 2018-01-07 14:26:09.423820119 -0500
|
||||
+++ ./config.mk 2018-01-07 14:26:17.411888240 -0500
|
||||
@@ -38,7 +38,7 @@
|
||||
CFLAGS += -Wall -Wextra -pedantic
|
||||
|
||||
# Settings for glibc >= 2.19 - may need to be adjusted for other systems
|
||||
-CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500
|
||||
+CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
|
||||
|
||||
ifeq (${curl},1)
|
||||
CFLAGS += -DHAVE_LIBCURL
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'feh'
|
||||
pkgname=feh
|
||||
version=2.22.2
|
||||
version=2.23
|
||||
revision=1
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="giblib-devel libcurl-devel libexif-devel
|
||||
|
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="MIT"
|
||||
homepage="https://feh.finalrewind.org/"
|
||||
distfiles="${homepage}/feh-${version}.tar.bz2"
|
||||
checksum=05a81fbe0997f6274c7617efc351647be38e5244c2624bd203459025c9a68ecd
|
||||
checksum=16df3cb813526a549e854aa82f80bcb299b9e83dd687ab4216a84e86f61722a1
|
||||
|
||||
do_build() {
|
||||
make ${makejobs} CC=$CC PREFIX=/usr exif=1 help=1 stat64=1
|
||||
|
|
Loading…
Reference in a new issue