subtree updates
meta-security: ddf301c45c..5c2379f4bc:
Armin Kuster (2):
samhain: Update to 4.4.10
layer.conf: Insert addpylib declaration
John Edward Broadbent (1):
libhoth_git.bb:SRCREV bump 1622e8a04..d769296220d
meta-openembedded: 0474e0b870..829dcb63f0:
Alexander Stein (2):
libcamera: Allow overwriting default pipelines and IPA
libcamera: Simplify pipeline configuration
Christophe Vu-Brugier (1):
exfatprogs: upgrade 1.2.0 -> 1.2.1
Denys Zagorui (2):
bpftool: Fix externalsrc support
bpftool: return do_configure dependency
Joe Slater (2):
bats: use baselib
libgpiod: modify test 'gpioset: toggle (continuous)'
Johannes Kauffmann (2):
open62541: rename encryption PACKAGECONFIG
open62541: add OpenSSL as crypto provider
Khem Raj (52):
gerbera: Fix build with fmt 10+
mpd: Fix build with clang-16
ptest-packagelists-meta-oe: Remove nodejs ptests for rv32/rv64
libpeas: Fix reference to TMPDIR in tests
lirc: Define SH_PATH=/bin/sh
libwebsockets: Fix reference to TMPDIR
mce-inject: Pass CFLAGS to make
mcelog: Upgrade to 194
xrdb: Pass target CPP location to configure
mce-test: Update to latest
mce-test: Pass CFLAGS to make
ippool: Port to using ppp 2.5.x
ippool: Enable systemd service on install
libtraceevent: Delete
meta-oe-ptests: Add mcelog to PTESTS_FAST_META_OE
ptest-packagelists-meta-python: Add python3-pylint to PTESTS_FAST_META_PYTHON
oscam: Upgrade to 11718
oscam: Fix buildpaths in generated sources
lockfile-progs: Pass DEBUG_PREFIX_MAP options
tvheadend: Upgrade to latest master
nbdkit: Remove buildpaths from binaries
system-config-printer: Delete __pycache__ files
dovecot: Upgrade to 2.3.20
dovecot: Do not install dovecot-config
mpv: Remove references to builddir from mpv binary
libnice: Remove buildpaths from binaries
curlpp: Remove references to buildpaths e.g. TMPDIR
unbound: Remove references to buildpaths
fftw: Check for TOOLCHAIN_OPTIONS to be non-empty before sed ops
aom: Upgrade to 3.6.1
aom: Pass nasm flags via toochain.cmake
uml-utilities: Fix references to TMPDIR
openct: Fix buildpaths being emitted into generated types.h
babeld: Upgrade to 1.12.2
nautilus: Fix buildpath QA errors
minifi-cpp: Remove references to buildpaths in generated files
freerdp: Fix reference to TMPDIR in libfreerdp2.so
vlc: Remove WORKDIR from CONFIGURE_LINE definition
system-config-printer: Check for gobject-introspection as well in distro features
packagegroup-xfce-extended: Blueman also needs gobject introspection distro feature
remmina: Fix buildpaths QA warnings
cgdb: Fix buildpaths emitted into cgdb binary
ibus: Point python interpreter to target location
eog: Fix absolute src paths in generated files
gimp: Fix buildpaths in binaries and scripts
libgphoto2: Edit out sysroot from CC variable in configure
tracker: Point TOP_SRCDIR to target path
vlan: Pass CFLAGS via CCFLAGS
sgpio: Pass CFLAGS to make
x265: Pass --debug-prefix-map to nasm
ipmiutil: Upgrade to 3.1.9
ipmiutil: Pass --enable-useflags
Marek Vasut (1):
lvgl: lvgl-demo-fb: Switch to CMake and add DRM and SDL support
Markus Volk (7):
evince: edit include path for debug package
pipewire: update 0.3.70 -> 0.3.71
dav1d: update 1.1.0 -> 1.2.0
gnome-control-center: update 43.2 -> 44.1
mutter: update 43.1 -> 44.1
gnome-shell: update 43.2 -> 44.1
fluidsynth: update 2.2.6 -> 2.3.2
Martin Jansa (20):
libsquish: remove unused 0001-makefile-Add-LIBDIR.patch
meta-python: remove unused patches from python2 recipes
python3-pybind11: remove unused 0001-Do-not-strip-binaries.patch
python3-anyjson: remove unused files
monkey: remove unused patch file
gnome-terminal: remove unused patch file
geary: remove unused patch files
ndpi: remove unused CVE-2021-36082.patch
soci: remove unused soci_libdir.patch
cyrus-sasl: remove unused patch file
plymouth: remove unused patch file
glibmm: remove unused remove-examples.patch
opencv: remove unused patch file
libiio: remove unused patch file
libinih: remove unused patch file
beep: remove unused linux-input.patch
paho-mqtt-c: remove unused patch file
tigervnc: remove unused patch file
fbida: remove unused use-jpeg-turbo.patch
graphviz: remove unused patch files
Martin Siegumfeldt (1):
libiio: update to version 0.24
Mingli Yu (1):
php: Link with libatomic on rv64
Peter Bergin (6):
redis-plus-plus: clean up recipe and make use of packageconfig
redis-plus-plus: introduce fix for library detection
redis-plus-plus: uprev to 1.3.8
hiredis: uprev to 1.1.0
hiredis: change dependency to redis
hiredis: add ptest
Ross Burton (38):
libblockdev: add PACKAGECONFIG for tools
libblockdev: clean up DEPENDS
glade: add autoconf-archive-native DEPENDS
python3-kivy: depend on gobject-introspection-data DISTRO_FEATURE
vte9: add missing dependency on glib-2.0-native
libgxim: add autoconf-archive-native DEPENDS
gnome-common: add autoconf-archive RDEPENDS
graphviz: no longer needs intltool-native
libpeas: depend on gobject-introspection-data
system-config-printer: clean up DEPENDS
imsettings: add missing DEPENDS on autoconf-archive-native
python3-pyatspi: make dependent on gobject-introspection-data being enabled
gnome-menu: remove redundant dependencies
hplip: build against libusb1
hplip: remove redundant FILES:${PN}-dbg
gutenprint: rewrite recipe and update
gutenprint: match ownership on /etc/cups
python3-pydbus-manager: remove obsolete recipe
python3-pydbus: remove obsolete recipe
firewalld: add features_check on gobject-introspection-data
blueman: add features_check on gobject-introspection-data
networkd-dispatcher: add features_check on gobject-introspection-data
python3-asyncio-glib: add features_check on gobject-introspection-data
eog: requires gobject-introspection-data DISTRO_FEATURE
grilo-plugins: add PACKAGECONFIG for tracker
packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled
libpeas: requires gobject-introspection-data DISTRO_FEATURE
gnome-desktop: gobject-introspection is not in fact mandatory
gnome-photos: requires gobject-introspection-data DISTRO_FEATURE
geoclue: the library doesn't need gobject-introspection
nautilus: requires gobject-introspection-data DISTRO_FEATURE
packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled
python3-blivetgui: requires gobject-introspection-data DISTRO_FEATURE
xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor
catfish: requires gobject-introspection-data DISTRO_FEATURE
menulibre: requires gobject-introspection-data DISTRO_FEATURE
xfce4-panel-profiles: requires gobject-introspection-data DISTRO_FEATURE
networkmanager: add dependency on pyhthon3-pygobject-native
Sanjay Chitroda (1):
gnulib: Update recipe name to 2018-12-18
Thomas Perrot (1):
networkmanager: Turn ppp support into a packageconfig option
Wang Mingyu (43):
fmt: upgrade 9.1.0 -> 10.0.0
spdlog: fix build error for master fmt
mpd: fix build error when fmt updated
gensio: upgrade 2.6.4 -> 2.6.5
ctags: upgrade 6.0.20230507.0 -> 6.0.20230521.0
libirecovery: upgrade 1.0.1 -> 1.1.0
hidapi: upgrade 0.13.1 -> 0.14.0
double-conversion: upgrade 3.2.1 -> 3.3.0
adw-gtk3: upgrade 4.6 -> 4.7
gnome-terminal: upgrade 3.48.0 -> 3.48.1
grilo: upgrade 0.3.15 -> 0.3.16
lldpd: upgrade 1.0.16 -> 1.0.17
f2fs-tools: upgrade 1.15.0 -> 1.16.0
dbus-cxx: upgrade 2.3.1 -> 2.4.0
mailcap: upgrade 2.1.53 -> 2.1.54
c-ares: upgrade 1.19.0 -> 1.19.1
fetchmail: upgrade 6.4.23 -> 6.4.37
python3-flask-restful: upgrade 0.3.9 -> 0.3.10
python3-dominate: upgrade 2.7.0 -> 2.8.0
python3-antlr4-runtime: upgrade 4.12.0 -> 4.13.0
python3-coverage: upgrade 7.2.5 -> 7.2.6
python3-imageio: upgrade 2.28.1 -> 2.29.0
ostree: upgrade 2023.2 -> 2023.3
python3-asgiref: upgrade 3.6.0 -> 3.7.1
python3-can: upgrade 4.2.0 -> 4.2.1
python3-u-msgpack-python: upgrade 2.7.2 -> 2.8.0
python3-astroid: upgrade 2.15.4 -> 2.15.5
python3-protobuf: upgrade 4.23.0 -> 4.23.1
python3-pulsectl: upgrade 23.5.1 -> 23.5.2
python3-django: upgrade 4.1.7 -> 4.2.1
python3-google-auth: upgrade 2.18.0 -> 2.18.1
python3-pytest-xdist: upgrade 3.3.0 -> 3.3.1
python3-sqlalchemy: upgrade 2.0.13 -> 2.0.15
python3-xlsxwriter: upgrade 3.1.0 -> 3.1.1
python3-websocket-client: upgrade 1.5.1 -> 1.5.2
zchunk: upgrade 1.3.0 -> 1.3.1
python3-stevedore: upgrade 5.0.0 -> 5.1.0
python3-sentry-sdk: upgrade 1.22.2 -> 1.24.0
rdma-core: upgrade 45.0 -> 46.0
valijson: upgrade 1.0 -> 1.0.1
python3-tzlocal: upgrade 4.3 -> 5.0.1
python3-xmlschema: upgrade 2.2.3 -> 2.3.0
setxkbmap: upgrade 1.3.3 -> 1.3.4
Xiangyu Chen (2):
Revert "pahole: fix native package build error"
libbpf: installing uapi headers for native package
Zhang Xiao (1):
dhcp-relay: dev subpackage conflicts with bind-dev
richardhb (1):
python3-bleak: add recipe
ricoheller (3):
python3-dbus-fast: add recipe
python3-aioredis: add recipe
mbpoll: add recipe
poky: 35e5d29a7d..76494f2b66:
Alexander Kanavin (23):
glib-2.0: upgrade 2.74.6 -> 2.76.2
ppp: upgrade 2.4.9 -> 2.5.0
ovmf: update 202211 -> 202302
btrfs-tools: update 6.1.3 -> 6.3
erofs-utils: update 1.5 -> 1.6
llvm: update 15.0.7 -> 16.0.3
perlcross: update 1.4 -> 1.4.1
perl: update 5.36.0 -> 5.36.1
rpm: update 4.18.0 -> 4.18.1
less: update 608 -> 633
librsvf: update 2.54.5 -> 2.56.0
libva: update 2.16 -> 2.18
cryptodev: remove unneeded patch
gpgme: update 1.18.0 -> 1.20.0
libatomic-ops: update 7.6.14 -> 7.8.0
libgcrypt: update 1.10.1 -> 1.10.2
libgpg-error: update 1.46 -> 1.47
createrepo-c: update 0.20.1 -> 0.21.1
elfutils: update 0.188 -> 0.189
meson: update 1.0.1 ->1.1.0
gdb: trim python support RDEPENDS
gdb: enable python PACKAGECONFIG
valgrind: update 3.20.0 -> 3.21.0
Antonin Godard (1):
archiver: move exclusion logic in a dedicated function
Anuj Mittal (4):
gsettings-desktop-schemas: upgrade 43.0 -> 44.0
harfbuzz: upgrade 7.1.0 -> 7.3.0
libevdev: upgrade 1.13.0 -> 1.13.1
libsoup: upgrade 3.4.0 -> 3.4.2
Arno Baumfalk (1):
bitbake: fetch2/npm: evaluate PATH before patching HOME
Bartosz Golaszewski (17):
python3-attrs: unify RDEPENDS
python3-attrs: don't use PYTHON_PN
python3-attrs: add missing run-time dependencies
python3-certifi: add missing run-time dependencies
python3-hypothesis: fix run-time dependencies
python3-tomli: add missing run-time dependencies
python3-pathspec: add missing run-time dependencies
python3-installer: add missing run-time dependencies
python3-sphinx-rtd-theme: add missing run-time dependencies
python3-setuptools-rust: fix RDEPENDS and allow target build
python3-pyproject-hooks: add missing run-time dependencies
python3-pycryptodome: don't use PYTHON_PN
python3-pycryptodome: add missing run-time dependencies
python3-pygobject: add missing run-time dependencies
python3-manifest: cgitb: new package
python3-manifest: zipapp: new package
python3-manifest: turtle: new package
Bergin, Peter (1):
bitbake: lib/bb/tests/fetch.py: set initial branch
Chen Qi (2):
oe-buildenv-internal: remove path from previous project
staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot
Chi Xu (1):
expect: Add ptest support
Deepthi Hemraj (1):
binutils: stable 2.40 branch updates
Denys Dmytriyenko (2):
grep: upgrade 3.10 -> 3.11
xz: upgrade 5.4.2 -> 5.4.3
Eero Aaltonen (1):
avahi: fix D-Bus introspection
Frieder Schrempf (1):
psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox
Geoff Parker (1):
libwebp: add BBCLASSEXTEND
Kai Kang (1):
pm-utils: fix multilib conflictions
Khem Raj (8):
llvm: Enable RISCV support
llvm,mesa: Drop MESA_LLVM_RELEASE
systemd: Drop a backport
go: Upgrade 1.20.1 -> 1.20.4
go: Use -no-pie to build target cgo
gcc: Upgrade to GCC 13.1 release
bitbake.conf: Add -fcanon-prefix-map to DEBUG_PREFIX_MAP
perf: Fix build with gcc-13
Leon Anavi (1):
wic: Add argument --hidden to default imager
Lorenzo Arena (1):
conf: add nice level to the hash config ignred variables
Martin Jansa (11):
kernel-devicetree: make shell scripts posix compliant
go.bbclass: don't use test to check output from ls
image-live.bbclass: respect IMAGE_MACHINE_SUFFIX
binutils: package static libs from gprofng
rpm: drop unused 0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch
libx11: remove unused patch and FILESEXTRAPATHS
qemu: remove unused qemu-7.0.0-glibc-2.36.patch
minicom: remove unused patch files
inetutils: remove unused patch files
libgloss: remove unused patch file
kmod: remove unused ptest.patch
Max Krummenacher (4):
libtraceevent: import from meta-openembedded
libtraceevent: fix qa issue reference to tmpdir
perf: make pkg-config available
perf: add libtraceevent packageconfig
Mikko Rapeli (3):
qemurunner: support serial console login via qemu stdout
qemurunner: avoid leaking server_socket
qemurunner: add boot logs to do_testimage task logs in real time
Pavel Zhukov (1):
lib/terminal.py: Add urxvt terminal
Peter Kjellerstedt (5):
glib-2.0: Avoid having g_futex_simple() inadvertently modify errno
musl: Correct SRC_URI
xf86-video-intel: Use the HTTPS protocol to fetch the Git repositories
bitbake: fetch2/crate: Simplify extraction of crate names and versions from URIs
bitbake: fetch2/crate: Correct unpack for a crate that matches the recipe name
Qiu Tingting (1):
e2fsprogs: Fix error SRCDIR when using usrmerge DISTRO_FEATURES
Randolph Sapp (2):
package: enable recursion on file globs
kernel-devicetree: recursively search for dtbs
Randy MacLeod (1):
vim: upgrade 9.0.1429 -> 9.0.1527
Ranjitsinh Rathod (1):
kmscube: Correct DEPENDS to avoid overwrite
Richard Purdie (9):
bitbake: cooker: Fix/improve collections handling
bitbake: fetch2: Clarify different localpaths functions
bitbake: fetch2/local: Add debug to include chosen path
bitbake.conf: Empty SRC_URI for code parser cache handling
bitbake: cooker: Add FILE_LAYERNAME variable containing the layername for a recipe
linux-yocto: Drop 5.15 support
lttng-tools: Add patch to fix gcc 13 test issue
glib-2.0: Fix TMPDIR mismatch test failures
linux-yocto: Drop 5.15 support
Robert Joslyn (1):
curl: Update from 8.0.1 to 8.1.0
Ross Burton (23):
cpio: upgrade to 2.14
gnutls: add PACKAGECONFIG for DANE
gnutls: add PACKAGECONFIG options for certification compression
gnutls: use system libtasn1
gnutls: clean up ptest compilation
gnutls: remove use of argp-standalone for musl
glib-networking: fix LICENSE statement
glib-networking: add gnomeproxy PACKAGECONFIG
glib-networking add environment variable proxy PACKAGECONFIG
qemu: add PACKAGECONFIG for debuginfo support
meta: depend on autoconf-archive-native, not autoconf-archive
gobject-introspection: always DEPEND on gobject-introspection-native
python3-pygobject: remove explicit gobject-introspection DEPENDS
gconf: remove explicit gobject-introspection DEPENDS
gi-docgen.bbclass: depends on gobject-introspection-data being enabled
python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
gstreamer1.0-python: mandate gobject-introspection-data DISTRO_FEATURE
python3-gitdb: remove python3-async dependency
python3-async: remove recipe
libcheck: add ghetto automake output
libnl: clean up ptest
libcomps: clean up DEPENDS
gdbm: improve run-ptest
Sudip Mukherjee (2):
dhcpcd: upgrade to v10.0.1
libxi: upgrade to v1.8.1
Thomas Roos (2):
oeqa: adding selftest-hello and use it to speed up tests
oeqa/selftest/cases/devtool.py: skip all tests require folder a git repo
Tom Hochstein (1):
piglit: Add missing glslang dependencies
Trevor Gamblin (2):
python3-hatchling: upgrade 1.14.1 -> 1.17.0
python3-trove-classifiers: upgrade 2023.4.29 -> 2023.5.2
Wang Mingyu (1):
iso-codes: upgrade 4.13.0 -> 4.15.0
meta-raspberrypi: 928bb234bb..9240ea91ca:
Zachary T Welch (1):
machines: simplify MACHINEOVERRIDES definitions
meta-arm: f9d80e1a14..5cbe3041be:
Clément Péron (5):
arm/lib: pass the PATH to fvp runner
scripts/runfvp: Fix KeyError exception when there is no FVP_CONSOLE provided
runfvp: make fvp runner to hold the config
fvp: runner: execute fvp process in the same working directory as fvpconf
runfvp: update filepath in fvpconf to relative path
Jon Mason (2):
arm-bsp/tc1: use latest kernel and u-boot
arm-bsp/tc1: re-enable signed kernel image
Ross Burton (2):
arm/lib/fvp: remove redundant trailing commas
arm-bsp/fvp-base: remove u-boot version pinning
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: If7df9ee24ecd0b574eeb9ca799dd15d915d4ec42
diff --git a/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
index 0c15cc7..8ed3928 100644
--- a/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
+++ b/poky/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch
@@ -1,4 +1,4 @@
-From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001
+From ee1421f7a7a9f31400ba992a5be52b88d20170c9 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 10 May 2019 14:18:04 +0800
Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc."
@@ -10,36 +10,21 @@
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
---
- src/gpgme.m4 | 58 +++++++++-------------------------------------------
- 1 file changed, 10 insertions(+), 48 deletions(-)
+ src/gpgme.m4 | 54 ++++++++--------------------------------------------
+ 1 file changed, 8 insertions(+), 46 deletions(-)
diff --git a/src/gpgme.m4 b/src/gpgme.m4
-index c749a5d..8579146 100644
+index f2906c1..8cc2898 100644
--- a/src/gpgme.m4
+++ b/src/gpgme.m4
-@@ -1,5 +1,5 @@
- # gpgme.m4 - autoconf macro to detect GPGME.
--# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH
-+# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH
- #
- # This file is free software; as a special exception the author gives
- # unlimited permission to copy and/or distribute it, with or without
-@@ -9,7 +9,7 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- #
--# Last-changed: 2020-11-20
-+# Last-changed: 2014-10-02
-
-
- AC_DEFUN([_AM_PATH_GPGME_CONFIG],
-@@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+@@ -125,24 +125,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
fi
fi
- use_gpgrt_config=""
-- if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
- if $GPGRT_CONFIG gpgme --exists; then
- GPGME_CONFIG="$GPGRT_CONFIG gpgme"
- AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
@@ -61,7 +46,7 @@
fi
gpgme_version_major=`echo $gpgme_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-@@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+@@ -155,16 +141,12 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK],
[
@@ -80,7 +65,7 @@
*** built for $gpgme_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-gpgme-prefix
-@@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME],
+@@ -225,11 +207,7 @@ AC_DEFUN([AM_PATH_GPGME],
# If we have a recent GPGME, we should also check that the
# API is compatible.
if test "$req_gpgme_api" -gt 0 ; then
@@ -93,7 +78,7 @@
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -372,11 +350,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
# If we have a recent GPGME, we should also check that the
# API is compatible.
if test "$req_gpgme_api" -gt 0 ; then
@@ -106,7 +91,7 @@
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -385,20 +359,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
fi
fi
if test $ok = yes; then
@@ -129,6 +114,3 @@
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
_AM_PATH_GPGME_CONFIG_HOST_CHECK
---
-2.25.1
-
diff --git a/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
index 3b2f59c..738b23c 100644
--- a/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
+++ b/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
@@ -1,4 +1,4 @@
-From 0d7ec5b98dc6cbd35f56deaecec5ecfdaa944aee Mon Sep 17 00:00:00 2001
+From f8221238d51066b7a1a5f2917cce2791876ea8b0 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 10 May 2019 14:23:55 +0800
Subject: [PATCH] pkgconfig
@@ -19,17 +19,17 @@
---
configure.ac | 1 +
src/Makefile.am | 4 +-
- src/gpgme-pthread.pc.in | 15 ++++++
- src/gpgme.m4 | 114 +++-------------------------------------
+ src/gpgme-pthread.pc.in | 15 +++++
+ src/gpgme.m4 | 119 +++-------------------------------------
src/gpgme.pc.in | 4 +-
- 5 files changed, 28 insertions(+), 110 deletions(-)
+ 5 files changed, 29 insertions(+), 114 deletions(-)
create mode 100644 src/gpgme-pthread.pc.in
diff --git a/configure.ac b/configure.ac
-index 9d696b9..5b4e730 100644
+index d1b9aca..9c4f97c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -926,6 +926,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+@@ -1043,6 +1043,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
src/gpgme-glib.pc
src/gpgme.h)
AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -77,10 +77,10 @@
+Cflags: -I${includedir}
+Requires: libassuan gpg-error
diff --git a/src/gpgme.m4 b/src/gpgme.m4
-index 71b0010..5821895 100644
+index 8cc2898..0ff550e 100644
--- a/src/gpgme.m4
+++ b/src/gpgme.m4
-@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script
+@@ -168,7 +168,7 @@ dnl config script does not match the host specification the script
dnl is added to the gpg_config_script_warn variable.
dnl
AC_DEFUN([AM_PATH_GPGME],
@@ -89,7 +89,7 @@
tmp=ifelse([$1], ,1:0.4.2,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
-@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME],
+@@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME],
min_gpgme_version="$tmp"
fi
@@ -128,7 +128,7 @@
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME],
+@@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME],
fi
fi
if test $ok = yes; then
@@ -148,44 +148,45 @@
])
dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
-@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
+@@ -236,9 +204,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
dnl and GPGME_PTHREAD_LIBS.
dnl
- AC_DEFUN([AM_PATH_GPGME_PTHREAD],
--[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+-AC_DEFUN([AM_PATH_GPGME_PTHREAD],[
+- AC_OBSOLETE([$0], [; use AM_PATH_GPGME instead to use GPGME_CFLAGS and GPGME_LIBS])dnl
+- AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
++AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+[
tmp=ifelse([$1], ,1:0.4.2,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
-@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+@@ -248,40 +215,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[
min_gpgme_version="$tmp"
fi
- AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version)
- ok=no
- if test "$GPGME_CONFIG" != "no" ; then
-- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then
-- req_major=`echo $min_gpgme_version | \
+- req_major=`echo $min_gpgme_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-- req_minor=`echo $min_gpgme_version | \
+- req_minor=`echo $min_gpgme_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-- req_micro=`echo $min_gpgme_version | \
+- req_micro=`echo $min_gpgme_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-- if test "$gpgme_version_major" -gt "$req_major"; then
+- if test "$gpgme_version_major" -gt "$req_major"; then
- ok=yes
-- else
+- else
- if test "$gpgme_version_major" -eq "$req_major"; then
-- if test "$gpgme_version_minor" -gt "$req_minor"; then
-- ok=yes
-- else
-- if test "$gpgme_version_minor" -eq "$req_minor"; then
-- if test "$gpgme_version_micro" -ge "$req_micro"; then
-- ok=yes
-- fi
+- if test "$gpgme_version_minor" -gt "$req_minor"; then
+- ok=yes
+- else
+- if test "$gpgme_version_minor" -eq "$req_minor"; then
+- if test "$gpgme_version_micro" -ge "$req_micro"; then
+- ok=yes
+- fi
+- fi
- fi
-- fi
- fi
-- fi
- fi
- fi
+ PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no])
@@ -193,17 +194,21 @@
# If we have a recent GPGME, we should also check that the
# API is compatible.
if test "$req_gpgme_api" -gt 0 ; then
-- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+- if test -z "$use_gpgrt_config"; then
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+- else
+- tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
+- fi
+ tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0`
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+@@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[
fi
fi
if test $ok = yes; then
-- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags`
-- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
+- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --cflags`
+- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --libs`
- AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
_AM_PATH_GPGME_CONFIG_HOST_CHECK
@@ -218,7 +223,7 @@
])
-@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
min_gpgme_version="$tmp"
fi
@@ -257,7 +262,7 @@
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
fi
fi
if test $ok = yes; then
@@ -276,15 +281,15 @@
- AC_SUBST(GPGME_GLIB_LIBS)
])
diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
-index 80d59de..932645b 100644
+index 9ddef5c..932645b 100644
--- a/src/gpgme.pc.in
+++ b/src/gpgme.pc.in
@@ -9,6 +9,6 @@ Name: gpgme
Description: GnuPG Made Easy to access GnuPG
Requires.private: gpg-error, libassuan
Version: @PACKAGE_VERSION@
--Cflags: -I${includedir} @GPGME_CONFIG_CFLAGS@
--Libs: -L${libdir} @GPGME_CONFIG_LIBS@
+-Cflags: @GPGME_CONFIG_CFLAGS@
+-Libs: @GPGME_CONFIG_LIBS@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lgpgme
URL: https://www.gnupg.org/software/gpgme/index.html
diff --git a/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
index ecd1793..0d26929 100644
--- a/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
+++ b/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
@@ -1,7 +1,7 @@
-From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001
+From 9fce0689bc04506e5758444efa24ea99fe1ff5ef Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 10 May 2019 14:30:36 +0800
-Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used
+Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used
gpg-error-config was modified by OE to always return an error.
So we want to find an alternative way to retrieve whatever it
@@ -14,39 +14,23 @@
Rebase to 1.13.0
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
---
- lang/python/setup.py.in | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
+ lang/python/setup.py.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
-index 9785a28..006216d 100755
+index 6f36861..1d9058b 100755
--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
-@@ -30,7 +30,6 @@ import subprocess
- import sys
-
- # Out-of-tree build of the gpg bindings.
--gpg_error_config = ['gpg-error-config']
- gpgme_config_flags = ['--thread=pthread']
- gpgme_config = ['gpgme-config'] + gpgme_config_flags
- gpgme_h = ''
-@@ -182,15 +181,9 @@ class BuildExtFirstHack(build):
+@@ -169,9 +169,8 @@ class BuildExtFirstHack(build):
def _generate_errors_i(self):
-- try:
-- subprocess.check_call(
-- gpg_error_config + ['--version'], stdout=devnull)
-- except:
-- sys.exit('Could not find gpg-error-config. ' +
-- 'Please install the libgpg-error development package.')
-
+- ge_cflags='@GPG_ERROR_CFLAGS@'
gpg_error_content = self._read_header(
-- 'gpg-error.h', getconfig('cflags', config=gpg_error_config))
+- 'gpg-error.h', ge_cflags.split(' ') if ge_cflags else [])
+ "gpg-error.h", os.environ.get('CFLAGS').split())
filter_re = re.compile(r'GPG_ERR_[^ ]* =')
rewrite_re = re.compile(r' *(.*) = .*')
---
-2.7.4
-
diff --git a/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch
index dfea1bf..214cf34 100644
--- a/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch
+++ b/poky/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch
@@ -1,4 +1,4 @@
-From 5bbf7a048b6d81d23186340e839f9f65b5b514b6 Mon Sep 17 00:00:00 2001
+From 94cf9f8fc79c0d1d4529cebdd74328927fda36a2 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Fri, 10 May 2019 16:19:54 +0800
Subject: [PATCH] do not auto check var-PYTHON
@@ -14,18 +14,19 @@
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 5ef00c0..bbcff93 100644
+index df218ec..6a619ef 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -425,8 +425,8 @@ if test "$found_py" = "1"; then
+@@ -521,9 +521,8 @@ if test "$found_py" = "1"; then
if test "$found_py" = "1" -o "$found_py3" = "1"; then
# Reset everything, so that we can look for another Python.
m4_foreach([mym4pythonver],
-- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]],
+- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],
+- [3.11],[3.12],[all]],
- [unset PYTHON
+ [[2.7],[3.7]],
+ [
diff --git a/poky/meta/recipes-support/gpgme/gpgme_1.18.0.bb b/poky/meta/recipes-support/gpgme/gpgme_1.20.0.bb
similarity index 97%
rename from poky/meta/recipes-support/gpgme/gpgme_1.18.0.bb
rename to poky/meta/recipes-support/gpgme/gpgme_1.20.0.bb
index deea6f3..dc5b58d 100644
--- a/poky/meta/recipes-support/gpgme/gpgme_1.18.0.bb
+++ b/poky/meta/recipes-support/gpgme/gpgme_1.20.0.bb
@@ -25,7 +25,7 @@
file://0001-autogen.sh-remove-unknown-in-version.patch \
"
-SRC_URI[sha256sum] = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"
+SRC_URI[sha256sum] = "25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750"
PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}"