From ab1bd66407bbd4628f7becf6a8cea3746dd41bfe Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Fri, 25 Oct 2024 13:39:12 +0800
Subject: less: upgrade 661 -> 668

Changelog:
============
* Make 256/true colors work better on Windows without -Da
* Fix build using --with-secure
* Fix crash when using --header on command line
* Fix possible crash when scrolling left/right or toggling -S
* Fix bug when using #stop in a lesskey file
* Fix bug when using --shift or --match-shift on command line with
  a parameter starting with '.'
* Fix bug in R command when file size changes
* Fix bug using --header when file does not fill screen
* Fix ^X bug when output is not a terminal
* Fix bug where ^Z is not handled immediately
* Fix bug where first byte from a LESSOPEN filter is deleted if it is
  greater than 0x7F
* Fix uninitialized variable in edit_ifile
* Fix incorrect handling of UTF-8 chars in prompts

(From OE-Core rev: 71c5b012278fc5c9c0c5e31b46ce348309b4b9e7)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-extended/less/less_661.bb | 61 ----------------------------------
 meta/recipes-extended/less/less_668.bb | 61 ++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 meta/recipes-extended/less/less_661.bb
 create mode 100644 meta/recipes-extended/less/less_668.bb

diff --git a/meta/recipes-extended/less/less_661.bb b/meta/recipes-extended/less/less_661.bb
deleted file mode 100644
index 061a494f0f..0000000000
--- a/meta/recipes-extended/less/less_661.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY = "Text file viewer similar to more"
-DESCRIPTION = "Less is a program similar to more, i.e. a terminal \
-based program for viewing text files and the output from other \
-programs. Less offers many features beyond those that more does."
-HOMEPAGE = "http://www.greenwoodsoftware.com/"
-SECTION = "console/utils"
-
-# (GPL-2.0-or-later (<< 418), GPL-3.0-or-later (>= 418)) | less
-# Including email author giving permissing to use BSD
-#
-# From: Mark Nudelman <markn@greenwoodsoftware.com>
-# To: Elizabeth Flanagan <elizabeth.flanagan@intel.com
-# Date: 12/19/11
-#
-# Hi Elizabeth,
-# Using a generic BSD license for less is fine with me.
-# Thanks,
-#
-# --Mark
-#
-
-LICENSE = "GPL-3.0-or-later | BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
-                    file://LICENSE;md5=ea7ea443692720f3015859945c0fb65d \
-                    "
-DEPENDS = "ncurses"
-
-SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
-           file://run-ptest \
-           "
-
-SRC_URI[sha256sum] = "2b5f0167216e3ef0ffcb0c31c374e287eb035e4e223d5dae315c2783b6e738ed"
-
-UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
-
-inherit autotools ptest update-alternatives
-
-EXTRA_OEMAKE += " LESSTEST=1"
-
-inherit autotools update-alternatives
-
-do_compile_ptest () {
-        cd ${S}/lesstest
-        oe_runmake
-}
-
-do_install () {
-        oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
-}
-
-do_install_ptest () {
-        cp ${S}/lesstest/lesstest ${D}${PTEST_PATH}
-        cp ${S}/lesstest/runtest ${D}${PTEST_PATH}
-        cp ${S}/lesstest/lt_screen ${D}${PTEST_PATH}
-        cp -r ${S}/lesstest/lt ${D}${PTEST_PATH}
-}
-
-RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd perl-module-file-basename locale-base-en-us"
-
-ALTERNATIVE:${PN} = "less"
-ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/less/less_668.bb b/meta/recipes-extended/less/less_668.bb
new file mode 100644
index 0000000000..63fc367e33
--- /dev/null
+++ b/meta/recipes-extended/less/less_668.bb
@@ -0,0 +1,61 @@
+SUMMARY = "Text file viewer similar to more"
+DESCRIPTION = "Less is a program similar to more, i.e. a terminal \
+based program for viewing text files and the output from other \
+programs. Less offers many features beyond those that more does."
+HOMEPAGE = "http://www.greenwoodsoftware.com/"
+SECTION = "console/utils"
+
+# (GPL-2.0-or-later (<< 418), GPL-3.0-or-later (>= 418)) | less
+# Including email author giving permissing to use BSD
+#
+# From: Mark Nudelman <markn@greenwoodsoftware.com>
+# To: Elizabeth Flanagan <elizabeth.flanagan@intel.com
+# Date: 12/19/11
+#
+# Hi Elizabeth,
+# Using a generic BSD license for less is fine with me.
+# Thanks,
+#
+# --Mark
+#
+
+LICENSE = "GPL-3.0-or-later | BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
+                    file://LICENSE;md5=ea7ea443692720f3015859945c0fb65d \
+                    "
+DEPENDS = "ncurses"
+
+SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
+           file://run-ptest \
+           "
+
+SRC_URI[sha256sum] = "2819f55564d86d542abbecafd82ff61e819a3eec967faa36cd3e68f1596a44b8"
+
+UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
+
+inherit autotools ptest update-alternatives
+
+EXTRA_OEMAKE += " LESSTEST=1"
+
+inherit autotools update-alternatives
+
+do_compile_ptest () {
+        cd ${S}/lesstest
+        oe_runmake
+}
+
+do_install () {
+        oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
+}
+
+do_install_ptest () {
+        cp ${S}/lesstest/lesstest ${D}${PTEST_PATH}
+        cp ${S}/lesstest/runtest ${D}${PTEST_PATH}
+        cp ${S}/lesstest/lt_screen ${D}${PTEST_PATH}
+        cp -r ${S}/lesstest/lt ${D}${PTEST_PATH}
+}
+
+RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd perl-module-file-basename locale-base-en-us"
+
+ALTERNATIVE:${PN} = "less"
+ALTERNATIVE_PRIORITY = "100"
-- 
cgit v1.2.3-54-g00ecf