From 4f61fe65afa9e5888accca9a2fec1c15a0b65ac0 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Mon, 10 Apr 2023 16:26:02 +0800
Subject: feh: upgrade 3.9.1 -> 3.10

Changelog:
==========
* Add --sort=none option to un-set sort modes specified earlier
* Improve error messages for Imlib2 >= 1.8
* Fix build with clang 16. (Patch by orbea)
* Fix tests when building with magic=1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/feh/feh_3.10.bb  | 31 +++++++++++++++++++++++++++++++
 meta-oe/recipes-graphics/feh/feh_3.9.1.bb | 31 -------------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/feh/feh_3.10.bb
 delete mode 100644 meta-oe/recipes-graphics/feh/feh_3.9.1.bb

diff --git a/meta-oe/recipes-graphics/feh/feh_3.10.bb b/meta-oe/recipes-graphics/feh/feh_3.10.bb
new file mode 100644
index 0000000000..0f0e61893a
--- /dev/null
+++ b/meta-oe/recipes-graphics/feh/feh_3.10.bb
@@ -0,0 +1,31 @@
+SUMMARY = "X11 image viewer aimed mostly at console users"
+AUTHOR = "Tom Gilbert & Daniel Friesel"
+HOMEPAGE = "https://feh.finalrewind.org/"
+SECTION = "x11/utils"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f91bd06901085c94bdc50649d98c5059"
+DEPENDS = "\
+    imlib2 \
+    virtual/libx11 libxt\
+"
+
+SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2"
+SRC_URI[sha256sum] = "1d71d1f6dcfe9ffee5e2766969a11978f7eb4fac7d7ae556f104c11f9c57cc98"
+
+inherit mime-xdg features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+EXTRA_OEMAKE = "curl=0 xinerama=0 PREFIX=/usr"
+
+do_compile () {
+     oe_runmake
+}
+
+do_install () {
+     oe_runmake install app=1 'DESTDIR=${D}' 'ICON_PREFIX=${D}${datadir}/icons'
+}
+
+RDEPENDS:${PN} += "imlib2-loaders"
+
+FILES:${PN} += "${datadir}/icons"
diff --git a/meta-oe/recipes-graphics/feh/feh_3.9.1.bb b/meta-oe/recipes-graphics/feh/feh_3.9.1.bb
deleted file mode 100644
index d78fe7e17d..0000000000
--- a/meta-oe/recipes-graphics/feh/feh_3.9.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "X11 image viewer aimed mostly at console users"
-AUTHOR = "Tom Gilbert & Daniel Friesel"
-HOMEPAGE = "https://feh.finalrewind.org/"
-SECTION = "x11/utils"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f91bd06901085c94bdc50649d98c5059"
-DEPENDS = "\
-    imlib2 \
-    virtual/libx11 libxt\
-"
-
-SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "455c92711b588af149b945edc5c145f3e9aa137ed9689dabed49d5e4acac75fa"
-
-inherit mime-xdg features_check
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OEMAKE = "curl=0 xinerama=0 PREFIX=/usr"
-
-do_compile () {
-     oe_runmake
-}
-
-do_install () {
-     oe_runmake install app=1 'DESTDIR=${D}' 'ICON_PREFIX=${D}${datadir}/icons'
-}
-
-RDEPENDS:${PN} += "imlib2-loaders"
-
-FILES:${PN} += "${datadir}/icons"
-- 
cgit v1.2.3-54-g00ecf