libmodplug: Fix build with c++17
PATCH 1/30 libmodplug: Fix build with c++17
--- ...-Drop-register-storage-class-keyword.patch | 38 +++++++++++++++++++ .../libmodplug/libmodplug_0.8.9.0.bb | 5 ++- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch
meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 7a25d5def379db387de9237f0b03605b3ae277b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 17 Jan 2023 11:32:59 -0800 +Subject: [PATCH] fastmix: Drop 'register' storage class keyword + +It has been dropped from laters C/C++ standards ( c++17 and newer ) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + src/fastmix.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/fastmix.cpp b/src/fastmix.cpp +index d693d20..aa51c4a 100644 +--- a/src/fastmix.cpp ++++ b/src/fastmix.cpp +@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir; + // MIXING MACROS + // ---------------------------------------------------------------------------- + #define SNDMIX_BEGINSAMPLELOOP8\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir; + do { + + #define SNDMIX_BEGINSAMPLELOOP16\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +-- +2.39.0 +
meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb +3 -2
@@ -4,8 +4,9 @@ HOMEPAGE = "http://modplug-xmms.sf.net" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" -SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" -SRC_URI[md5sum] = "5ba16981e6515975e9a68a58d5ba69d1" +SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz \ + file://0001-fastmix-Drop-register-storage-class-keyword.patch" + SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" inherit autotools pkgconfig
Signature · 1 line
2.39.1
PATCH 2/30 xmlrpc-c: Upgrade to 1.54.06
Drop upstream applied patch see [1]
[1] https://github.com/mirror/xmlrpc-c/commit/148e64a5bb5588a89840ee498430332456c216f3
---
...rc-Makefile-Fix-Makefile-macro-error.patch | 29 -------------------
...mlrpc-c_1.54.02.bb => xmlrpc-c_1.54.06.bb} | 6 ++--
2 files changed, 2 insertions(+), 33 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch
rename meta-oe/recipes-devtools/xmlrpc-c/{xmlrpc-c_1.54.02.bb => xmlrpc-c_1.54.06.bb} (91%)meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0003-src-Makefile-Fix-Makefile-macro-error.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From ea4ca50ca9cab755f3722096158a46deec0e663a Mon Sep 17 00:00:00 2001 -From: Arthur She <[email protected]> -Date: Tue, 25 Aug 2020 09:51:26 -0700 -Subject: [PATCH] src/Makefile: Fix Makefile macro error - -This error caused the curl library wouldn't be linked correctly. - -Upstream-Status: Pending -Signed-off-by: Arthur She <[email protected]> ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 1cdf8b0..acd04dd 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -57,7 +57,7 @@ ifeq ($(MUST_BUILD_CURL_CLIENT),yes) - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti -- TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs) -+ TRANSPORT_LIBDEP += $(shell $(CURL_CONFIG) --libs) - TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport - endif - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) --- -2.17.1 -
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.06.bb renamed from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb +2 -4
@@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ file://0002-fix-formatting-issues.patch \ - file://0003-src-Makefile-Fix-Makefile-macro-error.patch \ " - -#Release 1.54.02 -SRCREV = "86405c7e1bd4f70287204a28d242a1054daab520" +#Release 1.54.06 +SRCREV = "00870af80021aa0a66cc72c9aeb00587cbfde560" S = "${WORKDIR}/git/stable"
Signature · 1 line
2.39.1
PATCH 3/30 satyr: Fix build with musl
In reply to Khem RajAdd missing typedefs for __compar_fn_t and compare_fn_t for non __GLIBC__ case.
--- ...mpile-failure-against-musl-C-library.patch | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-)
meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch +11 -13
@@ -10,19 +10,17 @@ Signed-off-by: Hongxu Jia <[email protected]> lib/rpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/rpm.c b/lib/rpm.c -index 920e145..58140bf 100644 --- a/lib/rpm.c +++ b/lib/rpm.c -@@ -191,7 +191,7 @@ sr_rpm_package_sort(struct sr_rpm_package *packages) - } +@@ -34,6 +34,11 @@ + #include <assert.h> + #include <string.h> - /* Sort the array. */ -- qsort(array, count, sizeof(struct sr_rpm_package*), (comparison_fn_t)cmp_nevra_qsort_wrapper); -+ qsort(array, count, sizeof(struct sr_rpm_package*), cmp_nevra_qsort_wrapper); - - /* Create a linked list from the sorted array. */ - for (size_t loop = 0; loop < count; ++loop) --- -2.8.1 - ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + struct sr_rpm_package * + sr_rpm_package_new() + {
Signature · 1 line
2.39.1
PATCH 4/30 p8platform: Fix build with c++17 clang
In reply to Khem Raj--- ...e-resulting-cmake-config-relocatable.patch | 64 ------------------- .../p8platform/p8platform_git.bb | 7 +- 2 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch
meta-oe/recipes-extended/p8platform/files/0001-Make-resulting-cmake-config-relocatable.patch deleted +0 -64
@@ -1,64 +0,0 @@ -From 2650bb3bd3644784359be373252b0436873ca8cb Mon Sep 17 00:00:00 2001 -From: Pascal Bach <[email protected]> -Date: Fri, 28 Sep 2018 16:44:37 +0200 -Subject: [PATCH] Make resulting cmake config relocatable - -This change avoids hardcoded install prefix in the p8-platform-config.cmake. -Especially important when doing cross compilation with Yocto for example. - -Upstream-Status: Submitted [https://github.com/Pulse-Eight/platform/pull/38] - ---- - CMakeLists.txt | 4 ---- - p8-platform-config.cmake.in | 13 +++++++++---- - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7144b0b..f2db66e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,10 +22,6 @@ if(WIN32) - src/windows/os-threads.cpp) - endif() - --set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform") --IF(WIN32) -- LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows") --ENDIF(WIN32) - set(p8-platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - - if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") -diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in -index 47f30f1..b08e96c 100644 ---- a/p8-platform-config.cmake.in -+++ b/p8-platform-config.cmake.in -@@ -9,17 +9,22 @@ - # p8-platform_LIBRARY_DIRS - directories in which the libraries are situated - # - # propagate these properties from one build system to the other -+get_filename_component(_p8-platform_rootdir ${CMAKE_CURRENT_LIST_DIR}/../ ABSOLUTE) -+ - set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") --set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) --set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") -+set (p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include" "${_p8-platform_rootdir}/include/p8-platform") -+if(WIN32) -+ list(APPEND p8-platform_INCLUDE_DIRS "${_p8-platform_rootdir}/include/p8-platform/windows") -+endif(WIN32) -+set (p8-platform_LIBRARY_DIRS "${_p8-platform_rootdir}") - set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") - set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated - if(WIN32) -- set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") -+ set (p8-platform_LIBRARY "${_p8-platform_rootdir}/p8-platform.lib") - else(WIN32) -- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") -+ set (p8-platform_LIBRARY "-L${_p8-platform_rootdir} -lp8-platform") - endif(WIN32) - set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") - mark_as_advanced (p8-platform_LIBRARY) --- -2.11.0 -
meta-oe/recipes-extended/p8platform/p8platform_git.bb +3 -4
@@ -4,11 +4,10 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" -PV = "2.1.0.1" +PV = "2.1.0.1+git${SRCPV}" -SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https \ - file://0001-Make-resulting-cmake-config-relocatable.patch" -SRCREV = "2d90f98620e25f47702c9e848380c0d93f29462b" +SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https" +SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2" S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
PATCH 5/30 freerdp: Fix incompatible function pointer type
In reply to Khem Raj--- ...-incompatible-function-pointer-types.patch | 32 +++++++++++++++++++ .../recipes-support/freerdp/freerdp_2.9.0.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch
meta-oe/recipes-support/freerdp/freerdp/0001-Fix-incompatible-function-pointer-types.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 9c785ca0535d9c24e6699ee1243b427c1407acb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 17 Jan 2023 19:31:17 -0800 +Subject: [PATCH] Fix incompatible function pointer types + +clang 16+ is flagging the function pointer prototype mismatches, +therefore fix it. + +Fixes Issue #8487 + +Upstream-Status: Submitted [https://github.com/FreeRDP/FreeRDP/pull/8622] +Signed-off-by: Khem Raj <[email protected]> +--- + client/X11/xf_disp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c +index 32ddb626c..ef0cb93ff 100644 +--- a/client/X11/xf_disp.c ++++ b/client/X11/xf_disp.c +@@ -248,7 +248,7 @@ static void xf_disp_OnTimer(void* context, TimerEventArgs* e) + xf_disp_sendResize(xfDisp); + } + +-static void xf_disp_OnWindowStateChange(void* context, const WindowStateChangeEventArgs* e) ++static void xf_disp_OnWindowStateChange(void* context, WindowStateChangeEventArgs* e) + { + xfContext* xfc; + xfDispContext* xfDisp; +-- +2.39.1 +
meta-oe/recipes-support/freerdp/freerdp_2.9.0.bb +1 -0
@@ -16,6 +16,7 @@ PKGV = "${GITPKGVTAG}" SRCREV = "fa8e1b1c765a4466030ac52240f052c0b440a4d1" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fix-incompatible-function-pointer-types.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
PATCH 6/30 libtorrent: Update to tip of trunk
In reply to Khem RajDrop cross compile patch as we do not need it anymore since we now use --enable-aligned
License-Update: Correctly mark the license as GPL-2.0+
--- ...t-run-code-while-configuring-package.patch | 28 ------------------- .../libtorrent/libtorrent_git.bb | 18 +++++------- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch
meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package for -cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <[email protected]> - -Index: git/scripts/common.m4 -=================================================================== ---- git.orig/scripts/common.m4 -+++ git/scripts/common.m4 -@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <inttypes.h> - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +7 -11
@@ -1,36 +1,32 @@ DESCRIPTION = "libTorrent is a BitTorrent library written in C++ for *nix, \ with a focus on high performance and good code." HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" -SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ - " -SRCREV = "756f70010779927dc0691e1e722ed433d5d295e1" +SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https" +SRCREV = "e60f222241319aaae482789517ad00ae9344bd13" CVE_CHECK_IGNORE += "\ CVE-2009-1760 \ " -PV = "0.13.8" +PV = "0.13.8+git${SRCPV}" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "instrumentation" + +PACKAGECONFIG ??= "instrumentation aligned" PACKAGECONFIG:remove:mipsarch = "instrumentation" PACKAGECONFIG:remove:powerpc = "instrumentation" PACKAGECONFIG:remove:riscv32 = "instrumentation" PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," +PACKAGECONFIG[aligned] = "--enable-aligned,--disable-aligned," inherit autotools pkgconfig EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" - -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -}
Signature · 1 line
2.39.1
PATCH 7/30 gnuchess: Fix build with c++17
In reply to Khem Raj--- ...ve-register-storage-class-classifier.patch | 149 ++++++++++++++++++ .../gnome-chess/gnuchess_6.2.9.bb | 3 +- 2 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch
meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch new file +149 -0
@@ -0,0 +1,149 @@ +From 321eb9b1ca1b230063259dc43be8a2ab2f3bfee9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 17 Jan 2023 22:16:36 -0800 +Subject: [PATCH] Remove 'register' storage class classifier + +This is gone with c++17 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + src/frontend/atak.cc | 4 ++-- + src/frontend/lexpgn.cc | 34 +++++++++++++++++----------------- + src/frontend/util.cc | 2 +- + 3 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/src/frontend/atak.cc b/src/frontend/atak.cc +index ef19d87..640e150 100644 +--- a/src/frontend/atak.cc ++++ b/src/frontend/atak.cc +@@ -37,7 +37,7 @@ short SqAtakd (short sq, short side) + * + **************************************************************************/ + { +- register BitBoard *a, b, *c, d, blocker; ++ BitBoard *a, b, *c, d, blocker; + int t; + + a = board.b[side]; +@@ -89,7 +89,7 @@ BitBoard AttackTo (int sq, int side) + * + ***************************************************************************/ + { +- register BitBoard *a, b, *c, e, blocker; ++ BitBoard *a, b, *c, e, blocker; + int t; + + a = board.b[side]; +diff --git a/src/frontend/lexpgn.cc b/src/frontend/lexpgn.cc +index 475899d..971aa13 100644 +--- a/src/frontend/lexpgn.cc ++++ b/src/frontend/lexpgn.cc +@@ -2431,9 +2431,9 @@ extern int yylex (void); + */ + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + + #line 153 "lexpgn.ll" + +@@ -3118,9 +3118,9 @@ case YY_STATE_EOF(RAV): + */ + static int yy_get_next_buffer (void) + { +- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; +- register char *source = (yytext_ptr); +- register int number_to_move, i; ++ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; ++ char *source = (yytext_ptr); ++ int number_to_move, i; + int ret_val; + + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) +@@ -3252,8 +3252,8 @@ static int yy_get_next_buffer (void) + + static yy_state_type yy_get_previous_state (void) + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + + yy_current_state = (yy_start); + yy_current_state += YY_AT_BOL(); +@@ -3278,8 +3278,8 @@ static int yy_get_next_buffer (void) + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) + { +- register int yy_is_jam; +- register char *yy_cp = (yy_c_buf_p); ++ int yy_is_jam; ++ char *yy_cp = (yy_c_buf_p); + + yy_current_state = yy_nxt[yy_current_state][1]; + yy_is_jam = (yy_current_state <= 0); +@@ -3296,9 +3296,9 @@ static int yy_get_next_buffer (void) + return yy_is_jam ? 0 : yy_current_state; + } + +- static void yyunput (int c, register char * yy_bp ) ++ static void yyunput (int c, char * yy_bp ) + { +- register char *yy_cp; ++ char *yy_cp; + + yy_cp = (yy_c_buf_p); + +@@ -3308,10 +3308,10 @@ static int yy_get_next_buffer (void) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ +- register yy_size_t number_to_move = (yy_n_chars) + 2; +- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ ++ yy_size_t number_to_move = (yy_n_chars) + 2; ++ char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; +- register char *source = ++ char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) +@@ -3925,7 +3925,7 @@ int yylex_destroy (void) + #ifndef yytext_ptr + static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -3934,7 +3934,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + #ifdef YY_NEED_STRLEN + static int yy_flex_strlen (yyconst char * s ) + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + +diff --git a/src/frontend/util.cc b/src/frontend/util.cc +index 5d3efe2..f7f7f1d 100644 +--- a/src/frontend/util.cc ++++ b/src/frontend/util.cc +@@ -75,7 +75,7 @@ void UpdateFriends (void) + * + ***************************************************************************/ + { +- register BitBoard *w, *b; ++ BitBoard *w, *b; + + w = board.b[white]; + b = board.b[black]; +-- +2.39.1 +
meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb +2 -1
@@ -4,7 +4,8 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.gz" +SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.gz \ + file://0001-Remove-register-storage-class-classifier.patch" SRC_URI[sha256sum] = "03f9e844ccdd48d20ee49314174404f8b643d83bb8ce9ec9d2e6a21f1b6fb9f5" S = "${WORKDIR}/chess-${PV}"
Signature · 1 line
2.39.1
PATCH 8/30 ippool: Use unsigned int type for 1-bit integer bitfield
In reply to Khem Raj--- ...-int-type-for-1-bit-integer-bitfield.patch | 42 +++++++++++++++++++ .../recipes-daemons/ippool/ippool_1.3.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch
meta-networking/recipes-daemons/ippool/ippool/0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 4788ce6ec602f6441970e1095572c4ff0e90c7c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 17 Jan 2023 22:33:52 -0800 +Subject: [PATCH] Use unsigned int type for 1-bit integer bitfield + +In C++, signed integers are represented in two's complement. This also applies to signed bitfields. +A signed bitfield composed of one bit can therefore store a value in the range -1 to 0. +Assigning a value of 1 to such a bitfield should produce a warning since it is out of range of representable values. +Therefore fix this case by using unsigned int instead of signed int + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + usl/usl_signal.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/usl/usl_signal.c b/usl/usl_signal.c +index 45ddd94..8c1d4d0 100644 +--- a/usl/usl_signal.c ++++ b/usl/usl_signal.c +@@ -39,12 +39,12 @@ struct usl_notifier { + }; + + typedef struct { +- volatile int sighup:1; +- volatile int sigterm:1; +- volatile int sigchld:1; +- volatile int sigusr1:1; +- volatile int sigusr2:1; +- volatile int running:1; ++ volatile unsigned int sighup:1; ++ volatile unsigned int sigterm:1; ++ volatile unsigned int sigchld:1; ++ volatile unsigned int sigusr1:1; ++ volatile unsigned int sigusr2:1; ++ volatile unsigned int running:1; + sig_atomic_t waiting; + sigjmp_buf sigjmp; + } usl_signal_data_t; +-- +2.39.1 +
meta-networking/recipes-daemons/ippool/ippool_1.3.bb +1 -0
@@ -29,6 +29,7 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://strncpy-truncation.patch \ file://0001-pppd-ippool.c-Fix-type-casting-issues-between-in_add.patch \ file://0002-ippool_rpc_server.c-Add-missing-prototype-for-ippool.patch \ + file://0001-Use-unsigned-int-type-for-1-bit-integer-bitfield.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f"
Signature · 1 line
2.39.1
PATCH 9/30 audiofile: Stick to c++14 std
In reply to Khem RajIt uses std::unary_function which is removed from c++17 onwards, until this is removed/replaced we can not move beyond c++14
--- meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb +2 -0
@@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8c inherit autotools lib_package pkgconfig +CXXFLAGS += "-std=c++14" + DEPENDS = " \ asciidoc-native \ alsa-lib \
Signature · 1 line
2.39.1
PATCH 10/30 ssiapi: Use c++14 standard
In reply to Khem RajIt depends on std::auto_ptr which is gone with c++17 therefore pin to c++14 until auto_ptr is replaced with something else e.g. unique_ptr
--- meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb +2 -0
@@ -29,6 +29,8 @@ S ="${WORKDIR}/${BPN}.${PV}" inherit autotools +CXXFLAGS += "-std=gnu++14" + do_configure:prepend(){ ${S}/autogen.sh }
Signature · 1 line
2.39.1
PATCH 11/30 log4cpp: Keep using std=c++14
In reply to Khem RajIt still needs auto_ptr which is pre c++17
| ../../log4cpp/include/log4cpp/BufferingAppender.hh:21:81: error: no template named 'auto_ptr' in namespace 'std'
--- meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb +2 -0
@@ -19,3 +19,5 @@ EXTRA_OECONF = "\ --enable-html-docs=no \ --enable-latex-docs=no \ " + +CXXFLAGS += "-std=c++14"
Signature · 1 line
2.39.1
PATCH 12/30 gengetopt: Use std=c++14
In reply to Khem RajIt needs std::unary_operator which is gone in c++17, until it is forward ported to work with c++17, pin to c++14
../../gengetopt-2.23/src/gm_utils.h:132:35: error: no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'?
| struct pair_print_f : public std::unary_function<T, void>
| ~~~~~^~~~~~~~~~~~~~
--- meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb +2 -0
@@ -13,4 +13,6 @@ SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab80 inherit autotools texinfo +CXXFLAGS += "-std=c++14" + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.39.1
PATCH 13/30 libmimetic: Pin to using -std=c++14
In reply to Khem RajIt uses unary_function which is removed in c++17
| ../../../git/mimetic/rfc822/header.h:37:21: error: no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'? | public std::unary_function<const Field, bool> | ~~~~~^~~~~~~~~~~~~~
--- meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +1 -1
@@ -19,6 +19,6 @@ UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" -CXXFLAGS += "-Wno-narrowing" +CXXFLAGS += "-Wno-narrowing -std=c++14" inherit autotools
Signature · 1 line
2.39.1
PATCH 14/30 ace: Upgrade to 6.5.19
In reply to Khem Raj---
.../ace/{ace_6.5.12.bb => ace_6.5.19.bb} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta-oe/recipes-connectivity/ace/{ace_6.5.12.bb => ace_6.5.19.bb} (83%)meta-oe/recipes-connectivity/ace/ace_6.5.19.bb renamed from meta-oe/recipes-connectivity/ace/ace_6.5.12.bb +3 -4
@@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" DEPENDS += "openssl gperf-native" -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_12/ACE-${PV}.tar.bz2 \ +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_19/ACE-${PV}.tar.bz2 \ file://ace_config.patch \ file://no_sysctl.patch \ " - -SRC_URI[sha256sum] = "ccd94fa45df1e8bb1c901d02c0a64c1626497e5eeda2f057fcf0a1578dae2148" +SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" COMPATIBLE_HOST:libc-musl = "null"
@@ -23,7 +22,7 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers" inherit pkgconfig CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations" -CXX:append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " +CXX:append = " -std=gnu++14 -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" do_install() {
Signature · 1 line
2.39.1
PATCH 15/30 pipewire-media-session: Use PW_ENABLE_DEPRECATED
In reply to Khem Rajpipewire 0.64 has removed [1] NODE_TARGET which is still used by pipewire-media-session so enable deprecated features for now to get the definition of PW_KEY_NODE_TARGET [2]
[1] https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.64#highlights
[2] https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2952
--- .../pipewire/pipewire-media-session_0.4.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.1.bb +2 -1
@@ -16,7 +16,8 @@ S = "${WORKDIR}/git" SRCREV = "e5d5cf2404786af8bcc40bdb8a2962bef4ec18b6" inherit meson pkgconfig - +# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2952 +CFLAGS += "-DPW_ENABLE_DEPRECATED" FILES:${PN} += " \ ${systemd_user_unitdir}/pipewire-media-session.service \ ${datadir}/pipewire/media-session.d/* \
Signature · 1 line
2.39.1
PATCH 16/30 rtorrent: Update to latest tip of trunk
In reply to Khem RajThis is needed to get it working with latest compilers always --enable-aligned so it does not have to perform runtime test Drop the patch for removing AC_RUN_IFELSE as this macro is no longer excercised in OE builds
Pin to c++14 for now, since std::binary_function is in use which is gone in c++17 ( default with clang 16+ )
License-Update: Use GPL-2.0 or later identifier correctly
--- ...t-run-code-while-configuring-package.patch | 104 ------------------ .../rtorrent/rtorrent_git.bb | 19 ++-- 2 files changed, 8 insertions(+), 115 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch
meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch deleted +0 -104
@@ -1,104 +0,0 @@ -Using AC_RUN_IFELSE prevent people from configuring package - for cross-compiling. Don't run code while configuring package. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <[email protected]> - -Update for 0.9.8. -Signed-off-by: Zheng Ruoqin <[email protected]> ---- - scripts/checks.m4 | 34 ---------------------------------- - scripts/common.m4 | 28 ---------------------------- - 2 files changed, 62 deletions(-) - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 83be846..1af80f5 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <fcntl.h> -- #include <stdlib.h> -- #include <unistd.h> -- #include <sys/event.h> -- #include <sys/time.h> -- int main() { -- struct kevent ev@<:@2@:>@, ev_out@<:@2@:>@; -- struct timespec ts = { 0, 0 }; -- int pfd@<:@2@:>@, pty@<:@2@:>@, kfd, n; -- char buffer@<:@9001@:>@; -- if (pipe(pfd) == -1) return 1; -- if (fcntl(pfd@<:@1@:>@, F_SETFL, O_NONBLOCK) == -1) return 2; -- while ((n = write(pfd@<:@1@:>@, buffer, sizeof(buffer))) == sizeof(buffer)); -- if ((pty@<:@0@:>@=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3; -- if ((pty@<:@1@:>@=grantpt(pty@<:@0@:>@)) == -1) return 4; -- EV_SET(ev+0, pfd@<:@1@:>@, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL); -- EV_SET(ev+1, pty@<:@1@:>@, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL); -- if ((kfd = kqueue()) == -1) return 5; -- if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6; -- if (ev_out@<:@0@:>@.flags & EV_ERROR) return 7; -- if (ev_out@<:@1@:>@.flags & EV_ERROR) return 8; -- read(pfd@<:@0@:>@, buffer, sizeof(buffer)); -- if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(yes) -- ], [ -- AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.) -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_WITH_KQUEUE], [ -diff --git a/scripts/common.m4 b/scripts/common.m4 -index aaf005e..42fb016 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system. - - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) -- -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -- #include <execinfo.h> -- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} -- ])], -- [ -- AC_MSG_RESULT(yes) -- AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h) -- ], [ -- AC_MSG_RESULT(no) -- ]) - ]) - - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) -- -- AC_LINK_IFELSE([AC_LANG_SOURCE([ -- #include <inttypes.h> -- int main() { -- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; -- int i; -- for (i = 1; i < 4; ++i) -- if (*(uint32_t*)(buf + i) == 0) return -1; -- return 0; -- } -- ])], -- [ -- AC_MSG_RESULT(none needed) -- ], [ -- AC_DEFINE(USE_ALIGNED, 1, Require byte alignment) -- AC_MSG_RESULT(required) -- ]) - ]) - - --- -2.7.4 -
meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +8 -11
@@ -1,17 +1,14 @@ SUMMARY = "Torrent client" HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" +DEPENDS = "libsigc++-2.0 curl cppunit libtool libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https \ - file://don-t-run-code-while-configuring-package.patch \ -" -# v0.9.8 -SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947" +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" +SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550" -PV = "0.9.8" +PV = "0.9.8+git${SRCPV}" S = "${WORKDIR}/git"
@@ -21,6 +18,6 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig -do_configure:prepend() { - (cd ${S}; ./autogen.sh; cd -) -} +EXTRA_AUTORECONF += "--exclude=aclocal" + +CXXFLAGS += "-std=gnu++14"
Signature · 1 line
2.39.1
PATCH 17/30 nspr: Fix build with clang16
In reply to Khem Raj--- ...Wincompatible-function-pointer-types.patch | 39 +++++++++++++++++++ meta-oe/recipes-support/nspr/nspr_4.35.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch new file +39 -0
@@ -0,0 +1,39 @@ +From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 18 Jan 2023 13:04:56 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes warnings with clang16 +testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + pr/tests/testfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c +index 79d8a05..42aa6a7 100644 +--- a/pr/tests/testfile.c ++++ b/pr/tests/testfile.c +@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type, + if (native_thread) { + #if defined(_PR_PTHREADS) + pthread_t tid; +- if (!pthread_create(&tid, NULL, start, arg)) { ++ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) { + return((PRThread *) tid); + } + else { +@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void) + + thrarg.done= 0; + t = create_new_thread(PR_USER_THREAD, +- DirTest, &thrarg, ++ (void (*)(void *))DirTest, &thrarg, + PR_PRIORITY_NORMAL, + PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, +-- +2.39.1 +
meta-oe/recipes-support/nspr/nspr_4.35.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://0001-md-Fix-build-with-musl.patch \ file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ file://nspr.pc.in \ "
Signature · 1 line
2.39.1
PATCH 18/30 net-snmp: Fix build with clang16
In reply to Khem Raj--- ...eturn-attribute-to-netsnmp_pci_error.patch | 32 +++++++++++++++++++ .../net-snmp/net-snmp_5.9.3.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch
meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 5719f40db65a72624a0b0f08e546d12bf823bd1e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 18 Jan 2023 14:38:44 -0800 +Subject: [PATCH] Add noreturn attribute to netsnmp_pci_error() + +Fixes build with clang16 +| mibgroup/if-mib/data_access/interface_linux.c:152:23: error: incompatible function pointer types assigning to 'void (*)(char *, ...) __attribute__((noreturn))' from 'void (char *, ...)' [-Wincompatible-function-pointer-types] +| pci_access->error = netsnmp_pci_error; +| ^ ~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + agent/mibgroup/if-mib/data_access/interface_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agent/mibgroup/if-mib/data_access/interface_linux.c b/agent/mibgroup/if-mib/data_access/interface_linux.c +index c6cc54e..12eb865 100644 +--- a/agent/mibgroup/if-mib/data_access/interface_linux.c ++++ b/agent/mibgroup/if-mib/data_access/interface_linux.c +@@ -31,7 +31,7 @@ static struct pci_access *pci_access; + /* Avoid letting libpci call exit(1) when no PCI bus is available. */ + static int do_longjmp =0; + static jmp_buf err_buf; +-static void ++__attribute__((noreturn)) static void + netsnmp_pci_error(char *msg, ...) + { + va_list args; +-- +2.39.1 +
meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.3.bb +1 -0
@@ -26,6 +26,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://net-snmp-fix-for-disable-des.patch \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ + file://0001-Add-noreturn-attribute-to-netsnmp_pci_error.patch \ " SRC_URI[sha256sum] = "2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a"
Signature · 1 line
2.39.1
PATCH 19/30 xmlstarlet: Fix build with clang16
In reply to Khem Raj--- .../0001-Fix-hash_key_put-signature.patch | 33 +++++++++++++++++++ .../xmlstarlet/xmlstarlet_1.6.1.bb | 4 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch
meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] +Signed-off-by: Khem Raj <[email protected]> +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.39.1 +
meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +2 -2
@@ -14,8 +14,8 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ - file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" -SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" inherit autotools
Signature · 1 line
2.39.1
PATCH 20/30 libol: Drop recipe
In reply to Khem RajIn past it was needed by syslog-ng until it was bundled into syslog-ng and once syslog-ng was upgraded [1] this recipe became more or less unused
This package is now included in the syslog-ng 1.6.x or newer release tarball
[1] https://git.openembedded.org/meta-openembedded/commit/?id=1a6e16bcb1145df51b15c19df0d7ef655b683f5e
--- .../packagegroups/packagegroup-meta-oe.bb | 1 - .../libol/libol/configure.patch | 14 ------------- meta-oe/recipes-support/libol/libol_0.3.18.bb | 20 ------------------- 3 files changed, 35 deletions(-) delete mode 100644 meta-oe/recipes-support/libol/libol/configure.patch delete mode 100644 meta-oe/recipes-support/libol/libol_0.3.18.bb
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +0 -1
@@ -827,7 +827,6 @@ RDEPENDS:packagegroup-meta-oe-support ="\ liblinebreak \ mailcap \ liboauth \ - libol \ mg \ monit \ mscgen \
meta-oe/recipes-support/libol/libol/configure.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Index: libol-0.3.18/configure.in -=================================================================== ---- libol-0.3.18.orig/configure.in 2006-03-27 14:44:52.000000000 +0000 -+++ libol-0.3.18/configure.in 2014-07-18 07:05:56.029481372 +0000 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(src/abstract_io.c) -+AC_INIT(libol, "0.3.18") - --AM_INIT_AUTOMAKE(libol, "0.3.18", 1) -+AM_INIT_AUTOMAKE([foreign]) - if test -n "$SNAPSHOT_VERSION"; then - VERSION=$VERSION+$SNAPSHOT_VERSION - fi
meta-oe/recipes-support/libol/libol_0.3.18.bb deleted +0 -20
@@ -1,20 +0,0 @@ -SUMMARY = "A tiny C support library" -HOMEPAGE = "https://my.balabit.com/downloads/libol" -SECTION = "libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" - -SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${BP}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17" -SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7" - -inherit autotools binconfig - -do_compile:prepend() { - install ${S}/utils/make_class.in ${B}/utils -} - -do_install:append() { - rm -fr ${D}${bindir} -}
Signature · 1 line
2.39.1
PATCH 21/30 hplip: Update to 3.22.10
In reply to Khem RajAdd a patch to drop 'register' keyword
---
...op-using-register-storage-classifier.patch | 309 ++++++++++++++++++
.../hplip/hplip/configure.patch | 2 +-
.../{hplip_3.22.6.bb => hplip_3.22.10.bb} | 4 +-
3 files changed, 312 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch
rename meta-oe/recipes-extended/hplip/{hplip_3.22.6.bb => hplip_3.22.10.bb} (95%)meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch new file +309 -0
@@ -0,0 +1,309 @@ +From c36f0af7ba75c133edc46f052b291188351b6c20 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 18 Jan 2023 15:49:16 -0800 +Subject: [PATCH] Drop using register storage classifier + +Its beeing dropped from latest standards beginning C++17 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + ip/xjpg_dct.c | 4 +-- + ip/xjpg_dct.h | 4 +-- + prnt/hpcups/Mode9.cpp | 2 +- + prnt/hpcups/ModeDeltaPlus.cpp | 4 +-- + prnt/hpcups/jccolor.c | 46 +++++++++++++++++------------------ + prnt/hpijs/compression.cpp | 2 +- + prnt/hpijs/jccolor.c | 44 ++++++++++++++++----------------- + prnt/hpijs/ljfastraster.cpp | 4 +-- + prnt/hpps/psutil.c | 6 ++--- + 9 files changed, 58 insertions(+), 58 deletions(-) + +diff --git a/ip/xjpg_dct.c b/ip/xjpg_dct.c +index 63f021b..1986923 100644 +--- a/ip/xjpg_dct.c ++++ b/ip/xjpg_dct.c +@@ -103,7 +103,7 @@ + | for the Winograd DCT. | + |____________________________________________________________________________| + */ +-void dct_forward (register int *block_p) ++void dct_forward (int *block_p) + { + #define CONST_FRAC_BITS 14 /* bits of frac in CONST_1-CONST_5 below */ + +@@ -257,7 +257,7 @@ void dct_forward (register int *block_p) + | and level-shifting, you must clamp these values to 0..255. | + |____________________________________________________________________________| + */ +-void dct_inverse (register int *block_p) ++void dct_inverse (int *block_p) + { + #define CONST_FRAC_BITS 13 /* bits of frac in CONST_1-CONST_5 below */ + +diff --git a/ip/xjpg_dct.h b/ip/xjpg_dct.h +index 7dc90f3..149d66f 100644 +--- a/ip/xjpg_dct.h ++++ b/ip/xjpg_dct.h +@@ -43,8 +43,8 @@ + |____________________________________________________________________________| + */ + +-void dct_forward (register int *block_p); ++void dct_forward (int *block_p); + +-void dct_inverse (register int *block_p); ++void dct_inverse (int *block_p); + + /* End of File */ +diff --git a/prnt/hpcups/Mode9.cpp b/prnt/hpcups/Mode9.cpp +index 94ff571..6cc210a 100644 +--- a/prnt/hpcups/Mode9.cpp ++++ b/prnt/hpcups/Mode9.cpp +@@ -203,7 +203,7 @@ bool Mode9::Process(RASTERDATA* input) + unsigned int offset,byte_count,rem_count; + Mode9_comtype command; + char* dest= (char*) compressBuf; +- register char *dptr=dest; ++ char *dptr=dest; + + while ( size > 0 ) + { +diff --git a/prnt/hpcups/ModeDeltaPlus.cpp b/prnt/hpcups/ModeDeltaPlus.cpp +index 4552f4a..6a5837f 100644 +--- a/prnt/hpcups/ModeDeltaPlus.cpp ++++ b/prnt/hpcups/ModeDeltaPlus.cpp +@@ -241,8 +241,8 @@ bool ModeDeltaPlus::compress (BYTE *outmem, + const uint32_t inheight, + uint32_t horz_ht_dist) + { +- register BYTE *outptr = outmem; +- register uint32_t col; ++ BYTE *outptr = outmem; ++ uint32_t col; + const BYTE *seedrow; + uint32_t seedrow_count = 0; + uint32_t location = 0; +diff --git a/prnt/hpcups/jccolor.c b/prnt/hpcups/jccolor.c +index 7cc8906..6794575 100644 +--- a/prnt/hpcups/jccolor.c ++++ b/prnt/hpcups/jccolor.c +@@ -73,7 +73,7 @@ typedef my_color_converter * my_cconvert_ptr; + + /* We allocate one big table and divide it up into eight parts, instead of + * doing eight alloc_small requests. This lets us use a single table base +- * address, which can be held in a register in the inner loops on many ++ * address, which can be held in a in the inner loops on many + * machines (more than can hold all eight addresses, anyway). + */ + +@@ -205,11 +205,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -261,11 +261,11 @@ rgb_gray_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -300,11 +300,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2, outptr3; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2, outptr3; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -354,9 +354,9 @@ grayscale_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + int instride = cinfo->input_components; + +@@ -383,10 +383,10 @@ null_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; +- register int ci; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; ++ int ci; + int nc = cinfo->num_components; + JDIMENSION num_cols = cinfo->image_width; + +diff --git a/prnt/hpijs/compression.cpp b/prnt/hpijs/compression.cpp +index fcac793..10194ca 100644 +--- a/prnt/hpijs/compression.cpp ++++ b/prnt/hpijs/compression.cpp +@@ -266,7 +266,7 @@ BOOL Mode9::Process(RASTERDATA* input) + unsigned int offset,byte_count,rem_count; + Mode9_comtype command; + char* dest= (char*) compressBuf; +- register char *dptr=dest; ++ char *dptr=dest; + + while ( size > 0 ) + { +diff --git a/prnt/hpijs/jccolor.c b/prnt/hpijs/jccolor.c +index a6b2333..8486b65 100644 +--- a/prnt/hpijs/jccolor.c ++++ b/prnt/hpijs/jccolor.c +@@ -206,11 +206,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -262,11 +262,11 @@ rgb_gray_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -301,11 +301,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, + JDIMENSION output_row, int num_rows) + { + my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; +- register int r, g, b; +- register INT32 * ctab = cconvert->rgb_ycc_tab; +- register JSAMPROW inptr; +- register JSAMPROW outptr0, outptr1, outptr2, outptr3; +- register JDIMENSION col; ++ int r, g, b; ++ INT32 * ctab = cconvert->rgb_ycc_tab; ++ JSAMPROW inptr; ++ JSAMPROW outptr0, outptr1, outptr2, outptr3; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + + while (--num_rows >= 0) { +@@ -355,9 +355,9 @@ grayscale_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; + JDIMENSION num_cols = cinfo->image_width; + int instride = cinfo->input_components; + +@@ -384,10 +384,10 @@ null_convert (j_compress_ptr cinfo, + JSAMPARRAY input_buf, JSAMPIMAGE output_buf, + JDIMENSION output_row, int num_rows) + { +- register JSAMPROW inptr; +- register JSAMPROW outptr; +- register JDIMENSION col; +- register int ci; ++ JSAMPROW inptr; ++ JSAMPROW outptr; ++ JDIMENSION col; ++ int ci; + int nc = cinfo->num_components; + JDIMENSION num_cols = cinfo->image_width; + +diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp +index 8c7073a..7e82fac 100644 +--- a/prnt/hpijs/ljfastraster.cpp ++++ b/prnt/hpijs/ljfastraster.cpp +@@ -919,8 +919,8 @@ BOOL ModeDeltaPlus::Compress (HPUInt8 *outmem, + const uint32_t inheight, + uint32_t horz_ht_dist) + { +- register HPUInt8 *outptr = outmem; +- register uint32_t col; ++ HPUInt8 *outptr = outmem; ++ uint32_t col; + const HPUInt8 *seedrow; + uint32_t seedrow_count = 0; + uint32_t location = 0; +diff --git a/prnt/hpps/psutil.c b/prnt/hpps/psutil.c +index 7282dc2..87fba4f 100644 +--- a/prnt/hpps/psutil.c ++++ b/prnt/hpps/psutil.c +@@ -148,9 +148,9 @@ static int fcopy(long upto) + /* build array of pointers to start/end of pages */ + void scanpages(void) + { +- register char *comment = buffer+2; +- register int nesting = 0; +- register long int record; ++ char *comment = buffer+2; ++ int nesting = 0; ++ long int record; + + if ((pageptr = (long *)malloc(sizeof(long)*maxpages)) == NULL) + message(FATAL, "out of memory\n"); +-- +2.39.1 +
meta-oe/recipes-extended/hplip/hplip/configure.patch +1 -1
@@ -1,7 +1,7 @@ --- a/configure.in +++ b/configure.in @@ -30,7 +30,7 @@ - AC_INIT([HP Linux Imaging and Printing], [3.22.6], [3.22.6], [hplip]) + AC_INIT([HP Linux Imaging and Printing], [3.22.10], [3.22.10], [hplip]) #AM_INIT_AUTOMAKE([1.9 foreign]) -AM_INIT_AUTOMAKE
meta-oe/recipes-extended/hplip/hplip_3.22.10.bb renamed from meta-oe/recipes-extended/hplip/hplip_3.22.6.bb +2 -2
@@ -15,8 +15,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0004-Define-missing-prototype-for-functions.patch \ file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \ file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \ -" -SRC_URI[sha256sum] = "27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4" + file://0001-Drop-using-register-storage-classifier.patch" +SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" DEPENDS += "cups python3 libusb"
Signature · 1 line
2.39.1
PATCH 22/30 espeak: Drop using 'register' keyword for storage classifier
In reply to Khem RajFixes build with latest clang
--- .../recipes-support/espeak/espeak_1.48.04.bb | 1 + ...ister-keyword-for-storage-classifier.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch
meta-oe/recipes-support/espeak/espeak_1.48.04.bb +1 -0
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ file://0001-Fix-build-of-shared-library-on-architectures-needing.patch \ file://0002-tr_languages-cast-string_ordinal-init-values.patch \ + file://0001-Drop-using-register-keyword-for-storage-classifier.patch \ " SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659"
meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch new file +38 -0
@@ -0,0 +1,38 @@ +From bad6131463275bd8013a82c28fb0b27e882bc801 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 18 Jan 2023 16:07:35 -0800 +Subject: [PATCH] Drop using 'register' keyword for storage classifier + +Its gone from C++17 and newer + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + src/klatt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/klatt.cpp b/src/klatt.cpp +index b15f77c..9c51bc5 100755 +--- a/src/klatt.cpp ++++ b/src/klatt.cpp +@@ -167,7 +167,7 @@ Output = (rnz.a * input) + (rnz.b * oldin1) + (rnz.c * oldin2) + #ifdef deleted + static double antiresonator(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + return (double)x; +@@ -176,7 +176,7 @@ static double antiresonator(resonator_ptr r, double input) + + static double antiresonator2(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + +-- +2.39.1 +
Signature · 1 line
2.39.1
PATCH 23/30 uw-imap: Fix build with clang 16
In reply to Khem Raj--- ...Wincompatible-function-pointer-types.patch | 178 ++++++++++++++++++ .../recipes-devtools/uw-imap/uw-imap_2007f.bb | 1 + 2 files changed, 179 insertions(+) create mode 100644 meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch
meta-oe/recipes-devtools/uw-imap/uw-imap/0001-Fix-Wincompatible-function-pointer-types.patch new file +178 -0
@@ -0,0 +1,178 @@ +From 3170b245aba99694390c3c87d326639b6685d4dd Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Jan 2023 14:34:05 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes new found errors with clang 16 + +news.c:370:36: error: incompatible function pointer types passing 'int (struct dirent *)' to parameter of type 'int (*)(const struct dirent *)' [-Wincompatible-function-pointer-types] + if ((nmsgs = scandir (tmp,&names,news_select,news_numsort)) >= 0) { + ^~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/uw-imap/2007f-r0/recipe-sysroot/usr/include/dirent.h:259:13: note: passing argument to parameter '__selector' here + int (*__selector) (const struct dirent *), + ^ +news.c:370:48: error: incompatible function pointer types passing 'int (const void *, const void *)' to parameter of type 'int (*)(const struct dirent **, const struct dirent **)' [-Wincompatible-function-pointer-types] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + src/osdep/unix/mh.c | 8 ++++---- + src/osdep/unix/mix.c | 12 ++++++------ + src/osdep/unix/mx.c | 8 ++++---- + src/osdep/unix/news.c | 8 ++++---- + 4 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c +index 0226b7a..9264624 100644 +--- a/src/osdep/unix/mh.c ++++ b/src/osdep/unix/mh.c +@@ -103,8 +103,8 @@ long mh_copy (MAILSTREAM *stream,char *sequence,char *mailbox, + long options); + long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + +-int mh_select (struct direct *name); +-int mh_numsort (const void *d1,const void *d2); ++int mh_select (const struct direct *name); ++int mh_numsort (const struct dirent **d1,const struct dirent **d2); + char *mh_file (char *dst,char *name); + long mh_canonicalize (char *pattern,char *ref,char *pat); + void mh_setdate (char *file,MESSAGECACHE *elt); +@@ -1194,7 +1194,7 @@ long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) + * Returns: T to use file name, NIL to skip it + */ + +-int mh_select (struct direct *name) ++int mh_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1209,7 +1209,7 @@ int mh_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mh_numsort (const void *d1,const void *d2) ++int mh_numsort (const struct dirent **d1,const struct dirent **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/mix.c b/src/osdep/unix/mix.c +index fbf4a02..c2207f6 100644 +--- a/src/osdep/unix/mix.c ++++ b/src/osdep/unix/mix.c +@@ -125,7 +125,7 @@ long mix_unsubscribe (MAILSTREAM *stream,char *mailbox); + long mix_create (MAILSTREAM *stream,char *mailbox); + long mix_delete (MAILSTREAM *stream,char *mailbox); + long mix_rename (MAILSTREAM *stream,char *old,char *newname); +-int mix_rselect (struct direct *name); ++int mix_rselect (const struct direct *name); + MAILSTREAM *mix_open (MAILSTREAM *stream); + void mix_close (MAILSTREAM *stream,long options); + void mix_abort (MAILSTREAM *stream); +@@ -140,8 +140,8 @@ THREADNODE *mix_thread (MAILSTREAM *stream,char *type,char *charset, + long mix_ping (MAILSTREAM *stream); + void mix_check (MAILSTREAM *stream); + long mix_expunge (MAILSTREAM *stream,char *sequence,long options); +-int mix_select (struct direct *name); +-int mix_msgfsort (const void *d1,const void *d2); ++int mix_select (const struct direct *name); ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2); + long mix_addset (SEARCHSET **set,unsigned long start,unsigned long size); + long mix_burp (MAILSTREAM *stream,MIXBURP *burp,unsigned long *reclaimed); + long mix_burp_check (SEARCHSET *set,size_t size,char *file); +@@ -587,7 +587,7 @@ long mix_rename (MAILSTREAM *stream,char *old,char *newname) + * Returns: T if mix file name, NIL otherwise + */ + +-int mix_rselect (struct direct *name) ++int mix_rselect (const struct direct *name) + { + return mix_dirfmttest (name->d_name); + } +@@ -1146,7 +1146,7 @@ long mix_expunge (MAILSTREAM *stream,char *sequence,long options) + * ".mix" with no suffix was used by experimental versions + */ + +-int mix_select (struct direct *name) ++int mix_select (const struct direct *name) + { + char c,*s; + /* make sure name has prefix */ +@@ -1165,7 +1165,7 @@ int mix_select (struct direct *name) + * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2 + */ + +-int mix_msgfsort (const void *d1,const void *d2) ++int mix_msgfsort (const struct dirent **d1,const struct dirent **d2) + { + char *n1 = (*(struct direct **) d1)->d_name + sizeof (MIXNAME) - 1; + char *n2 = (*(struct direct **) d2)->d_name + sizeof (MIXNAME) - 1; +diff --git a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c +index 4549527..b5c5adf 100644 +--- a/src/osdep/unix/mx.c ++++ b/src/osdep/unix/mx.c +@@ -98,8 +98,8 @@ long mx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data); + long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + STRING *st,SEARCHSET *set); + +-int mx_select (struct direct *name); +-int mx_numsort (const void *d1,const void *d2); ++int mx_select (const struct direct *name); ++int mx_numsort (const struct dirent **d1,const struct dirent **d2); + char *mx_file (char *dst,char *name); + long mx_lockindex (MAILSTREAM *stream); + void mx_unlockindex (MAILSTREAM *stream); +@@ -1110,7 +1110,7 @@ long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt, + * Returns: T to use file name, NIL to skip it + */ + +-int mx_select (struct direct *name) ++int mx_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -1125,7 +1125,7 @@ int mx_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int mx_numsort (const void *d1,const void *d2) ++int mx_numsort (const struct dirent **d1,const struct dirent **d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +diff --git a/src/osdep/unix/news.c b/src/osdep/unix/news.c +index 4cf5bb7..3da5207 100644 +--- a/src/osdep/unix/news.c ++++ b/src/osdep/unix/news.c +@@ -76,8 +76,8 @@ long news_create (MAILSTREAM *stream,char *mailbox); + long news_delete (MAILSTREAM *stream,char *mailbox); + long news_rename (MAILSTREAM *stream,char *old,char *newname); + MAILSTREAM *news_open (MAILSTREAM *stream); +-int news_select (struct direct *name); +-int news_numsort (const void *d1,const void *d2); ++int news_select (const struct direct *name); ++int news_numsort (const struct dirent ** d1,const struct dirent ** d2); + void news_close (MAILSTREAM *stream,long options); + void news_fast (MAILSTREAM *stream,char *sequence,long flags); + void news_flags (MAILSTREAM *stream,char *sequence,long flags); +@@ -402,7 +402,7 @@ MAILSTREAM *news_open (MAILSTREAM *stream) + * Returns: T to use file name, NIL to skip it + */ + +-int news_select (struct direct *name) ++int news_select (const struct direct *name) + { + char c; + char *s = name->d_name; +@@ -417,7 +417,7 @@ int news_select (struct direct *name) + * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2 + */ + +-int news_numsort (const void *d1,const void *d2) ++int news_numsort (const struct dirent ** d1,const struct dirent ** d2) + { + return atoi ((*(struct direct **) d1)->d_name) - + atoi ((*(struct direct **) d2)->d_name); +-- +2.39.1 +
meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +1 -0
@@ -14,6 +14,7 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ file://0001-Define-prototype-for-safe_flock.patch \ file://0001-Do-not-build-mtest.patch \ file://0002-tmail-Include-ctype.h-for-isdigit.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ " SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369"
Signature · 1 line
2.39.1
PATCH 24/30 xmlsec1: Include xmlsec/parser.h for xmlSecParserSetDefaultOptions()
In reply to Khem Raj--- ...mldsigverify-Include-xmlsec-parser.h.patch | 43 +++++++++++++++++++ .../recipes-support/xmlsec1/xmlsec1_1.2.37.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch
meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 30e1afe60820c18c89cd10e9dcb7208ad5676d1d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Jan 2023 15:06:35 -0800 +Subject: [PATCH] xmldsigverify: Include xmlsec/parser.h + +this ensures that xmlSecParserSetDefaultOptions definition is made +available + +Fixes +| xmldsigverify.c:275:5: error: call to undeclared function 'xmlSecParserSetDefaultOptions'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA | +| ^ + +Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/463] +Signed-off-by: Khem Raj <[email protected]> +--- + examples/xmldsigverify.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c +index ed538c70..ff68120e 100644 +--- a/examples/xmldsigverify.c ++++ b/examples/xmldsigverify.c +@@ -25,6 +25,7 @@ + #include <xmlsec/xmldsig.h> + #include <xmlsec/crypto.h> + ++#include <xmlsec/parser.h> + /* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/etc/httpd/conf/ssl.crt" */ + #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/var/www/cgi-bin/keys-certs.def" + #define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER "/var/www/cgi-bin/keys-certs" +@@ -36,7 +37,7 @@ int verify_request(xmlSecKeysMngrPtr mngr); + int url_decode(char *buf, size_t size); + + int +-main(int , char **) { ++main() { + xmlSecKeysMngrPtr mngr; + #ifndef XMLSEC_NO_XSLT + xsltSecurityPrefsPtr xsltSecPrefs = NULL; +-- +2.39.1 +
meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb +1 -0
@@ -20,6 +20,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://0001-nss-nspr-fix-for-multilib.patch \ file://run-ptest \ file://ensure-search-path-non-host.patch \ + file://0001-xmldsigverify-Include-xmlsec-parser.h.patch \ " SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"
Signature · 1 line
2.39.1
PATCH 25/30 exiv2: Upgrade to 0.27.6
In reply to Khem RajDrop backported patches
--- ...-protection-only-if-compiler-arch-su.patch | 40 ------ .../exiv2/exiv2/CVE-2021-29457.patch | 26 ---- .../exiv2/exiv2/CVE-2021-29458.patch | 37 ------ .../exiv2/exiv2/CVE-2021-29463.patch | 120 ------------------ .../exiv2/exiv2/CVE-2021-29464.patch | 72 ----------- .../exiv2/exiv2/CVE-2021-29470.patch | 32 ----- .../exiv2/exiv2/CVE-2021-29473.patch | 21 --- .../exiv2/exiv2/CVE-2021-3482.patch | 54 -------- meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb | 30 ----- meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb | 19 +++ 10 files changed, 19 insertions(+), 432 deletions(-) delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch delete mode 100644 meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb create mode 100644 meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb
meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -Date: Thu, 30 Jul 2020 23:03:51 +0200 -Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports - it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There have been some PRs they were either rejected or some general suggestion -for more flags suggested. So - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <[email protected]> ---- - cmake/compilerFlags.cmake | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake -index 12caf42..455525e 100644 ---- a/cmake/compilerFlags.cmake -+++ b/cmake/compilerFlags.cmake -@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN - # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 - if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) - if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) -- add_compile_options(-fstack-clash-protection -fcf-protection) -+ # Gcc does support -fcf-protection on few arches only -+ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) -+ if (COMPILER_SUPPORTS_FCF_PROTECTION) -+ add_compile_options(-fcf-protection) -+ endif() -+ add_compile_options(-fstack-clash-protection) - endif() - - if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 --- -2.21.3 -
meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29457.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 13e5a3e02339b746abcaee6408893ca2fd8e289d Mon Sep 17 00:00:00 2001 -From: Pydera <[email protected]> -Date: Thu, 8 Apr 2021 17:36:16 +0200 -Subject: [PATCH] Fix out of buffer access in #1529 - ---- - src/jp2image.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 88ab9b2d6..12025f966 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -776,9 +776,10 @@ static void boxes_check(size_t b,size_t m) - #endif - box.length = (uint32_t) (io_->size() - io_->tell() + 8); - } -- if (box.length == 1) -+ if (box.length < 8) - { -- // FIXME. Special case. the real box size is given in another place. -+ // box is broken, so there is nothing we can do here -+ throw Error(kerCorruptedMetadata); - } - - // Read whole box : Box header + Box data (not fixed size - can be null).
meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29458.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 9b7a19f957af53304655ed1efe32253a1b11a8d0 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <[email protected]> -Date: Fri, 9 Apr 2021 13:37:48 +0100 -Subject: [PATCH] Fix integer overflow. ---- - src/crwimage_int.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp -index aefaf22..2e3e507 100644 ---- a/src/crwimage_int.cpp -+++ b/src/crwimage_int.cpp -@@ -559,7 +559,7 @@ namespace Exiv2 { - void CiffComponent::setValue(DataBuf buf) - { - if (isAllocated_) { -- delete pData_; -+ delete[] pData_; - pData_ = 0; - size_ = 0; - } -@@ -1167,7 +1167,11 @@ namespace Exiv2 { - pCrwMapping->crwDir_); - if (edX != edEnd || edY != edEnd || edO != edEnd) { - uint32_t size = 28; -- if (cc && cc->size() > size) size = cc->size(); -+ if (cc) { -+ if (cc->size() < size) -+ throw Error(kerCorruptedMetadata); -+ size = cc->size(); -+ } - DataBuf buf(size); - std::memset(buf.pData_, 0x0, buf.size_); - if (cc) std::memcpy(buf.pData_ + 8, cc->pData() + 8, cc->size() - 8); --- -2.25.1 -
meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29463.patch deleted +0 -120
120 lines not on this page · raw message
meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29464.patch deleted +0 -72
72 lines not on this page · raw message
meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29470.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 6628a69c036df2aa036290e6cd71767c159c79ed Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <[email protected]> -Date: Wed, 21 Apr 2021 12:06:04 +0100 -Subject: [PATCH] Add more bounds checks in Jp2Image::encodeJp2Header ---- - src/jp2image.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index b424225..349a9f0 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -645,13 +645,16 @@ static void boxes_check(size_t b,size_t m) - DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space - long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? - long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? -+ enforce(sizeof(Jp2BoxHeader) <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); - Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; - uint32_t length = getLong((byte*)&pBox->length, bigEndian); -+ enforce(length <= static_cast<size_t>(output.size_), Exiv2::kerCorruptedMetadata); - uint32_t count = sizeof (Jp2BoxHeader); - char* p = (char*) boxBuf.pData_; - bool bWroteColor = false ; - - while ( count < length || !bWroteColor ) { -+ enforce(sizeof(Jp2BoxHeader) <= length - count, Exiv2::kerCorruptedMetadata); - Jp2BoxHeader* pSubBox = (Jp2BoxHeader*) (p+count) ; - - // copy data. pointer could be into a memory mapped file which we will decode! --- -2.25.1 -
meta-oe/recipes-support/exiv2/exiv2/CVE-2021-29473.patch deleted +0 -21
@@ -1,21 +0,0 @@ -From e6a0982f7cd9282052b6e3485a458d60629ffa0b Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <[email protected]> -Date: Fri, 23 Apr 2021 11:44:44 +0100 -Subject: [PATCH] Add bounds check in Jp2Image::doWriteMetadata(). - ---- - src/jp2image.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 1694fed27..ca8c9ddbb 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -908,6 +908,7 @@ static void boxes_check(size_t b,size_t m) - - case kJp2BoxTypeUuid: - { -+ enforce(boxBuf.size_ >= 24, Exiv2::kerCorruptedMetadata); - if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, 16) == 0) - { - #ifdef EXIV2_DEBUG_MESSAGES
meta-oe/recipes-support/exiv2/exiv2/CVE-2021-3482.patch deleted +0 -54
54 lines not on this page · raw message
meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb deleted +0 -30
@@ -1,30 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat" - -SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" - -# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either -inherit dos2unix -SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch \ - file://CVE-2021-29457.patch \ - file://CVE-2021-29458.patch \ - file://CVE-2021-29463.patch \ - file://CVE-2021-29464.patch \ - file://CVE-2021-29470.patch \ - file://CVE-2021-29473.patch \ - file://CVE-2021-3482.patch" - -S = "${WORKDIR}/${BPN}-${PV}-Source" - -inherit cmake gettext - -do_install:append:class-target() { - # reproducibility: remove build host path - sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ - -e 's:${STAGING_DIR_HOST}::g' -} -
meta-oe/recipes-support/exiv2/exiv2_0.27.6.bb new file +19 -0
@@ -0,0 +1,19 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat" + +SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" +SRC_URI[sha256sum] = "4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6" +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +# inherit dos2unix +S = "${WORKDIR}/${BP}-Source" + +inherit cmake gettext + +do_install:append:class-target() { + # reproducibility: remove build host path + sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ + -e 's:${STAGING_DIR_HOST}::g' +}
Signature · 1 line
2.39.1
PATCH 26/30 packagegroup-meta-oe: Remove mongodb for upsupported arches
In reply to Khem Raj--- .../recipes-core/packagegroups/packagegroup-meta-oe.bbappend | 4 ++++ 1 file changed, 4 insertions(+)
meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +4 -0
@@ -3,6 +3,10 @@ RDEPENDS:packagegroup-meta-oe-devtools += "\ rwmem \ mongodb \ " +packagegroup-meta-oe-devtools:remove:riscv64 = "mongodb" +packagegroup-meta-oe-devtools:remove:riscv32 = "mongodb" +packagegroup-meta-oe-devtools:remove:mipsarch = "mongodb" +packagegroup-meta-oe-devtools:remove:powerpc = "mongodb" RDEPENDS:packagegroup-meta-oe-connectivity += "\ lirc \
Signature · 1 line
2.39.1
PATCH 27/30 rtorrent: Add missing dependency on autoconf-archive
In reply to Khem RajFixes configure errors e.g.
| configure:8269: error: possibly undefined macro: PKG_CHECK_EXISTS
--- meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +1 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://libtorrent.rakshasa.no/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsigc++-2.0 curl cppunit libtool libtorrent ncurses" +DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses" SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550"
Signature · 1 line
2.39.1
PATCH 28/30 thrift: Fix c++ and system header include order problem
In reply to Khem Raj--- ...ake-Use-idirafter-instead-of-isystem.patch | 180 ++++++++++++++++++ .../thrift/thrift_0.17.0.bb | 1 + 2 files changed, 181 insertions(+) create mode 100644 meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch
meta-oe/recipes-connectivity/thrift/thrift/0001-cmake-Use-idirafter-instead-of-isystem.patch new file +180 -0
@@ -0,0 +1,180 @@ +From 0b9c6c4286a33961016839826e709a0e7394b28b Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 21 Jan 2023 00:00:04 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + build/cmake/BoostMacros.cmake | 2 +- + lib/c_glib/CMakeLists.txt | 4 ++-- + lib/c_glib/test/CMakeLists.txt | 2 +- + lib/cpp/CMakeLists.txt | 7 +++---- + lib/cpp/test/CMakeLists.txt | 2 +- + test/c_glib/CMakeLists.txt | 6 +++--- + test/cpp/CMakeLists.txt | 6 +++--- + 7 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/build/cmake/BoostMacros.cmake b/build/cmake/BoostMacros.cmake +index ffb85af..9f9d2dd 100644 +--- a/build/cmake/BoostMacros.cmake ++++ b/build/cmake/BoostMacros.cmake +@@ -26,7 +26,7 @@ macro(REQUIRE_BOOST_HEADERS) + endif() + if (DEFINED Boost_INCLUDE_DIRS) + # pre-boost 1.70.0 aware cmake, otherwise it is using targets +- include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + endif() + endmacro() + +diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt +index 218f7dd..d7a6161 100644 +--- a/lib/c_glib/CMakeLists.txt ++++ b/lib/c_glib/CMakeLists.txt +@@ -83,7 +83,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -97,7 +97,7 @@ target_link_libraries(thrift_c_glib PUBLIC ${SYSLIBS}) + + # If Zlib is not found just ignore the Zlib stuff + if(WITH_ZLIB) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thrift_c_glib_zlib ${thrift_c_glib_zlib_SOURCES}) + target_link_libraries(thrift_c_glib_zlib ${SYSLIBS} ${ZLIB_LIBRARIES}) + target_link_libraries(thrift_c_glib_zlib thrift_c_glib) +diff --git a/lib/c_glib/test/CMakeLists.txt b/lib/c_glib/test/CMakeLists.txt +index 85c6dd0..0c8d3d2 100644 +--- a/lib/c_glib/test/CMakeLists.txt ++++ b/lib/c_glib/test/CMakeLists.txt +@@ -129,7 +129,7 @@ target_link_libraries(testthriftmemorybufferreadcheck testgenc) + add_test(NAME testthriftmemorybufferreadcheck COMMAND testthriftmemorybufferreadcheck) + + if(WITH_ZLIB) +- include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(testzlibtransport testzlibtransport.c) + target_link_libraries(testzlibtransport testgenc ${ZLIB_LIBRARIES}) + target_link_libraries(testzlibtransport thrift_c_glib_zlib) +diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt +index 13b41c5..96bea53 100644 +--- a/lib/cpp/CMakeLists.txt ++++ b/lib/cpp/CMakeLists.txt +@@ -111,7 +111,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + list(APPEND SYSLIBS OpenSSL::Crypto) + endif() + else() +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + endif() +@@ -167,8 +167,7 @@ ADD_PKGCONFIG_THRIFT(thrift) + + if(WITH_LIBEVENT) + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +- include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) +- ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) + target_link_libraries(thriftnb PUBLIC thrift) + if(TARGET libevent::core AND TARGET libevent::extra) +@@ -182,7 +181,7 @@ endif() + + if(WITH_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) + target_link_libraries(thriftz PUBLIC thrift) +diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt +index 19854e1..1b36b47 100644 +--- a/lib/cpp/test/CMakeLists.txt ++++ b/lib/cpp/test/CMakeLists.txt +@@ -127,7 +127,7 @@ endif () + add_test(NAME TServerIntegrationTest COMMAND TServerIntegrationTest) + + if(WITH_ZLIB) +-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + add_executable(TransportTest TransportTest.cpp) + target_link_libraries(TransportTest + testgencpp +diff --git a/test/c_glib/CMakeLists.txt b/test/c_glib/CMakeLists.txt +index 410774d..cbda860 100644 +--- a/test/c_glib/CMakeLists.txt ++++ b/test/c_glib/CMakeLists.txt +@@ -21,14 +21,14 @@ + include(ThriftMacros) + + find_package(GLIB REQUIRED COMPONENTS gobject) +-include_directories(SYSTEM "${GLIB_INCLUDE_DIR}") +-include_directories(SYSTEM "${GLIBCONFIG_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIB_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${GLIBCONFIG_INCLUDE_DIR}") + + #Make sure gen-c_glib files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") + include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-c_glib") + include_directories("${PROJECT_SOURCE_DIR}/lib/c_glib/src") +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + set(crosstestgencglib_SOURCES + gen-c_glib/t_test_second_service.c +diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt +index a6c1fd5..160c67b 100644 +--- a/test/cpp/CMakeLists.txt ++++ b/test/cpp/CMakeLists.txt +@@ -27,13 +27,13 @@ REQUIRE_BOOST_LIBRARIES(BOOST_COMPONENTS) + include(ThriftMacros) + + find_package(OpenSSL REQUIRED) +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${OPENSSL_INCLUDE_DIR}") + + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +-include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${LIBEVENT_INCLUDE_DIRS}") + + find_package(ZLIB REQUIRED) +-include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${ZLIB_INCLUDE_DIRS}") + + #Make sure gen-cpp files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") +-- +2.39.1 +
meta-oe/recipes-connectivity/thrift/thrift_0.17.0.bb +1 -0
@@ -10,6 +10,7 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ " SRC_URI[sha256sum] = "b272c1788bb165d99521a2599b31b97fa69e5931d099015d91ae107a0b0cc58f"
Signature · 1 line
2.39.1
PATCH 29/30 libcereal: Use -idirafter instead of -isystem
In reply to Khem Raj--- ...ake-Use-idirafter-instead-of-isystem.patch | 52 +++++++++++++++++++ .../libcereal/libcereal_1.3.2.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch
meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch new file +52 -0
@@ -0,0 +1,52 @@ +From ac70933783a70d5387a2bb2849c568e33ba52558 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 21 Jan 2023 01:41:32 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/recipe-sysroot/usr/include/c++/v1/cwchar:113:5: error: <cwchar> tried including <wchar.h> but didn't find libc++'s <wcha +r.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard + Library, and you are probably using compiler flags that make that not be the case. | # error <cwchar> tried including <wchar.h> but didn't find libc++'s <wchar.h> header. \ +| ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/777] +Signed-off-by: Khem Raj <[email protected]> +--- + unittests/boost/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/boost/CMakeLists.txt b/unittests/boost/CMakeLists.txt +index 1d733bc7..08e6a169 100644 +--- a/unittests/boost/CMakeLists.txt ++++ b/unittests/boost/CMakeLists.txt +@@ -1,6 +1,6 @@ + file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) + +-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + + # Build all of the non-special tests + foreach(TEST_SOURCE ${TESTS}) +-- +2.39.1 +
meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +1 -0
@@ -20,6 +20,7 @@ PV .= "+git${SRCPV}" SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ file://run-ptest \ "
Signature · 1 line
2.39.1
PATCH 30/30 poppler: cmake: Do not use -isystem
In reply to Khem Raj--- .../0001-cmake-Do-not-use-isystem.patch | 192 ++++++++++++++++++ .../poppler/poppler_23.01.0.bb | 1 + 2 files changed, 193 insertions(+) create mode 100644 meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch new file +192 -0
@@ -0,0 +1,192 @@ +From 51a2a1e4d8ca4040a6a7eac398cb704da35f39e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 21 Jan 2023 03:09:08 -0800 +Subject: [PATCH] cmake: Do not use -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 4 ++-- + glib/CMakeLists.txt | 4 ++-- + qt5/src/CMakeLists.txt | 4 ++-- + qt6/src/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 6 +++--- + utils/CMakeLists.txt | 10 +++++----- + 6 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4768ac8..cdc014d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) + if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories +- target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) ++ target_include_directories(poppler PRIVATE ${OPENJPEG_INCLUDE_DIRS}) + endif() + if(USE_CMS) +- target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") + set_target_properties(poppler PROPERTIES VERSION 126.0.0 SOVERSION 126) +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 52e8687..08ab39a 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories( + ) + + include_directories( +- SYSTEM ++ + ${GLIB2_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ) +@@ -96,7 +96,7 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} Freetype::Freetype) +-target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) + install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(FILES +diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt +index 5db3a6c..f242d29 100644 +--- a/qt5/src/CMakeLists.txt ++++ b/qt5/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt5 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt5 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt5 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt +index cd91975..6c42e12 100644 +--- a/qt6/src/CMakeLists.txt ++++ b/qt6/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt6 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt6 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt6 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index afa1352..9bd3b9a 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,7 +23,7 @@ if (GTK_FOUND) + ) + poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS}) + target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) +- target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(gtk-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + + if (HAVE_CAIRO) + +@@ -35,7 +35,7 @@ if (GTK_FOUND) + ) + poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS}) + target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs} PkgConfig::GTK3 poppler) +- target_include_directories(pdf-inspector SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdf-inspector PRIVATE ${CAIRO_INCLUDE_DIRS}) + target_compile_definitions(pdf-inspector PRIVATE -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + endif () + +@@ -59,7 +59,7 @@ if (HAVE_CAIRO) + ) + add_executable(cairo-thread-test ${cairo_thread_test_SRCS}) + target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} Freetype::Freetype Threads::Threads poppler) +- target_include_directories(cairo-thread-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(cairo-thread-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + endif () + endif () + +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 1c3ebcb..bc1840a 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) + target_link_libraries(pdftoppm ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) +- target_include_directories(pdftoppm SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftoppm PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftoppm DESTINATION bin) + install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -37,10 +37,10 @@ if (HAVE_CAIRO) + add_definitions(${CAIRO_CFLAGS}) + add_executable(pdftocairo ${pdftocairo_SOURCES}) + target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdftocairo PRIVATE ${CAIRO_INCLUDE_DIRS}) + if(LCMS2_FOUND) + target_link_libraries(pdftocairo ${LCMS2_LIBRARIES}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftocairo PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftocairo DESTINATION bin) + install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -99,7 +99,7 @@ if (ENABLE_NSS3) + pdfsig.cc + ) + add_executable(pdfsig ${pdfsig_SOURCES}) +- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) + target_link_libraries(pdfsig ${common_libs}) + install(TARGETS pdfsig DESTINATION bin) + install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) + target_link_libraries(pdftops ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftops ${LCMS2_LIBRARIES}) +- target_include_directories(pdftops SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftops PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftops DESTINATION bin) + install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +-- +2.39.1 +
meta-oe/recipes-support/poppler/poppler_23.01.0.bb +1 -0
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ + file://0001-cmake-Do-not-use-isystem.patch \ " SRC_URI[sha256sum] = "fae9b88d3d5033117d38477b79220cfd0d8e252c278ec870ab1832501741fd94"
Signature · 1 line
2.39.1