Date   

[meta-oe][PATCH 08/22] cli11: upgrade 1.9.1 -> 2.2.0

Khem Raj
 

From: Wang Mingyu <wangmy@...>

License-Update: Copyright year updated to 2022.

0001-Do-not-download-the-catch-framework-during-configure.patch
added to download the catch framework before configure.

Signed-off-by: Wang Mingyu <wangmy@...>
Signed-off-by: Khem Raj <raj.khem@...>
---
...the-catch-framework-during-configure.patch | 41 +++++++++++++++++++
meta-oe/recipes-support/cli11/cli11_1.9.1.bb | 17 --------
meta-oe/recipes-support/cli11/cli11_2.2.0.bb | 25 +++++++++++
3 files changed, 66 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
delete mode 100644 meta-oe/recipes-support/cli11/cli11_1.9.1.bb
create mode 100644 meta-oe/recipes-support/cli11/cli11_2.2.0.bb

diff --git a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
new file mode 100644
index 0000000000..7e6611b6a8
--- /dev/null
+++ b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
@@ -0,0 +1,41 @@
+From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@...>
+Date: Wed, 7 Sep 2022 10:05:15 +0900
+Subject: [PATCH] Do not download the catch framework during configure.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Wang Mingyu <wangmy@...>
+---
+ tests/CMakeLists.txt | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 80c4f6a..ae210db 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -74,21 +74,6 @@ if(Catch2_FOUND)
+ endif()
+ message(STATUS "Found Catch2")
+ target_link_libraries(catch_main PUBLIC Catch2::Catch2)
+-else()
+- message(STATUS "Downloading Catch2")
+-
+- # FetchContent would be better, but requires newer CMake.
+- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2")
+- set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp)
+- file(
+- DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp"
+- STATUS status
+- EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc)
+- list(GET status 0 error)
+- if(error)
+- message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.")
+- endif()
+- target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
+ endif()
+
+ # Target must already exist
+--
+2.25.1
+
diff --git a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-oe/recipes-support/cli11/cli11_1.9.1.bb
deleted file mode 100644
index 7de3335abd..0000000000
--- a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "C++11 command line parser"
-DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface."
-HOMEPAGE = "https://github.com/CLIUtils/CLI11"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733"
-SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c"
-PV .= "+git${SRCPV}"
-
-SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1;protocol=https"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-inherit ptest
-
-# cli11 is a header only C++ library, so the main package will be empty.
-RDEPENDS:${PN}-dev = ""
diff --git a/meta-oe/recipes-support/cli11/cli11_2.2.0.bb b/meta-oe/recipes-support/cli11/cli11_2.2.0.bb
new file mode 100644
index 0000000000..53a57489fe
--- /dev/null
+++ b/meta-oe/recipes-support/cli11/cli11_2.2.0.bb
@@ -0,0 +1,25 @@
+SUMMARY = "C++11 command line parser"
+DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface."
+HOMEPAGE = "https://github.com/CLIUtils/CLI11"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ad746b5f49c0fd53c08ca1faff1922c"
+SRCREV = "b9be5b9444772324459989177108a6a65b8b2769"
+PV .= "+git${SRCPV}"
+
+SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \
+ https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \
+ file://0001-Do-not-download-the-catch-framework-during-configure.patch"
+
+SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc"
+S = "${WORKDIR}/git"
+
+do_configure:prepend() {
+ mkdir -p ${S}/tests/catch2
+ cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp
+}
+
+inherit cmake
+inherit ptest
+
+# cli11 is a header only C++ library, so the main package will be empty.
+RDEPENDS:${PN}-dev = ""
--
2.37.3


[meta-oe][PATCH 07/22] sblim-sfcb: Include config.h before using CONFIG_ERROR_H

Khem Raj
 

Fix use before definition case.

Signed-off-by: Khem Raj <raj.khem@...>
---
...d-for-error.h-when-it-does-not-exist.patch | 27 +++++++++----------
1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch
index e723050237..9bb9f44344 100644
--- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch
@@ -16,8 +16,6 @@ Upstream-Status: Pending
trace.c | 4 +++-
5 files changed, 24 insertions(+), 5 deletions(-)

-diff --git a/brokerUpc.c b/brokerUpc.c
-index 17cbd9b..fe2b347 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -20,8 +20,11 @@
@@ -33,8 +31,6 @@ index 17cbd9b..fe2b347 100644
#include "support.h"
#include "native.h"
#include <sfcCommon/utilft.h>
-diff --git a/configure.ac b/configure.ac
-index ab2964e..d4915a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -517,7 +517,7 @@ fi
@@ -46,8 +42,6 @@ index ab2964e..d4915a1 100644
AC_CHECK_HEADERS([cmpi/cmpimacs.h cmpi/cmpift.h cmpi/cmpidt.h],[],[AC_MSG_ERROR([Could not find required CPMI header.])])

# Checks for typedefs, structures, and compiler characteristics.
-diff --git a/httpAdapter.c b/httpAdapter.c
-index 2719e6c..e768972 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -71,7 +71,9 @@
@@ -61,11 +55,15 @@ index 2719e6c..e768972 100644
/* should probably go into cimRequest.h */
#define CIM_PROTOCOL_ANY 0
#define CIM_PROTOCOL_CIM_XML 1
-diff --git a/support.c b/support.c
-index c7bba8b..5b3eef1 100644
--- a/support.c
+++ b/support.c
-@@ -32,7 +32,11 @@
+@@ -27,16 +27,20 @@
+ * @sa native.h
+ */
+
++#include "config.h"
+ #include <stdio.h>
+ #include <dlfcn.h>
#include "support.h"
#include <stdio.h>
#include <stdlib.h>
@@ -77,7 +75,11 @@ index c7bba8b..5b3eef1 100644
#include <errno.h>
#include "native.h"
#include "trace.h"
-@@ -331,17 +335,25 @@ loadQualifierDeclMI(const char *provider,
+-#include "config.h"
+ #include "control.h"
+ #include <pthread.h>
+
+@@ -331,17 +335,25 @@ loadQualifierDeclMI(const char *provider
_SFCB_RETURN(NULL);
};

@@ -104,8 +106,6 @@ index c7bba8b..5b3eef1 100644
/**
* flag to ensure MM is initialized only once
*/
-diff --git a/trace.c b/trace.c
-index d7f30db..438af46 100644
--- a/trace.c
+++ b/trace.c
@@ -279,7 +279,9 @@ _sfcb_trap(int tn)
@@ -119,6 +119,3 @@ index d7f30db..438af46 100644
sigHandler *
setSignal(int sn, sigHandler * sh, int flags)
{
---
-2.14.1
-
--
2.37.3


[meta-networking][PATCH 06/22] tftp-hpa: Fix includes for bsd_signal()

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
...-Remove-double-inclusion-of-signal.h.patch | 39 +++++++++++++++++++
.../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch

diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch
new file mode 100644
index 0000000000..84658d667b
--- /dev/null
+++ b/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Remove-double-inclusion-of-signal.h.patch
@@ -0,0 +1,39 @@
+From e9ed48d91642d384ce07cbb9bec788f07fc6354c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Tue, 6 Sep 2022 14:51:42 -0700
+Subject: [PATCH] tftp: Remove double inclusion of signal.h
+
+Undefine __USE_XOPEN2K8 so we can get bsd_signal definition from system
+headers
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ config.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/config.h b/config.h
+index 3ff2915..ae1a14b 100644
+--- a/config.h
++++ b/config.h
+@@ -93,7 +93,6 @@
+ #endif
+
+ #include <errno.h>
+-#include <signal.h>
+
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+@@ -296,6 +295,9 @@ char *xstrdup(const char *);
+
+ #ifndef HAVE_BSD_SIGNAL
+ void (*bsd_signal(int, void (*)(int))) (int);
++#else
++#undef __USE_XOPEN2K8
++#include <signal.h>
+ #endif
+ #ifndef HAVE_DUP2
+ int dup2(int, int);
+--
+2.37.3
+
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index af42bda93c..565f493ce2 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t
file://fix-writing-emtpy-file.patch \
file://0001-__progname-is-provided-by-libc.patch \
file://0001-tftp-Mark-toplevel-definition-as-external.patch \
+ file://0001-tftp-Remove-double-inclusion-of-signal.h.patch \
file://tftpd-hpa.socket \
file://tftpd-hpa.service \
"
--
2.37.3


[meta-oe][PATCH 05/22] libsmi: Define _DEFAULT_SOURCE for timegm API

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
...1-parser-yang-Define-_DEFAULT_SOURCE.patch | 28 +++++++++++++++++++
.../recipes-support/libsmi/libsmi_0.5.0.bb | 1 +
2 files changed, 29 insertions(+)
create mode 100644 meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch

diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch
new file mode 100644
index 0000000000..9354a889a0
--- /dev/null
+++ b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch
@@ -0,0 +1,28 @@
+From 86b706f694b822d8028fd36320147767056d2ffa Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Tue, 6 Sep 2022 12:09:00 -0700
+Subject: [PATCH] parser-yang: Define _DEFAULT_SOURCE
+
+This is needed for timegm API
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ lib/parser-yang.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/parser-yang.y b/lib/parser-yang.y
+index b111607..0ded9d2 100644
+--- a/lib/parser-yang.y
++++ b/lib/parser-yang.y
+@@ -21,6 +21,7 @@
+ #ifdef BACKEND_YANG
+
+ #define _ISOC99_SOURCE
++#define _DEFAULT_SOURCE
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
+--
+2.37.3
+
diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
index 53c59de78a..33e1b6fabd 100644
--- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
+++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
@@ -8,6 +8,7 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \
file://smi.conf \
file://libsmi-fix-the-test-dump-files.patch \
file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \
+ file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \
"

SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11"
--
2.37.3


[meta-oe][PATCH 04/22] lcdproc: Fix build on non-x86 and arm architectures

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
.../0001-Fix-compilation-with-GCC-10.x.patch | 7 -----
.../0003-Fix-non-x86-platforms-on-musl.patch | 28 ++++++++++++++-----
2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch
index 35634dd9ba..cd8a69c3fb 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch
+++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch
@@ -16,8 +16,6 @@ Signed-off-by: Harald Geyer <harald@...>
clients/lcdproc/iface.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)

-diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
-index 40e50cb7..1ac355bd 100644
--- a/clients/lcdproc/iface.c
+++ b/clients/lcdproc/iface.c
@@ -32,6 +32,7 @@
@@ -28,8 +26,6 @@ index 40e50cb7..1ac355bd 100644

static int iface_count = 0; /* number of interfaces */
static char unit_label[10] = "B"; /* default unit label is Bytes */
-diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
-index cc6dbaaf..c1bd6b5b 100644
--- a/clients/lcdproc/iface.h
+++ b/clients/lcdproc/iface.h
@@ -18,7 +18,7 @@
@@ -41,6 +37,3 @@ index cc6dbaaf..c1bd6b5b 100644

/** Update screen content */
int iface_screen(int rep, int display, int *flags_ptr);
---
-2.28.0
-
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
index e39e9bda14..eed9ceee5e 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
+++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
@@ -17,19 +17,33 @@ Signed-off-by: Khem Raj <raj.khem@...>
server/drivers/port.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/server/drivers/port.h b/server/drivers/port.h
-index c584cd4e..bde235b3 100644
--- a/server/drivers/port.h
+++ b/server/drivers/port.h
-@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count);
+@@ -94,7 +94,7 @@ static inline int port_deny_multiple(uns
/* ---------------------------- Linux ------------------------------------ */
/* Use ioperm, inb and outb in <sys/io.h> (Linux) */
/* And iopl for higher addresses of PCI LPT cards */
-#if defined HAVE_IOPERM
-+#if defined(__GLIBC__) || (defined(__x86__) || defined(__x86_64__))
++#if HAVE_INB

/* Glibc2 and Glibc1 */
# ifdef HAVE_SYS_IO_H
---
-2.24.1
-
+@@ -333,7 +333,7 @@ static inline int port_deny_multiple (un
+ return i386_set_ioperm(port, count, 0);
+ }
+
+-#else
++#elif defined(__x86__) && defined(__x86_64__)
+
+ /* ------------------------- Everything else ----------------------------- */
+ /* Last chance! Use /dev/io and i386 ASM code (BSD4.3 ?) */
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,6 +144,7 @@ AC_CHECK_LIB(i386, i386_get_ioperm,
+ [])]
+ )
+
++AC_CHECK_FUNCS(inb)
+ AC_CHECK_FUNCS(iopl)
+ AC_CHECK_FUNCS(ioperm)
+ AC_CHECK_HEADERS(sys/io.h)
--
2.37.3


[meta-oe][PATCH 03/22] jq: Upgrade to latest and fix configure tests

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
...XOPEN_SOURCE-when-checking-for-strpt.patch | 40 +++++++++++++++++++
...ace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch | 30 ++++++++++++++
meta-oe/recipes-devtools/jq/jq_git.bb | 7 +++-
3 files changed, 75 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch
create mode 100644 meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch

diff --git a/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch b/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch
new file mode 100644
index 0000000000..e4d6ebb45b
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch
@@ -0,0 +1,40 @@
+From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Tue, 6 Sep 2022 09:59:31 -0700
+Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime
+
+Include sys/time.h for gettimeofday since thats where its in glibc
+
+Upstream-Status: Submitted [https://github.com/stedolan/jq/pull/2480]
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a2cd99e..95afe06 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA
+
+ AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
+ AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0])
++OLD_CFLAGS=$CFLAGS
++CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
+ AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0])
++CFLAGS=$OLD_CFLAGS
+ AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0])
+ AC_FIND_FUNC([setenv], [c], [#include <stdlib.h>], [0, 0, 0])
+ AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0])
+@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0])
+ AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0])
+ AC_FIND_FUNC([localtime_r], [c], [#include <time.h>], [0, 0])
+ AC_FIND_FUNC([localtime], [c], [#include <time.h>], [0])
+-AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0])
++AC_FIND_FUNC([gettimeofday], [c], [#include <sys/time.h>], [0, 0])
+ AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])],
+ [], [[#include <time.h>]])
+ AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])],
+--
+2.37.3
+
diff --git a/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch
new file mode 100644
index 0000000000..d2f999a728
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch
@@ -0,0 +1,30 @@
+From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Tue, 6 Sep 2022 10:00:59 -0700
+Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE
+
+newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE
+
+Fixes
+/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings]
+warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+
+Uptream-Status: Submitted [https://github.com/stedolan/jq/pull/2480]
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ src/builtin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/builtin.c b/src/builtin.c
+index 1c6b08c..2a31496 100644
+--- a/src/builtin.c
++++ b/src/builtin.c
+@@ -1,4 +1,4 @@
+-#define _BSD_SOURCE
++#define _DEFAULT_SOURCE
+ #define _GNU_SOURCE
+ #ifndef __sun__
+ # define _XOPEN_SOURCE
+--
+2.37.3
+
diff --git a/meta-oe/recipes-devtools/jq/jq_git.bb b/meta-oe/recipes-devtools/jq/jq_git.bb
index 8b0218c83e..f69b435e51 100644
--- a/meta-oe/recipes-devtools/jq/jq_git.bb
+++ b/meta-oe/recipes-devtools/jq/jq_git.bb
@@ -9,8 +9,11 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=2814b59e00e7918c864fa3b6bbe049b4"

PV = "1.6+git${SRCPV}"
-SRC_URI = "git://github.com/stedolan/jq;protocol=https;branch=master"
-SRCREV = "a9f97e9e61a910a374a5d768244e8ad63f407d3e"
+SRC_URI = "git://github.com/stedolan/jq;protocol=https;branch=master \
+ file://0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch \
+ file://0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch \
+ "
+SRCREV = "cff5336ec71b6fee396a95bb0e4bea365e0cd1e8"
S = "${WORKDIR}/git"

inherit autotools-brokensep
--
2.37.3


[meta-oe][PATCH 02/22] libimobiledevice: Explicitly pass -D_GNU_SOURCE via cflags

Khem Raj
 

musl will need this defines for funcitons like asprintf

Signed-off-by: Khem Raj <raj.khem@...>
---
.../libimobiledevice/libimobiledevice_git.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
index 3dfd4e90fe..52176872cf 100644
--- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
+++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb
@@ -17,3 +17,5 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig

EXTRA_OECONF = " --without-cython "
+
+CFLAGS += "-D_GNU_SOURCE"
--
2.37.3


[meta-oe][PATCH 01/22] openldap: Fix configure check for pthread_detach

Khem Raj
 

Signed-off-by: Khem Raj <raj.khem@...>
---
...ure-Pass-pthread_t-to-pthread_detach.patch | 32 +++++++++++++++++++
.../openldap/openldap_2.5.12.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch

diff --git a/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch b/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch
new file mode 100644
index 0000000000..6e73f8b382
--- /dev/null
+++ b/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch
@@ -0,0 +1,32 @@
+From 7577b120acda087bf3f5f613c2c72663b3864ad8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@...>
+Date: Sun, 4 Sep 2022 09:43:06 -0700
+Subject: [PATCH] configure: Pass pthread_t to pthread_detach
+
+This helps compilers when using C2X standard
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@...>
+---
+ configure.ac | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0978eeb..58d15f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1467,10 +1467,7 @@ pthread_rwlock_t rwlock;
+ dnl save the flags
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <pthread.h>
+-#ifndef NULL
+-#define NULL (void*)0
+-#endif
+-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
++]], [[pthread_detach((pthread_t)-1);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
+ ])
+
+ if test $ol_cv_func_pthread_detach = no ; then
+--
+2.37.3
+
diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
index c01db08e46..a8ea84d70f 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
@@ -22,6 +22,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://0001-build-top.mk-unset-STRIP_OPTS.patch \
file://0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch \
file://0001-librewrite-include-ldap_pvt_thread.h-before-redefini.patch \
+ file://0001-configure-Pass-pthread_t-to-pthread_detach.patch \
"

SRC_URI[sha256sum] = "d5086cbfc49597fa7d0670a429a9054552d441b16ee8b2435412797ab0e37b96"
--
2.37.3


[meta-java][dunfell][PATCH ] cacao-initial-native: exclude BB_NUMBER_THREADS from sstate hash

Virendra Thakur
 

From: Virendra Thakur <virendrak@...>

The sstate-cache for cacao-initial-native is not shareable across
multiple machines because the parallelisation configuration of Bitbake
is being embedded into the sstate hash of cacao-initial-native.

Exclude BB_NUMBER_THREADS from the do_install sstate hashing to avoid
this issue.

Commit message adapted from a5257d41f32812bc9426183cc8d2b6f07617b0d5.

Signed-off-by: Virendra Thakur <virendrak@...>
---
recipes-core/cacao/cacao-initial-native_0.98.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb
index 8432456..1bf822d 100644
--- a/recipes-core/cacao/cacao-initial-native_0.98.bb
+++ b/recipes-core/cacao/cacao-initial-native_0.98.bb
@@ -40,5 +40,7 @@ do_configure:append() {
sed -i -e "s|exec cacao \\$|exec cacao-initial \\$|" src/scripts/java.in
}

+do_compile[vardepsexclude] += "BB_NUMBER_THREADS"
+
SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346"
SRC_URI[sha256sum] = "cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188"
--
2.17.1

This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.


[meta-java][dunfell][PATCH ] classpath-initial-native: exclude BB_NUMBER_THREADS from sstate hash

Virendra Thakur
 

From: Virendra Thakur <virendrak@...>

The sstate-cache for classpath-initial-native is not shareable across
multiple machines because the parallelisation configuration of Bitbake
is being embedded into the sstate hash of classpath-initial-native.

Exclude BB_NUMBER_THREADS from the do_install sstate hashing to avoid
this issue.

Commit message adapted from a5257d41f32812bc9426183cc8d2b6f07617b0d5.

Signed-off-by: Virendra Thakur <virendrak@...>
---
recipes-core/classpath/classpath-initial-native_0.93.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/recipes-core/classpath/classpath-initial-native_0.93.bb b/recipes-core/classpath/classpath-initial-native_0.93.bb
index 7bb1ca1..0f97bea 100644
--- a/recipes-core/classpath/classpath-initial-native_0.93.bb
+++ b/recipes-core/classpath/classpath-initial-native_0.93.bb
@@ -28,6 +28,8 @@ EXTRA_OECONF += "\
# Ensure tools.zip is not installed at same path as classpath-native
EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial"

+do_compile[vardepsexclude] += "BB_NUMBER_THREADS"
+
do_install:append() {
# remove files clashing with classpath-native in sysroot
rm \
--
2.17.1

This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.


[meta-python] [PATCH] python3-imageio: upgrade 2.21.1 -> 2.21.2

wangmy
 

Changelog:
===========
Fix
------
Allow v3.imread to read dicom (#868) (22c98c2)
Revert to asanyarray (#863) (fdaba04)

Other
--------
Add missing numpy import in example (#866) (d85bfba)

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../{python3-imageio_2.21.1.bb => python3-imageio_2.21.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-imageio_2.21.1.bb => python3-imageio_2.21.2.bb} (81%)

diff --git a/meta-python/recipes-devtools/python/python3-imageio_2.21.1.bb b/meta-python/recipes-devtools/python/python3-imageio_2.21.2.bb
similarity index 81%
rename from meta-python/recipes-devtools/python/python3-imageio_2.21.1.bb
rename to meta-python/recipes-devtools/python/python3-imageio_2.21.2.bb
index 5c792a5db8..06af2a15f0 100644
--- a/meta-python/recipes-devtools/python/python3-imageio_2.21.1.bb
+++ b/meta-python/recipes-devtools/python/python3-imageio_2.21.2.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba"

-SRC_URI[sha256sum] = "5f0278217c1cf99d90ef855dab948f93d9fce0ab7ab388e13a597c706b7ec4e5"
+SRC_URI[sha256sum] = "5702e7b4874bdb2f428b08c7491699b44842129d412cdaa7177ba7ff059deb2c"

inherit pypi setuptools3

--
2.25.1


[meta-python] [PATCH] python3-grpcio: upgrade 1.48.0 -> 1.48.1

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../{python3-grpcio_1.48.0.bb => python3-grpcio_1.48.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-grpcio_1.48.0.bb => python3-grpcio_1.48.1.bb} (93%)

diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.48.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.48.1.bb
similarity index 93%
rename from meta-python/recipes-devtools/python/python3-grpcio_1.48.0.bb
rename to meta-python/recipes-devtools/python/python3-grpcio_1.48.1.bb
index a16b88093a..b2ca35154e 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.48.0.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.48.1.bb
@@ -12,7 +12,7 @@ SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \
file://mips_bigendian.patch \
file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \
"
-SRC_URI[sha256sum] = "eaf4bb73819863440727195411ab3b5c304f6663625e66f348e91ebe0a039306"
+SRC_URI[sha256sum] = "660217eccd2943bf23ea9a36e2a292024305aec04bf747fbcff1f5032b83610e"

RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \
${PYTHON_PN}-setuptools \
--
2.25.1


[meta-python] [PATCH] python3-grpcio-tools: upgrade 1.48.0 -> 1.48.1

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
...n3-grpcio-tools_1.48.0.bb => python3-grpcio-tools_1.48.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.48.0.bb => python3-grpcio-tools_1.48.1.bb} (82%)

diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.0.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.1.bb
similarity index 82%
rename from meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.0.bb
rename to meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.1.bb
index fcd2840701..d295429ae3 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.0.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.1.bb
@@ -10,7 +10,7 @@ inherit pypi setuptools3
DEPENDS += "${PYTHON_PN}-grpcio"

SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch"
-SRC_URI[sha256sum] = "dd7f757608e7dfae4ab2e7fc1e8951e6eb9526ebdc7ce90597329bc4c408c9a1"
+SRC_URI[sha256sum] = "1178f2ea531f80cc2027ec64728df6ffc8e98cf1df61652a496eafd612127183"

RDEPENDS:${PN} = "${PYTHON_PN}-grpcio"

--
2.25.1


[meta-python] [PATCH] python3-google-api-python-client: upgrade 2.57.0 -> 2.58.0

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
...ent_2.57.0.bb => python3-google-api-python-client_2.58.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-google-api-python-client_2.57.0.bb => python3-google-api-python-client_2.58.0.bb} (86%)

diff --git a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.57.0.bb b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.58.0.bb
similarity index 86%
rename from meta-python/recipes-devtools/python/python3-google-api-python-client_2.57.0.bb
rename to meta-python/recipes-devtools/python/python3-google-api-python-client_2.58.0.bb
index fdbad826bd..e473c7b82f 100644
--- a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.57.0.bb
+++ b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.58.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"

-SRC_URI[sha256sum] = "ec4412545b0c5978a833bb03993a46121ad2c700f32af0cba23f8439b3f5fb02"
+SRC_URI[sha256sum] = "3af6a181763a8cb18f2b9d973760ba32e4fe2af09e4ce06626ff6a53777c33fa"

inherit pypi setuptools3

--
2.25.1


[meta-python] [PATCH] python3-google-api-core: upgrade 2.8.2 -> 2.10.0

wangmy
 

Changelog:
============
Features
--------
Add 'strict' to flatten_query_params to lower-case bools (#433) (83678e9)
Make grpc transcode logic work in terms of protobuf python objects (#428) (c3ad8ea)

Bug Fixes
---------
Require python 3.7+ (#410) (7ddb8c0)
Restore support for grpcio-gcp (#418) (8c19609)

Signed-off-by: Wang Mingyu <wangmy@...>
---
...ogle-api-core_2.8.2.bb => python3-google-api-core_2.10.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-google-api-core_2.8.2.bb => python3-google-api-core_2.10.0.bb} (87%)

diff --git a/meta-python/recipes-devtools/python/python3-google-api-core_2.8.2.bb b/meta-python/recipes-devtools/python/python3-google-api-core_2.10.0.bb
similarity index 87%
rename from meta-python/recipes-devtools/python/python3-google-api-core_2.8.2.bb
rename to meta-python/recipes-devtools/python/python3-google-api-core_2.10.0.bb
index a2df7fb48a..470bc7fc50 100644
--- a/meta-python/recipes-devtools/python/python3-google-api-core_2.8.2.bb
+++ b/meta-python/recipes-devtools/python/python3-google-api-core_2.10.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

inherit pypi setuptools3

-SRC_URI[sha256sum] = "06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc"
+SRC_URI[sha256sum] = "1d053734f14591939e7764e99c31253fed46bf2578da0dcd82821f17a6dd991c"

RDEPENDS:${PN} += "\
${PYTHON_PN}-asyncio \
--
2.25.1


[meta-python] [PATCH] python3-django: upgrade 3.2.12 -> 4.1

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../python/{python3-django_3.2.12.bb => python3-django_4.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-django_3.2.12.bb => python3-django_4.1.bb} (58%)

diff --git a/meta-python/recipes-devtools/python/python3-django_3.2.12.bb b/meta-python/recipes-devtools/python/python3-django_4.1.bb
similarity index 58%
rename from meta-python/recipes-devtools/python/python3-django_3.2.12.bb
rename to meta-python/recipes-devtools/python/python3-django_4.1.bb
index 17d402d652..44ea5394da 100644
--- a/meta-python/recipes-devtools/python/python3-django_3.2.12.bb
+++ b/meta-python/recipes-devtools/python/python3-django_4.1.bb
@@ -1,7 +1,7 @@
require python-django.inc
inherit setuptools3

-SRC_URI[sha256sum] = "9772e6935703e59e993960832d66a614cf0233a1c5123bc6224ecc6ad69e41e2"
+SRC_URI[sha256sum] = "032f8a6fc7cf05ccd1214e4a2e21dfcd6a23b9d575c6573cacc8c67828dbe642"

RDEPENDS:${PN} += "\
${PYTHON_PN}-sqlparse \
--
2.25.1


[meta-python] [PATCH] python3-colorlog: upgrade 6.6.0 -> 6.7.0

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../{python3-colorlog_6.6.0.bb => python3-colorlog_6.7.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-colorlog_6.6.0.bb => python3-colorlog_6.7.0.bb} (75%)

diff --git a/meta-python/recipes-devtools/python/python3-colorlog_6.6.0.bb b/meta-python/recipes-devtools/python/python3-colorlog_6.7.0.bb
similarity index 75%
rename from meta-python/recipes-devtools/python/python3-colorlog_6.6.0.bb
rename to meta-python/recipes-devtools/python/python3-colorlog_6.7.0.bb
index 2f8a0e5ca8..84b67e784a 100644
--- a/meta-python/recipes-devtools/python/python3-colorlog_6.6.0.bb
+++ b/meta-python/recipes-devtools/python/python3-colorlog_6.7.0.bb
@@ -7,4 +7,4 @@ inherit pypi setuptools3

PYPI_PACKAGE = "colorlog"

-SRC_URI[sha256sum] = "344f73204009e4c83c5b6beb00b3c45dc70fcdae3c80db919e0a4171d006fde8"
+SRC_URI[sha256sum] = "bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5"
--
2.25.1


[meta-python] [PATCH] python3-astroid: upgrade 2.12.4 -> 2.12.5

wangmy
 

Changelog:
==========
* Prevent first-party imports from being resolved to 'site-packages'.
* Fix "astroid.interpreter._import.util.is_namespace()" incorrectly
returning "True" for frozen stdlib modules on PyPy.

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../{python3-astroid_2.12.4.bb => python3-astroid_2.12.5.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-astroid_2.12.4.bb => python3-astroid_2.12.5.bb} (89%)

diff --git a/meta-python/recipes-devtools/python/python3-astroid_2.12.4.bb b/meta-python/recipes-devtools/python/python3-astroid_2.12.5.bb
similarity index 89%
rename from meta-python/recipes-devtools/python/python3-astroid_2.12.4.bb
rename to meta-python/recipes-devtools/python/python3-astroid_2.12.5.bb
index 784818c027..af2f51858c 100644
--- a/meta-python/recipes-devtools/python/python3-astroid_2.12.4.bb
+++ b/meta-python/recipes-devtools/python/python3-astroid_2.12.5.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1"

-SRC_URI[sha256sum] = "39fa822c82dc112f5072a208ddf01c58184043aa90e3e469786fa0520c71aaa7"
+SRC_URI[sha256sum] = "396c88d0a58d7f8daadf730b2ce90838bf338c6752558db719ec6f99c18ec20e"

inherit pypi setuptools3

--
2.25.1


[meta-oe] [PATCH] libforms: upgrade 1.2.3 -> 1.2.4

wangmy
 

0001-Make-extern-declarations-in-header-file.patch
refreshed for new version.

0001-Modify-include-dir.patch
added to modify the dir of nonexist file.

Signed-off-by: Wang Mingyu <wangmy@...>
---
...e-extern-declarations-in-header-file.patch | 17 +---------
.../files/0001-Modify-include-dir.patch | 33 +++++++++++++++++++
.../{libforms_1.2.3.bb => libforms_1.2.4.bb} | 5 ++-
3 files changed, 36 insertions(+), 19 deletions(-)
create mode 100644 meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch
rename meta-oe/recipes-graphics/libforms/{libforms_1.2.3.bb => libforms_1.2.4.bb} (83%)

diff --git a/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch b/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch
index 619bad6d02..16689f64b9 100644
--- a/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch
+++ b/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch
@@ -10,8 +10,7 @@ Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@...>
---
fdesign/sp_spinner.c | 2 +-
- lib/flinternal.h | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c
index 04f2c19..6206daa 100644
@@ -26,20 +25,6 @@ index 04f2c19..6206daa 100644


/***************************************
-diff --git a/lib/flinternal.h b/lib/flinternal.h
-index 06d847e..577bd10 100644
---- a/lib/flinternal.h
-+++ b/lib/flinternal.h
-@@ -138,8 +138,8 @@ enum {
-
- /* events.c or event related */
-
--FL_OBJECT * fli_handled_obj;
--FL_OBJECT * fli_handled_parent;
-+extern FL_OBJECT * fli_handled_obj;
-+extern FL_OBJECT * fli_handled_parent;
-
- void fli_obj_queue_delete( void );

--
2.28.0
diff --git a/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch b/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch
new file mode 100644
index 0000000000..0b7c063804
--- /dev/null
+++ b/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch
@@ -0,0 +1,33 @@
+From d2d05928342f7f9f687ffea5e0b77f97f0ae5aad Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@...>
+Date: Wed, 7 Sep 2022 14:29:13 +0900
+Subject: [PATCH] Modify include dir
+
+error messagge:
+../../xforms-1.2.4/lib/fd/cmdbr.h:28:10: fatal error: ../include/forms.h: No such file or directory
+
+../include/forms.h specified in the header file cmdbr.h is not exist.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wang Mingyu <wangmy@...>
+---
+ lib/fd/cmdbr.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/fd/cmdbr.h b/lib/fd/cmdbr.h
+index 8495e05..2ddeced 100644
+--- a/lib/fd/cmdbr.h
++++ b/lib/fd/cmdbr.h
+@@ -25,7 +25,7 @@
+ #ifndef FD_cmd_h_
+ #define FD_cmd_h_
+
+-#include "../include/forms.h"
++#include "include/forms.h"
+
+ /* Callbacks, globals and object handlers */
+
+--
+2.25.1
+
diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb
similarity index 83%
rename from meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb
rename to meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb
index 838c1d5173..01db3c4d3d 100644
--- a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb
+++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb
@@ -1,6 +1,5 @@
DESCRIPTION = "The XForms graphical interface widget library "
HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/"
-PR = "r0"

LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86"
@@ -10,10 +9,10 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar.
file://add-absolute-path-for-include-dir.patch \
file://fix-path-fdesign_LDADD.patch \
file://0001-Make-extern-declarations-in-header-file.patch \
+ file://0001-Modify-include-dir.patch \
"

-SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b"
-SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61"
+SRC_URI[sha256sum] = "78cc6b07071bbeaa1f906e0a22d5e9980e48f8913577bc082d661afe5cb75696"

inherit autotools features_check

--
2.25.1


[meta-oe] [PATCH v2] cli11: upgrade 1.9.1 -> 2.2.0

wangmy
 

License-Update: Copyright year updated to 2022.

0001-Do-not-download-the-catch-framework-during-configure.patch
added to download the catch framework before configure.

Signed-off-by: Wang Mingyu <wangmy@...>
---
...the-catch-framework-during-configure.patch | 41 +++++++++++++++++++
meta-oe/recipes-support/cli11/cli11_1.9.1.bb | 17 --------
meta-oe/recipes-support/cli11/cli11_2.2.0.bb | 25 +++++++++++
3 files changed, 66 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
delete mode 100644 meta-oe/recipes-support/cli11/cli11_1.9.1.bb
create mode 100644 meta-oe/recipes-support/cli11/cli11_2.2.0.bb

diff --git a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
new file mode 100644
index 0000000000..7e6611b6a8
--- /dev/null
+++ b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch
@@ -0,0 +1,41 @@
+From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@...>
+Date: Wed, 7 Sep 2022 10:05:15 +0900
+Subject: [PATCH] Do not download the catch framework during configure.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Wang Mingyu <wangmy@...>
+---
+ tests/CMakeLists.txt | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 80c4f6a..ae210db 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -74,21 +74,6 @@ if(Catch2_FOUND)
+ endif()
+ message(STATUS "Found Catch2")
+ target_link_libraries(catch_main PUBLIC Catch2::Catch2)
+-else()
+- message(STATUS "Downloading Catch2")
+-
+- # FetchContent would be better, but requires newer CMake.
+- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2")
+- set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp)
+- file(
+- DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp"
+- STATUS status
+- EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc)
+- list(GET status 0 error)
+- if(error)
+- message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.")
+- endif()
+- target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
+ endif()
+
+ # Target must already exist
+--
+2.25.1
+
diff --git a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-oe/recipes-support/cli11/cli11_1.9.1.bb
deleted file mode 100644
index 7de3335abd..0000000000
--- a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "C++11 command line parser"
-DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface."
-HOMEPAGE = "https://github.com/CLIUtils/CLI11"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733"
-SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c"
-PV .= "+git${SRCPV}"
-
-SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1;protocol=https"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-inherit ptest
-
-# cli11 is a header only C++ library, so the main package will be empty.
-RDEPENDS:${PN}-dev = ""
diff --git a/meta-oe/recipes-support/cli11/cli11_2.2.0.bb b/meta-oe/recipes-support/cli11/cli11_2.2.0.bb
new file mode 100644
index 0000000000..53a57489fe
--- /dev/null
+++ b/meta-oe/recipes-support/cli11/cli11_2.2.0.bb
@@ -0,0 +1,25 @@
+SUMMARY = "C++11 command line parser"
+DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface."
+HOMEPAGE = "https://github.com/CLIUtils/CLI11"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ad746b5f49c0fd53c08ca1faff1922c"
+SRCREV = "b9be5b9444772324459989177108a6a65b8b2769"
+PV .= "+git${SRCPV}"
+
+SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \
+ https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \
+ file://0001-Do-not-download-the-catch-framework-during-configure.patch"
+
+SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc"
+S = "${WORKDIR}/git"
+
+do_configure:prepend() {
+ mkdir -p ${S}/tests/catch2
+ cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp
+}
+
+inherit cmake
+inherit ptest
+
+# cli11 is a header only C++ library, so the main package will be empty.
+RDEPENDS:${PN}-dev = ""
--
2.25.1