From 918416bf9aa17417d965a64ddf09d0b4a8fa651b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 11 Dec 2024 00:01:44 +0100 Subject: [PATCH] package/feh: bump to version 3.10.3 For change log, see [1]. This commit also adds the "file" package optional dependency, for libmagic. This support was introduced in commit [2]. This commit also updates the project home page and download site URL to use https. Finally, the LICENSE file hash is updated to reflect change in [3]. [1] https://github.com/derf/feh/blob/3.10.3/ChangeLog [2] https://github.com/derf/feh/commit/4affafe91579799efd83f4c8e05c291eeb684c9c [3] https://github.com/derf/feh/commit/1197dafc110fb0a2e322b977d2dced15456bf7df Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/feh/Config.in | 2 +- package/feh/feh.hash | 4 ++-- package/feh/feh.mk | 11 +++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/feh/Config.in b/package/feh/Config.in index 7a348a1507..6f0bdd3242 100644 --- a/package/feh/Config.in +++ b/package/feh/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_FEH help feh is an X11 image viewer aimed mostly at console users. - http://feh.finalrewind.org/ + https://feh.finalrewind.org/ diff --git a/package/feh/feh.hash b/package/feh/feh.hash index f74b8fa335..f86a7ef6d7 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 57ab1ca61f57c96595878069f550d36f518530f88fa31b74cc39cd739f9258b6 feh-3.7.1.tar.bz2 -sha256 2c3a31327dc3cc3331aa6e759d378e4f66d0ece7174a0d5aa137f3cba4bf0509 COPYING +sha256 5426e2799770217af1e01c2e8c182d9ca8687d84613321d8ab4a66fe4041e9c8 feh-3.10.3.tar.bz2 +sha256 881f1b901b5b99bce372fd9498106724a1ea52450f7bfc6fc1cce6736a2faf4d COPYING diff --git a/package/feh/feh.mk b/package/feh/feh.mk index df03deedde..be3b67aff9 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,14 +4,21 @@ # ################################################################################ -FEH_VERSION = 3.7.1 +FEH_VERSION = 3.10.3 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 -FEH_SITE = http://feh.finalrewind.org +FEH_SITE = https://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING FEH_CPE_ID_VALID = YES +ifeq ($(BR2_PACKAGE_FILE),y) +FEH_DEPENDENCIES += file +FEH_MAKE_OPTS += magic=1 +else +FEH_MAKE_OPTS += magic=0 +endif + ifeq ($(BR2_PACKAGE_LIBCURL),y) FEH_DEPENDENCIES += libcurl FEH_MAKE_OPTS += curl=1