5 files changed, 13 insertions, 134 deletions

diff --git a/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch b/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch
deleted file mode 100644
index a65d8cb77b..0000000000
--- a/meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 823a4deb61f6f9b91b0cfc4a7e7b20922c635777 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 1 Sep 2022 13:13:50 -0700
-Subject: [PATCH] configure: Fix check for AC_CHECK_LIB
-
-Check for nettle_pbkdf2_hmac_sha256 from libnettle instead of main()
-which is not in nettle library
-
-Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/115]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ER
-  On Debian-ish systems, use "apt-get install nettle-dev" to get a system
-  wide nettle install.
- ])]) 
--AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([
-+AC_CHECK_LIB(nettle,nettle_pbkdf2_hmac_sha256,,[AC_MSG_ERROR([
-  Could not link to libnettle. Please install nettle
-  first. If you have already done so; please run ldconfig
-  as root or check whether the path libnettle was installed
diff --git a/meta-oe/recipes-support/rdfind/rdfind/0001-configure.ac-fix-C-11-support-check.patch b/meta-oe/recipes-support/rdfind/rdfind/0001-configure.ac-fix-C-11-support-check.patch
deleted file mode 100644
index 815939b82d..0000000000
--- a/meta-oe/recipes-support/rdfind/rdfind/0001-configure.ac-fix-C-11-support-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9070bc210b2ecff641b73e4ade30040c1461969c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 3 May 2023 18:31:57 +0200
-Subject: [PATCH] configure.ac: fix C++11 support check
-
-* with -Werror=return-type in CFLAGS this test fails with:
-
-  configure:4290: checking for C++11 support or better
-  configure:4303: x86_64-webos-linux-g++  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/recipe-sysroot -c  -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/rdfind-1.5.0=/usr/src/debug/rdfind/1.5.0-r0  -fdebug-prefix-map=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/rdfind-1.5.0=/usr/src/debug/rdfind/1.5.0-r0  -fmacro-prefix-map=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/build=/usr/src/debug/rdfind/1.5.0-r0  -fdebug-prefix-map=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/build=/usr/src/debug/rdfind/1.5.0-r0  -fdebug-prefix-map=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/recipe-sysroot=  -fmacro-prefix-map=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/recipe-sysroot=  -fdebug-prefix-map=/OE/lge/build/webos/mickledore/BUILD/work/qemux86_64-webos-linux/rdfind/1.5.0-r0/recipe-sysroot-native=  -fvisibility-inlines-hidden   conftest.cpp >&5
-  conftest.cpp: In function 'int f()':
-  conftest.cpp:22:20: error: no return statement in function returning non-void [-Werror=return-type]
-     22 | int f() { auto a=1;}                                                                                                                                                                                                                        |                    ^
-  cc1plus: some warnings being treated as errors
-  ...
-  configure:4308: error: no c++11 support, please set CXXFLAGS properly
-
-* fix the test to pass
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/132]
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index be1b2fd..9c3513c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,7 +64,7 @@ AC_SYS_LARGEFILE
- 
- dnl make sure we have c++11 or better,
- AC_MSG_CHECKING([for C++11 support or better])
--AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int f() { auto a=1;}])],
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int f() { auto a=1;return a;}])],
-                   [AC_MSG_RESULT([yes])],
-                  [AC_MSG_ERROR([no c++11 support, please set CXXFLAGS properly])])
- 
diff --git a/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch b/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch
deleted file mode 100644
index bd59b74412..0000000000
--- a/meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 25 Jan 2023 21:12:47 -0800
-Subject: [PATCH] include standard headers <limits> and <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint> is no longer
-transitively included [1]. Explicitly include it for uint64_t.
-
-Fixes errors like below
-
-../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std'
-  225 |     o.maximumfilesize = std::numeric_limits<decltype(o.maximumfilesize)>::max();
-      |                              ^~~~~~~~~~~~~~
-
-...
-
-| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/129]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Fileinfo.hh | 1 +
- rdfind.cc   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/Fileinfo.hh b/Fileinfo.hh
-index 3ffb837..23ed54e 100644
---- a/Fileinfo.hh
-+++ b/Fileinfo.hh
-@@ -8,6 +8,7 @@
- #define Fileinfo_hh
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- // os specific headers
-diff --git a/rdfind.cc b/rdfind.cc
-index fbd6cb8..64dd8f6 100644
---- a/rdfind.cc
-+++ b/rdfind.cc
-@@ -9,6 +9,7 @@
- // std
- #include <algorithm>
- #include <iostream>
-+#include <limits>
- #include <string>
- #include <vector>
- 
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb
deleted file mode 100644
index dab66c3827..0000000000
--- a/meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Rdfind is a program that finds duplicate files"
-HOMEPAGE = "https://rdfind.pauldreik.se/"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f"
-
-DEPENDS = "nettle autoconf-archive"
-
-SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \
-           file://0001-configure-Fix-check-for-AC_CHECK_LIB.patch \
-           file://0001-include-standard-headers-limits-and-cstdint.patch \
-           file://0001-configure.ac-fix-C-11-support-check.patch \
-"
-
-SRC_URI[sha256sum] = "4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080"
-
-inherit autotools
-
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb
new file mode 100644
index 0000000000..3a15fe6c9a
--- /dev/null
+++ b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Rdfind is a program that finds duplicate files"
+HOMEPAGE = "https://rdfind.pauldreik.se/"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f"
+
+DEPENDS = "nettle autoconf-archive"
+
+SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz"
+SRC_URI[sha256sum] = "7a406e8ef1886a5869655604618dd98f672f12c6a6be4926d053be65070f3279"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"