glibmm: Upgrade to 2.66.7 release
PATCH 1/9 glibmm: Upgrade to 2.66.7 release
Changes are here [1]
---
.../glib-2.0/{glibmm_2.66.2.bb => glibmm_2.66.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-core/glib-2.0/{glibmm_2.66.2.bb => glibmm_2.66.7.bb} (90%)meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb renamed from meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb +1 -1
@@ -12,7 +12,7 @@ inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI[archive.sha256sum] = "b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d" +SRC_URI[archive.sha256sum] = "fe02c1e5f5825940d82b56b6ec31a12c06c05c1583cfe62f934d0763e1e542b3" FILES:${PN} = "${libdir}/lib*.so.*" FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
PATCH 2/9 transmission: Upgrade to 4.0.6 release
Use external libpsl, this also avoids hardcoded buildpaths which gets into binaries due to inplace vendored libpsl
---
.../{transmission_4.0.5.bb => transmission_4.0.6.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-connectivity/transmission/{transmission_4.0.5.bb => transmission_4.0.6.bb} (93%)meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb renamed from meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb +3 -3
@@ -4,7 +4,7 @@ HOMEPAGE = "https://transmissionbt.com/" LICENSE = "MIT & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" -DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" +DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native" RDEPENDS:${PN}-web = "${PN}" SRC_URI = " \
@@ -12,8 +12,8 @@ SRC_URI = " \ file://transmission-daemon \ " -# Transmission release 4.0.5 -SRCREV = "a6fe2a64aa7eca089f96006cf082a12f0cde937f" +# Transmission release 4.0.6 +SRCREV = "38c164933e9f77c110b48fe745861c3b98e3d83e" S = "${WORKDIR}/git"
PATCH 3/9 wolfssl: Add packageconfig for reproducible build
In reply to Khem RajMake this option turned on by default
Fixes
WARNING: wolfssl-5.7.2-r0 do_package_qa: QA Issue: File /usr/lib/libwolfssl.so.42.2.0 in package wolfssl contains reference to TMPDIR [buildpaths]
--- meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb +3 -0
@@ -19,4 +19,7 @@ S = "${WORKDIR}/git" inherit autotools +PACKAGECONFIG ?= "reproducible-build" + +PACKAGECONFIG[reproducible-build] = "--enable-reproducible-build,--disable-reproducible-build," BBCLASSEXTEND += "native nativesdk"
PATCH 4/9 lprng: Specify target paths for needed utilities
In reply to Khem Rajpr,openssl,chown,chgrp are guessed during configure and they are found on host, sometimes under native sysroot and some under HOSTTOOLS which is not right, therefore point to target locations of these tools
Fixes all errors like below
File /usr/sbin/lprng_certs in package lprng contains reference to TMPDIR
--- meta-oe/recipes-extended/lprng/lprng_3.8.C.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-extended/lprng/lprng_3.8.C.bb +3 -1
@@ -14,7 +14,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" inherit autotools gettext -EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost" +EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \ + CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \ + OPENSSL=${bindir}/openssl PRUTIL=${bindir}/pr" FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug" # configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it
PATCH 5/9 python3-pycocotools: Use build pep517-backend
In reply to Khem Raj--- .../recipes-devtools/python/python3-pycocotools_2.0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb +1 -1
@@ -3,7 +3,7 @@ SUMMARY = "COCO is a large image dataset designed for object detection, segmenta LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://pycocotools/coco.py;beginline=45;endline=45;md5=12cb539683cf245df8b6ce782d78f647" -inherit setuptools3 pypi +inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "8f2bcedb786ba26c367a3680f9c4eb5b2ad9dccb2b34eaeb205e0a021e1dfb8d"
PATCH 6/9 sharutils: Let POSIX_SHELL be overridable from environment
In reply to Khem RajThis helps fix
WARNING: sharutils-4.15.2-r0 do_package_qa: QA Issue: File /usr/bin/shar in package sharutils contains reference to TMPDIR
--- ...t-POSIX_SHELL-from-the-environment-d.patch | 47 +++++++++++++++++++ .../sharutils/sharutils_4.15.2.bb | 3 ++ 2 files changed, 50 insertions(+) create mode 100644 meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch
meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch new file +47 -0
@@ -0,0 +1,47 @@ +From fb8bf1c1b1d0bf8e9bc637c0e67219fab1a9eb03 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 14 Aug 2024 15:24:57 -0700 +Subject: [PATCH] libopts.m4: accept POSIX_SHELL from the environment during + the configure step + +This lets us set it to the canonical path /bin/bash, even on systems +where both /bin/bash and /usr/bin/bash are available, and therefore +which(1) might return /usr/bin/bash (depending on PATH order). + +Both copies of libopts.m4 are marked as generated files, but the files +from which they were generated do not seem to be present in the sharutils +package. This change is equivalent to part of a 2016 autogen commit +<https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a>. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a] + +Signed-off-by: Khem Raj <[email protected]> +--- + libopts/m4/libopts.m4 | 1 + + m4/libopts.m4 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4 +index 1a896d9..3b88426 100644 +--- a/libopts/m4/libopts.m4 ++++ b/libopts/m4/libopts.m4 +@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do ++ test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which bash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which dash` +diff --git a/m4/libopts.m4 b/m4/libopts.m4 +index c7ba4f3..a1127e1 100644 +--- a/m4/libopts.m4 ++++ b/m4/libopts.m4 +@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do ++ test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which bash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which dash`
meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +3 -0
@@ -13,10 +13,13 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-building-with-GCC-10.patch \ file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ + file://0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch \ " SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" +EXTRA_OECONF = "POSIX_SHELL=${base_bindir}/sh" + do_install:append() { if [ -e ${D}${libdir}/charset.alias ] then
PATCH 7/9 freediameter: Fix buildpaths QA error
In reply to Khem Raj--- ...lags-for-carrying-user-specified-par.patch | 39 +++++++++++++++++++ .../freediameter/freediameter_1.5.0.bb | 9 +++-- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch
meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch new file +39 -0
@@ -0,0 +1,39 @@ +From fa6227d92725af5ae17b8435c0d50d92ff7a575c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 14 Aug 2024 19:32:25 -0700 +Subject: [PATCH] bison/flex: Add flags for carrying user specified parameters + +This helps in passing cmdline to flex and bison e.g. to remove lines +from generated output to avoid absolute paths + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + cmake/Modules/CMakeUserUseBison.cmake | 1 + + cmake/Modules/CMakeUserUseFlex.cmake | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/cmake/Modules/CMakeUserUseBison.cmake b/cmake/Modules/CMakeUserUseBison.cmake +index 9257545..b61bd0e 100644 +--- a/cmake/Modules/CMakeUserUseBison.cmake ++++ b/cmake/Modules/CMakeUserUseBison.cmake +@@ -52,6 +52,7 @@ IF(BISON_EXECUTABLE) + OUTPUT "${OUTFILE}" "${HEADER}" + COMMAND "${BISON_EXECUTABLE}" + ARGS "--name-prefix=${PREFIX}" ++ "${BISON_TARGET_ARG_COMPILE_FLAGS}" + "--defines" + "--output-file=${OUTFILE}" + "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" +diff --git a/cmake/Modules/CMakeUserUseFlex.cmake b/cmake/Modules/CMakeUserUseFlex.cmake +index 7d0394f..1221dca 100644 +--- a/cmake/Modules/CMakeUserUseFlex.cmake ++++ b/cmake/Modules/CMakeUserUseFlex.cmake +@@ -39,6 +39,7 @@ IF(FLEX_EXECUTABLE) + OUTPUT "${OUTFILE}" + COMMAND "${FLEX_EXECUTABLE}" + ARGS "-P${PREFIX}" ++ "${FLEX_TARGET_ARG_COMPILE_FLAGS}" + "-o${OUTFILE}" + "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb +5 -4
@@ -7,7 +7,7 @@ Accounting needs." HOMEPAGE = "http://www.freediameter.net" -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" +DEPENDS = "flex-native bison-native cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -23,6 +23,7 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast file://freeDiameter.conf \ file://install_test.patch \ file://0001-tests-use-EXTENSIONS_DIR.patch \ + file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \ " S = "${WORKDIR}/git"
@@ -49,6 +50,8 @@ EXTRA_OECMAKE = " \ -DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \ -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \ -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ " # INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX # specify it on cmd line will fix the SET bug in CMakeList.txt
@@ -107,15 +110,13 @@ EOF # create self cert openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}' openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 - - find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \; } do_install_ptest() { mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ rmdir ${D}${PTEST_PATH}-tests install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ - sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake + sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake }
PATCH 8/9 libforms: Remove buildpaths from fd2ps and fdesign scripts
In reply to Khem Raj--- meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb | 5 +++++ 1 file changed, 5 insertions(+)
meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb +5 -0
@@ -24,3 +24,8 @@ DEPENDS = "libxpm jpeg libx11 virtual/libgl" RDEPENDS:${PN} = "bash" EXTRA_OECONF = "--with-extra-inc=${S}/lib" + +do_compile:append() { + sed -i -e 's|${B}|.|' ${B}/fd2ps/fd2ps + sed -i -e 's|${B}|.|' ${B}/fdesign/fdesign +}
PATCH 9/9 blueman: Fix buildpathe issue with cython generated code
In reply to Khem Raj--- ...n-DO-not-emit-absolute-path-when-S-B.patch | 38 +++++++++++++++++++ .../blueman/blueman_2.4.3.bb | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch
meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 18af739fd96960bbc8c5db5dd290d2f9134cd347 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 14 Aug 2024 21:26:24 -0700 +Subject: [PATCH] meson: DO not emit absolute path when S != B + +build systems like OE build outside sourcetree in such cases it works +ok but cython resolves the input file to absolute path and that gets +emitted into genetate _blueman.c as module name, renders the build +non-reproducible, wish cython had a better way to handle this but there +is not, therefore tweak the meson build rule to account for specifying +workdir to cython which will search the inputs correctly, and use +meson's build_root to emit the output into build dir. This ensures that +it becomes independent of source or build directories and cython does +not generate the absolute paths into generate C code. + +See cython discussion on [1] + +[1] https://github.com/cython/cython/issues/5949 + +Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461] +Signed-off-by: Khem Raj <[email protected]> +--- + module/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module/meson.build b/module/meson.build +index 096ad7c8..e3d96f17 100644 +--- a/module/meson.build ++++ b/module/meson.build +@@ -4,7 +4,7 @@ blueman_c = custom_target( + 'blueman_c', + output: '_blueman.c', + input: '_blueman.pyx', +- command: [cython, '--output-file', '@OUTPUT@', '@INPUT@']) ++ command: [cython, '-w', meson.source_root(), '--output-file', meson.build_root() + '/' + '@OUTPUT@', '@INPUT@']) + + sources = [ + blueman_c,
meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb +2 -1
@@ -8,7 +8,8 @@ inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache u REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable" +SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable \ + file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch" S = "${WORKDIR}/git" SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f"