* [hardknott 01/36] libsmi: use /bin/sh instead of ${base_bindir}/sh to silence QA error with usrmerge
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 02/36] libyui: switch to libyui-old repo which still has this SRCREV akuster
` (35 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Martin Jansa <Martin.Jansa@gmail.com>
* with usrmerge ${base_bindir} is /usr/bin/sh and libsmi fails with:
ERROR: libsmi-0.5.0-r0 do_package_qa: QA Issue: /usr/bin/smistrip contained in package libsmi requires /usr/bin/sh, but no providers found in RDEPENDS_libsmi? [file-rdeps]
ERROR: libsmi-0.5.0-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.
* this is a bit strange as busybox does install /usr/bin/sh file:
./1.33.0-r0.usrmerge/image/usr/bin/sh
./1.33.0-r0.default/image/bin/sh
but also adds /bin/sh to RPROVIDES_${PN} for usrmerge in DISTRO_FEATURES:
RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}"
added in:
https://git.openembedded.org/openembedded-core/commit/?id=1f6c14939c8daa5e09103789c3ff5031cc888d16
and 1.33.0-r0.usrmerge/pkgdata/runtime/busybox:FILERPROVIDES_/usr/bin/busybox.nosuid_busybox
correctly contains /usr/bin/sh
* adding runtime dependency on busybox as /usr/bin/sh provider would silence the QA warning
but people might not like adding busybox to their image
* using /bin/sh silences the QA warning as well, because /bin/sh is explicitly ignored in file-rdeps insane.bbclass:
https://git.openembedded.org/openembedded-core/tree/meta/classes/insane.bbclass?id=1f6c14939c8daa5e09103789c3ff5031cc888d16#n907
if "file-rdeps" not in skip:
ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)'])
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 08fad9f3a6d1026eea84906c2ede7a4a2dc93863)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
index 212b1e797c7..ae76fade738 100644
--- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
+++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
@@ -16,7 +16,7 @@ RDEPENDS_${PN} += "wget"
inherit autotools
-EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk"
+EXTRA_OECONF = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk"
do_install_append () {
install -d ${D}${sysconfdir}
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 02/36] libyui: switch to libyui-old repo which still has this SRCREV
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
2021-04-09 2:20 ` [hardknott 01/36] libsmi: use /bin/sh instead of ${base_bindir}/sh to silence QA error with usrmerge akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 03/36] libyui(-ncurses): upgrade to 4.1.1, libyui repo was rewritten completely akuster
` (34 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Martin Jansa <Martin.Jansa@gmail.com>
* af06143017fc5f18c4b6488ba4aed26bcc43ff6e doesn't exist in current repo:
libyui$ git branch -a --contains af06143017fc5f18c4b6488ba4aed26bcc43ff6e
error: no such commit af06143017fc5f18c4b6488ba4aed26bcc43ff6e
* there are no common commits in the new libyui repo, but luckily old
repo is kept as
https://github.com/libyui/libyui-old
similarly libyui-ncurses now contains only README about being obsolete in:
https://github.com/libyui/libyui-ncurses
but at least it wasn't rewritten to have the new content
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 902919167a97055e9be9cd3654f29823e81ae382)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb b/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb
index bba17962e25..e42c178e66f 100644
--- a/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
-SRC_URI = "git://github.com/libyui/libyui.git \
+SRC_URI = "git://github.com/libyui/libyui-old.git \
file://0001-Fix-build-with-clang.patch \
file://0001-Use-relative-install-paths-for-CMake.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 03/36] libyui(-ncurses): upgrade to 4.1.1, libyui repo was rewritten completely
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
2021-04-09 2:20 ` [hardknott 01/36] libsmi: use /bin/sh instead of ${base_bindir}/sh to silence QA error with usrmerge akuster
2021-04-09 2:20 ` [hardknott 02/36] libyui: switch to libyui-old repo which still has this SRCREV akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 04/36] android-tools: use PN instead of BPN in RDEPENDS akuster
` (33 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Martin Jansa <Martin.Jansa@gmail.com>
* af06143017fc5f18c4b6488ba4aed26bcc43ff6e doesn't exist in current repo:
libyui$ git branch -a --contains af06143017fc5f18c4b6488ba4aed26bcc43ff6e
error: no such commit af06143017fc5f18c4b6488ba4aed26bcc43ff6e
* there are no common commits in the new libyui repo, but luckily old
repo is kept as
https://github.com/libyui/libyui-old
similarly libyui-ncurses now contains only README about being obsolete in:
https://github.com/libyui/libyui-ncurses
but at least it wasn't rewritten to have the new content
* now both recipes need to use the same git repo and just different subdirs in S
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f825ad7d7e05bd3125580880cb9e6c1fbe959777)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...byui-ncurses_4.0.0.bb => libyui-ncurses_4.1.1.bb} | 11 +++++------
.../libyui/{libyui_4.0.0.bb => libyui_4.1.1.bb} | 12 ++++++------
2 files changed, 11 insertions(+), 12 deletions(-)
rename meta-oe/recipes-graphics/libyui/{libyui-ncurses_4.0.0.bb => libyui-ncurses_4.1.1.bb} (79%)
rename meta-oe/recipes-graphics/libyui/{libyui_4.0.0.bb => libyui_4.1.1.bb} (66%)
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb
similarity index 79%
rename from meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb
rename to meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb
index a3a4a150662..fdf01618a28 100644
--- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.0.0.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb
@@ -1,17 +1,16 @@
SUMMARY = "Character Based User Interface for libyui"
LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
- file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \
+LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+ file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \
"
-SRC_URI = "git://github.com/libyui/libyui-ncurses.git \
- "
+SRC_URI = "git://github.com/libyui/libyui.git"
SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
-SRCREV = "37d3a1e815a47f536b4f694f139f279cc93a3854"
+SRCREV = "718ac672374a2b0f50cbc7d637d90e6471babc3d"
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/libyui-ncurses"
inherit cmake gettext pkgconfig
diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb b/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb
similarity index 66%
rename from meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb
rename to meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb
index e42c178e66f..acab7d45682 100644
--- a/meta-oe/recipes-graphics/libyui/libyui_4.0.0.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb
@@ -1,18 +1,18 @@
SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends."
LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
- file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \
- file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+LIC_FILES_CHKSUM = "file://../COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
+ file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \
+ file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
-SRC_URI = "git://github.com/libyui/libyui-old.git \
+SRC_URI = "git://github.com/libyui/libyui.git \
file://0001-Fix-build-with-clang.patch \
file://0001-Use-relative-install-paths-for-CMake.patch \
"
-SRCREV = "af06143017fc5f18c4b6488ba4aed26bcc43ff6e"
+SRCREV = "718ac672374a2b0f50cbc7d637d90e6471babc3d"
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/libyui"
inherit cmake gettext pkgconfig
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 04/36] android-tools: use PN instead of BPN in RDEPENDS
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (2 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 03/36] libyui(-ncurses): upgrade to 4.1.1, libyui repo was rewritten completely akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 05/36] pidgin-sipe: fix g_memdup2 changes to be backwards compatible with glib-1.67 akuster
` (32 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 7e60ff535380b905f631a31f3f1228e78f1c117c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index d93a7f72394..e8992346b08 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -160,8 +160,8 @@ do_install() {
PACKAGES =+ "${PN}-fstools ${PN}-adbd"
-RDEPENDS_${BPN}-adbd = "${BPN}-conf"
-RDEPENDS_${BPN}-fstools = "bash"
+RDEPENDS_${PN}-adbd = "${PN}-conf"
+RDEPENDS_${PN}-fstools = "bash"
FILES_${PN}-adbd = "\
${bindir}/adbd \
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 05/36] pidgin-sipe: fix g_memdup2 changes to be backwards compatible with glib-1.67
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (3 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 04/36] android-tools: use PN instead of BPN in RDEPENDS akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 06/36] doxygen: Upgrade 1.8.20 -> 1.9.1 akuster
` (31 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Martin Jansa <Martin.Jansa@gmail.com>
* current version unfortunatelly it isn't backwards compatible with glib-2.0-1.66.7 currently in oe-core master and hardknott and now fails with:
| ../../../pidgin-sipe-1.25.0/src/purple/../api/sipe-common.h:56:19: error: conflicting types for 'g_memdup'
| 56 | #define g_memdup2 g_memdup
| | ^~~~~~~~
that's because glibcompat.h provided by libpurple from pidgin always provides g_memdup2
so the AC_CHECK_LIB in configure.ac detects that it isn't available in glib-2.0 itself
and then tries to redefine it here.
Leave the fall-back on glibcompat.h and just replace g_memdup calls with g_memdup2.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 412cb3a15c7812c69660ae6e98dad6e01e09a7e9)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../0001-Migrate-to-use-g_memdup2.patch | 58 +++++++++----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch
index 4f5c0bd1f6c..ceb48d21fc0 100644
--- a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch
+++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch
@@ -1,17 +1,36 @@
-From 40799bb28a9e299055eec00092694ea2e408c431 Mon Sep 17 00:00:00 2001
+From 51c95a23bff3a024dc19e3127ca751e1458be0f0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 5 Apr 2021 11:36:50 -0700
Subject: [PATCH] Migrate to use g_memdup2
g_memdup has been deprecated for long and latest glib-2.0 2.68+ has
-turned it int an error to use old function. Add a fall back to
-older versions of GLib, fall back to g_memdup with a #define
+turned it int an error to use old function.
+
+The fall-back to g_memdup isn't needed because pidgin provides g_memdup2
+in pidgin-sipe/1.25.0-r0/recipe-sysroot/usr/include/libpurple/glibcompat.h
+based on glib-2.0 version:
+ /* Backport the static inline version of g_memdup2 if we don't have g_memdup2.
+ * see https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html
+ * for more information.
+ */
+ #if !GLIB_CHECK_VERSION(2, 67, 3)
+ static inline gpointer
+ g_memdup2(gconstpointer mem, gsize byte_size) {
+ gpointer new_mem = NULL;
+
+ if(mem && byte_size != 0) {
+ new_mem = g_malloc (byte_size);
+ memcpy (new_mem, mem, byte_size);
+ }
+
+ return new_mem;
+ }
+ #endif /* !GLIB_CHECK_VERSION(2, 67, 3) */
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- configure.ac | 3 +++
- src/api/sipe-common.h | 5 +++++
+ src/api/sipe-common.h | 3 +++
src/core/sip-sec-gssapi.c | 4 ++--
src/core/sip-sec-ntlm.c | 12 ++++++------
src/core/sip-sec-tls-dsk.c | 4 ++--
@@ -19,35 +38,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
src/core/sipe-tls-tester.c | 2 +-
src/core/sipe-tls.c | 4 ++--
src/telepathy/telepathy-protocol.c | 2 +-
- 9 files changed, 23 insertions(+), 15 deletions(-)
+ 8 files changed, 18 insertions(+), 15 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 2481153..efe01b4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,6 +327,9 @@ AM_CONDITIONAL(SIPE_OPENSSL, [test "x$enable_openssl" != xno])
- dnl check for libxml2
- PKG_CHECK_MODULES(LIBXML2, [libxml-2.0])
-
-+# dnl check for g_memdup2 in glib-2.0
-+AC_CHECK_LIB(glib-2.0, g_memdup2, [GLIB_CFLAGS="$GLIB_CFLAGS -DHAVE_G_MEMDUP2=1"])
-+
- dnl assumption check: sizof(uuid_t) must be 16 (see uuid.c)
- AC_MSG_CHECKING([that sizeof(uuid_t) is 16])
- ac_save_CFLAGS="$CFLAGS"
diff --git a/src/api/sipe-common.h b/src/api/sipe-common.h
-index c964f15..e114fdc 100644
+index c964f15..cab81e0 100644
--- a/src/api/sipe-common.h
+++ b/src/api/sipe-common.h
-@@ -51,3 +51,8 @@
+@@ -51,3 +51,6 @@
#ifdef _MSC_VER
typedef long ssize_t;
#endif
+
-+#ifndef HAVE_G_MEMDUP2
-+#define g_memdup2 g_memdup
-+#endif
-+
++// for g_memdup2
++#include <libpurple/glibcompat.h>
diff --git a/src/core/sip-sec-gssapi.c b/src/core/sip-sec-gssapi.c
index 873080f..4c63868 100644
--- a/src/core/sip-sec-gssapi.c
@@ -187,6 +190,3 @@ index f6e5337..1dde579 100644
}
if (icon_name)
*icon_name = g_strdup("im-" SIPE_TELEPATHY_DOMAIN);
---
-2.31.1
-
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 06/36] doxygen: Upgrade 1.8.20 -> 1.9.1
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (4 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 05/36] pidgin-sipe: fix g_memdup2 changes to be backwards compatible with glib-1.67 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 07/36] networkmanager-openvpn: Fix packageing akuster
` (30 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Randy MacLeod <randy.macleod@windriver.com>
Refit and update patches.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e4ad6f3507de85343d3cbd884781a0e0572414ae)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../0001-build-don-t-look-for-Iconv.patch | 9 +-
.../doxygen-native-only-check-python3.patch | 116 +++++++++---------
.../{doxygen_1.8.20.bb => doxygen_1.9.1.bb} | 3 +-
3 files changed, 61 insertions(+), 67 deletions(-)
rename meta-oe/recipes-devtools/doxygen/{doxygen_1.8.20.bb => doxygen_1.9.1.bb} (79%)
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
index c86dc1691e3..6906efd1c0d 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
+++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
@@ -8,6 +8,7 @@ native build but all modern systems supply it as part of the standard
C library. We don't need this check in meta-openembedded.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Upstream-status: Inappropriate
- upstream doxygen must build on many architectures, this change is
@@ -17,10 +18,10 @@ Upstream-status: Inappropriate
1 file changed, 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45c2f2c1..22cf0144 100644
+index 06b9696f..f30b46b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -92,10 +92,6 @@ if (sqlite3)
+@@ -117,10 +117,6 @@ if (sqlite3)
endif()
endif()
@@ -28,9 +29,9 @@ index 45c2f2c1..22cf0144 100644
-include_directories(${ICONV_INCLUDE_DIR})
-
-
- #set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")
+ #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")
set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc)
set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
--
-2.17.1
+2.27.0
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
index 53f88885f44..9d1a5a93d0f 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
+++ b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
@@ -1,4 +1,4 @@
-From aa833cf56c5cc2e87a1d91881eb2286beb34e417 Mon Sep 17 00:00:00 2001
+From 7aeee92c752f8a4b2524ed6a41d60c1a3ca8bf2d Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Wed, 26 Aug 2020 10:52:10 +0300
Subject: [PATCH] doxygen: Fix Python issues for doxygen-native
@@ -32,25 +32,28 @@ result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE.
This patch is only needded by doxygen-native.
+Updated to apply to release 1.9.1.
+
Upstream-Status: Inappropriate[oe specific]
Co-Authored-By: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
CMakeLists.txt | 2 +-
addon/doxywizard/CMakeLists.txt | 6 +++---
doc/CMakeLists.txt | 6 +++---
examples/CMakeLists.txt | 4 ++--
libmscgen/CMakeLists.txt | 2 +-
- src/CMakeLists.txt | 12 ++++++------
+ src/CMakeLists.txt | 10 +++++-----
testing/CMakeLists.txt | 4 ++--
- 7 files changed, 18 insertions(+), 18 deletions(-)
+ 7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 35e6a0c2..9aaebbdf 100644
+index f30b46b8..50f211c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@ else ()
+@@ -101,7 +101,7 @@ else ()
endif ()
find_program(DOT NAMES dot)
@@ -60,50 +63,50 @@ index 35e6a0c2..9aaebbdf 100644
find_package(BISON REQUIRED)
if (BISON_VERSION VERSION_LESS 2.7)
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index 6aacd8b6..fa197e9e 100644
+index a6f65f8d..d163aa5b 100644
--- a/addon/doxywizard/CMakeLists.txt
+++ b/addon/doxywizard/CMakeLists.txt
@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA
# generate version.cpp
add_custom_command(
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
-+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
- DEPENDS ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_SOURCE_DIR}/src/version.py
+- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
+ DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py
OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
)
@@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER
# generate configdoc.cpp
add_custom_command(
--COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
-+COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
- OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
+- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
+ DEPENDS ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml
+ OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
)
- set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1)
-@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN
- set(LEX_FILES config_doxyw)
+@@ -75,7 +75,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN
+ set(LEX_FILES config_doxyw)
foreach(lex_file ${LEX_FILES})
add_custom_command(
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
-+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
- DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l
- OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
+- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
+ DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l
+ OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index a094c570..8a757c20 100644
+index f2d177ed..22a4d602 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
-@@ -132,7 +132,7 @@ configure_file(${CMAKE_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR}/
+@@ -163,7 +163,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR
# doc/language.doc (see tag Doxyfile:INPUT)
add_custom_command(
-- COMMAND ${PYTHON_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR}
-+ COMMAND ${Python3_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR}
- DEPENDS ${CMAKE_SOURCE_DIR}/doc/maintainers.txt ${CMAKE_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES}
+- COMMAND ${PYTHON_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
++ COMMAND ${Python3_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
+ DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES}
OUTPUT language.doc
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc
-@@ -141,7 +141,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
+@@ -172,7 +172,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
# doc/config.doc (see tag Doxyfile:INPUT)
add_custom_command(
@@ -112,7 +115,7 @@ index a094c570..8a757c20 100644
DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py
OUTPUT config.doc
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
-@@ -192,7 +192,7 @@ add_custom_target(docs_chm
+@@ -223,7 +223,7 @@ add_custom_target(docs_chm
COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
COMMAND ${CMAKE_COMMAND} -E echo " if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
@@ -122,42 +125,42 @@ index a094c570..8a757c20 100644
COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm
DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 3f1c79b8..d5866ee1 100644
+index 194b4271..248b8076 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
-@@ -51,7 +51,7 @@ foreach (f_inp ${BASIC_EXAMPLES})
- string(REGEX REPLACE ":.*" "" f ${f_inp})
- add_custom_command(
+@@ -54,7 +54,7 @@ foreach (f_inp ${BASIC_EXAMPLES})
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f}
COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg
-- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex
-+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex
+- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py
- OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex
+ OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
)
-@@ -68,7 +68,7 @@ add_custom_target(examples
- if (DOT)
- add_custom_command(
+@@ -73,7 +73,7 @@ if (DOT)
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams
COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
-- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
+- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py
- OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
+ OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
)
diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
-index 079fcfc8..e6d86f61 100644
+index 0a239008..09849e2d 100644
--- a/libmscgen/CMakeLists.txt
+++ b/libmscgen/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
set(LEX_FILES mscgen_lexer)
foreach(lex_file ${LEX_FILES})
add_custom_command(
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
-+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
- DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l
+- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
+ DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l
OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index cb289116..356741ff 100644
+index 5004a957..68e803f2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
@@ -191,21 +194,12 @@ index cb289116..356741ff 100644
# resources.cpp
add_custom_command(
COMMENT "Generating ${GENERATED_SRC}/resources.cpp"
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
-+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
+- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py
OUTPUT ${GENERATED_SRC}/resources.cpp
)
-@@ -102,7 +102,7 @@ set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED
-
- # layout_default.xml
- add_custom_command(
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py < ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h
-+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py < ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h
- DEPENDS ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py
- OUTPUT ${GENERATED_SRC}/layout_default.xml.h
- )
-@@ -131,7 +131,7 @@ foreach(lex_file ${LEX_FILES})
+@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES})
set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files")
set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files")
add_custom_command(
@@ -215,15 +209,15 @@ index cb289116..356741ff 100644
OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
)
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
-index b354e78f..28d45e11 100644
+index fd6912e9..0af1865b 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -1,7 +1,7 @@
# run all tests sequentially (keep for backward compatibility)
add_custom_target(tests
COMMENT "Running doxygen tests..."
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
DEPENDS doxygen
)
@@ -231,10 +225,10 @@ index b354e78f..28d45e11 100644
string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}")
# add a test target for each test
add_test(NAME ${TEST_NAME}
-- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
-+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
++ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
)
endforeach()
--
-2.17.1
+2.27.0
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb
similarity index 79%
rename from meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb
rename to meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb
index d4ac3b72072..3370a131327 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb
@@ -10,8 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
file://0001-build-don-t-look-for-Iconv.patch \
"
SRC_URI_append_class-native = " file://doxygen-native-only-check-python3.patch"
-SRC_URI[md5sum] = "8729936a843232a66fe970ef65f3c3e4"
-SRC_URI[sha256sum] = "e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec"
+SRC_URI[sha256sum] = "67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1"
inherit cmake python3native
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 07/36] networkmanager-openvpn: Fix packageing
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (5 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 06/36] doxygen: Upgrade 1.8.20 -> 1.9.1 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 08/36] python3-sqlalchemy: Upgrade 1.4.4 -> 1.4.5 akuster
` (29 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
Recent upgrade introduced:
| ERROR: networkmanager-openvpn-1.8.14-r0 do_package: QA Issue: networkmanager-openvpn: Files/directories were installed but not shipped in any package:
| /usr/share/metainfo
| /usr/share/metainfo/network-manager-openvpn.metainfo.xml
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a23fa069d0a60cf348dcc6399f7990de59105c21)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../networkmanager/networkmanager-openvpn_1.8.14.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
index a1a61bed1e3..1f76d8ab521 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb
@@ -38,6 +38,7 @@ USERADD_PARAM_${PN} = "--system nm-openvpn"
FILES_${PN} += " \
${datadir}/dbus-1 \
+ ${datadir}/metainfo \
${libdir}/NetworkManager/*.so \
${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 08/36] python3-sqlalchemy: Upgrade 1.4.4 -> 1.4.5
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (6 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 07/36] networkmanager-openvpn: Fix packageing akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 09/36] python3-pychromecast: Upgrade 9.1.1 -> 9.1.2 akuster
` (28 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 1.4.5:
orm:
- Fixed regression where the joinedload() loader strategy would
not successfully joinedload to a mapper that is mapper against
a CTE construct.
- Scaled back the warning message added in #5171 to not warn for
overlapping columns in an inheritance scenario where a
particular relationship is local to a subclass and therefore
does not represent an overlap.
sql:
- Fixed bug in new FunctionElement.render_derived() feature where
column names rendered out explicitly in the alias SQL would not
have proper quoting applied for case sensitive names and other
non-alphanumeric names.
- Fixed regression where use of the Operators.in_() method with a
Select object against a non-table-bound column would produce an
AttributeError, or more generally using a ScalarSelect that has
no datatype in a binary expression would produce invalid state.
- Added a new flag to the Dialect class called
Dialect.supports_statement_cache. This flag now needs to be
present directly on a dialect class in order for SQLAlchemy's
query cache to take effect for that dialect. The rationale is
based on discovered issues such as #6173 revealing that dialects
which hardcode literal values from the compiled statement, often
the numerical parameters used for LIMIT / OFFSET, will not be
compatible with caching until these dialects are revised to use
the parameters present in the statement only. For third party
dialects where this flag is not applied, the SQL logging will
show the message "dialect does not support caching", indicating
the dialect should seek to apply this flag once they have
verified that no per-statement literal values are being rendered
iwithin the compilation phase.
schema:
- Introduce a new parameter Enum.omit_aliases in Enum type allow
filtering aliases when using a pep435 Enum. Previous versions of
SQLAlchemy kept aliases in all cases, creating database enum
type with additional states, meaning that they were treated as
different values in the db. For backward compatibility this flag
defaults to False in the 1.4 series, but will be switched to
True in a future version. A deprecation warning is raise if this
iflag is not specified and the passed enum contains aliases.
mypy:
- Fixed issue in mypy plugin where newly added support for
as_declarative() needed to more fully add the DeclarativeMeta
class to the mypy interpreter’s state so that it does not
result in a name not found error; additionally improves how
global names are setup for the plugin including the Mapped name.
asyncio:
- Fixed issue where the asyncio extension could not be loaded if
running Python 3.6 with the backport library of contextvars
installed.
postgresql:
- Fixed regression where the PostgreSQL cast operator applied to
elements within an ARRAY when using psycopg2 would fail to use
the correct type in the case that the datatype were also
embedded within an instance of the Variant adapter.
- Fixed typo in the fix released in 1.4.4 that completely
prevented this change from working correctly, i.e. the error
message did not match what was actually emitted by pg8000.
- Fixed issue where the PostgreSQL PGInspector, when generated
against an Engine, would fail for .get_enums(),
.get_view_names(), .get_foreign_table_names() and
.get_table_oid() when used against a "future" style engine
and not the connection directly.
mysql:
- Fixed regression in the MySQL dialect where the reflection query
used to detect if a table exists would fail on very old MySQL
5.0 and 5.1 versions.
mssql:
- Fixed a regression in MSSQL 2012+ that prevented the order by
clause to be rendered when offset=0 is used in a subquery.
oracle:
- Fixed critical regression where the Oracle compiler would not
maintain the correct parameter values in the LIMIT/OFFSET for a
select due to a caching issue.
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit b8230b6a66018b370fdae7e32e7e5286234afe78)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...{python3-sqlalchemy_1.4.4.bb => python3-sqlalchemy_1.4.5.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-sqlalchemy_1.4.4.bb => python3-sqlalchemy_1.4.5.bb} (85%)
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.4.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.5.bb
similarity index 85%
rename from meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.4.bb
rename to meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.5.bb
index 1578da5e578..206a9ab3b0c 100644
--- a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.4.bb
+++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.5.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3359ed561ac16aaa25b6c6eff84df595"
-SRC_URI[sha256sum] = "7ba9c00c129dbb4fd026a1f2c943188db59c802612e49bc9bded426d8eb14bc0"
+SRC_URI[sha256sum] = "1294f05916c044631fd626a4866326bbfbd17f62bd37510d000afaef4b35bd74"
PYPI_PACKAGE = "SQLAlchemy"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 09/36] python3-pychromecast: Upgrade 9.1.1 -> 9.1.2
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (7 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 08/36] python3-sqlalchemy: Upgrade 1.4.4 -> 1.4.5 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 10/36] python3-decorator: Upgrade 5.0.1 -> 5.0.5 akuster
` (27 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 9.1.2:
- Handle bad UUIDs from third-party Chromecasts
- Reuse SSL context in host browser
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 75a9fe6cc0ec8d031540462fdbbbcf28bbf87ccf)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...hon3-pychromecast_9.1.1.bb => python3-pychromecast_9.1.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-pychromecast_9.1.1.bb => python3-pychromecast_9.1.2.bb} (76%)
diff --git a/meta-python/recipes-devtools/python/python3-pychromecast_9.1.1.bb b/meta-python/recipes-devtools/python/python3-pychromecast_9.1.2.bb
similarity index 76%
rename from meta-python/recipes-devtools/python/python3-pychromecast_9.1.1.bb
rename to meta-python/recipes-devtools/python/python3-pychromecast_9.1.2.bb
index 3d0b84cf0bf..c392261ade2 100644
--- a/meta-python/recipes-devtools/python/python3-pychromecast_9.1.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pychromecast_9.1.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/balloob/pychromecast"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5"
-SRC_URI[sha256sum] = "ab9da1d2ef424b1fc755f6436f545a56056ec6de24075e93f369eac8eb821837"
+SRC_URI[sha256sum] = "907656cea46d39d0e93ec815979578ef4fb6f655fd8bf4e88e6421fcd7824e85"
PYPI_PACKAGE = "PyChromecast"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 10/36] python3-decorator: Upgrade 5.0.1 -> 5.0.5
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (8 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 09/36] python3-pychromecast: Upgrade 9.1.1 -> 9.1.2 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 11/36] python3-pymisp: Upgrade 2.4.141 -> 2.4.141.1 akuster
` (26 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 5.0.5:
- Dropped support for Python < 3.5 with a substantial
simplification of the code base (now building a decorator does
not require calling "exec").
- Added a way to mimic functools.wraps-generated decorators.
- Ported the Continuous Integration from Travis to GitHub.
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit daf804c88290898bb56e401433aa6860c69afa2f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{python3-decorator_5.0.1.bb => python3-decorator_5.0.5.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-decorator_5.0.1.bb => python3-decorator_5.0.5.bb} (86%)
diff --git a/meta-python/recipes-devtools/python/python3-decorator_5.0.1.bb b/meta-python/recipes-devtools/python/python3-decorator_5.0.5.bb
similarity index 86%
rename from meta-python/recipes-devtools/python/python3-decorator_5.0.1.bb
rename to meta-python/recipes-devtools/python/python3-decorator_5.0.5.bb
index e9d20379f9d..47daba8a0cc 100644
--- a/meta-python/recipes-devtools/python/python3-decorator_5.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-decorator_5.0.5.bb
@@ -9,7 +9,7 @@ decorator, just because you can."
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=be2fd2007972bf96c08af3293d728b22"
-SRC_URI[sha256sum] = "1e53162e016f317a61d93848f00e80e7109ca9ed06846c7f2930cf0ebede7c6c"
+SRC_URI[sha256sum] = "acda948ffcfe4bd0c4a57834b74ad968b91925b8201b740ca9d46fb8c5c618ce"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 11/36] python3-pymisp: Upgrade 2.4.141 -> 2.4.141.1
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (9 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 10/36] python3-decorator: Upgrade 5.0.1 -> 5.0.5 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 12/36] python3-pyroute2: Upgrade 0.5.16 -> 0.5.17 akuster
` (25 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 2.4.141.1:
- Re-bump changelog
- Bump version
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 0eefda892aea7f69189d1f3b1f99949d4feb5321)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{python3-pymisp_2.4.141.bb => python3-pymisp_2.4.141.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-pymisp_2.4.141.bb => python3-pymisp_2.4.141.1.bb} (91%)
diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.141.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.4.141.1.bb
similarity index 91%
rename from meta-python/recipes-devtools/python/python3-pymisp_2.4.141.bb
rename to meta-python/recipes-devtools/python/python3-pymisp_2.4.141.1.bb
index c8bd52f105c..df6f1c762d2 100644
--- a/meta-python/recipes-devtools/python/python3-pymisp_2.4.141.bb
+++ b/meta-python/recipes-devtools/python/python3-pymisp_2.4.141.1.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20"
SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main"
-SRCREV = "4a0c1e1dc42af171d3c1bcaa12436f79ff6cfd9b"
+SRCREV = "62cd5173f087e88834e88472060181b681b0b4d2"
S = "${WORKDIR}/git"
inherit setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 12/36] python3-pyroute2: Upgrade 0.5.16 -> 0.5.17
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (10 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 11/36] python3-pymisp: Upgrade 2.4.141 -> 2.4.141.1 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 13/36] python3-transitions: Upgrade 0.8.7 -> 0.8.8 akuster
` (24 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 0.5.17:
- license: aligned cli/ss2
- ndb: del_ip() improvements
- ndb: wait(timeout=...)
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit be5b722809c29acef2de0c0978659692483aa8aa)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{python3-pyroute2_0.5.16.bb => python3-pyroute2_0.5.17.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-pyroute2_0.5.16.bb => python3-pyroute2_0.5.17.bb} (90%)
diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.5.16.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.5.17.bb
similarity index 90%
rename from meta-python/recipes-devtools/python/python3-pyroute2_0.5.16.bb
rename to meta-python/recipes-devtools/python/python3-pyroute2_0.5.17.bb
index fed0fc38fe7..1d3d5a253a6 100644
--- a/meta-python/recipes-devtools/python/python3-pyroute2_0.5.16.bb
+++ b/meta-python/recipes-devtools/python/python3-pyroute2_0.5.17.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2 & Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce"
-SRC_URI[sha256sum] = "fe681a2d008cac815b9f287250d69a333fbfc2b2d89c37d58798104057149989"
+SRC_URI[sha256sum] = "12d51066ea5628a6fa76fc244f301a8eea5d25d71a9d664016976edfa3889733"
inherit setuptools3 pypi ptest
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 13/36] python3-transitions: Upgrade 0.8.7 -> 0.8.8
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (11 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 12/36] python3-pyroute2: Upgrade 0.5.16 -> 0.5.17 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 14/36] python3-sqlalchemy: Upgrade 1.4.5 -> 1.4.6 akuster
` (23 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 0.8.8:
- AsyncMachine does not remove models when remove_models is called
- Introduce try/except for finalize callbacks in Machine and
HierachicalMachine. Thus, errors occurring in finalize callbacks
will be suppressed and only the original error will be raised.
- Show references in graphs and markup. Introduce
MarkupMachine.format_references to tweak reference formatting
- Introduce Machine.on_exception to handle raised exceptions in
callbacks
- Machine.get_triggers now supports State and Enum as arguments
- NestedState and HierachicalMachine.add_states now accept (lists
of) states and enums as initial parameter
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit dce8ef5add115eb1ecdf39d547e5c566a92b2bd6)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ython3-transitions_0.8.7.bb => python3-transitions_0.8.8.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-transitions_0.8.7.bb => python3-transitions_0.8.8.bb} (73%)
diff --git a/meta-python/recipes-devtools/python/python3-transitions_0.8.7.bb b/meta-python/recipes-devtools/python/python3-transitions_0.8.8.bb
similarity index 73%
rename from meta-python/recipes-devtools/python/python3-transitions_0.8.7.bb
rename to meta-python/recipes-devtools/python/python3-transitions_0.8.8.bb
index 04a033742a6..2b82df5814f 100644
--- a/meta-python/recipes-devtools/python/python3-transitions_0.8.7.bb
+++ b/meta-python/recipes-devtools/python/python3-transitions_0.8.8.bb
@@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=baac7be1f4c17620df74188e23da6d47"
inherit pypi setuptools3
-SRC_URI[sha256sum] = "8c60ec0828cd037820726283cad5d4d77a5e31514e058b51250420e9873e9bc7"
+SRC_URI[sha256sum] = "e7a86b31a161a76133f189b3ae9dad2755a80ea4c1e0eee1805648d021fb677d"
RDEPENDS_${PN} += "python3-six"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 14/36] python3-sqlalchemy: Upgrade 1.4.5 -> 1.4.6
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (12 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 13/36] python3-transitions: Upgrade 0.8.7 -> 0.8.8 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 15/36] python3-bitarray: Upgrade 1.9.0 -> 1.9.1 akuster
` (22 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 1.4.6:
orm:
- Fixed regression where a deprecated form of Query.join() were
used, passing a series of entities to join from without any ON
clause in a single Query.join() call, would fail to function
correctly.
- Fixed critical regression where the Query.yield_per() method in
the ORM would set up the internal Result to yield chunks at a
time, however made use of the new Result.unique() method which
uniques across the entire result.
sql:
- Fixed further regressions in the same area as that of #6173
released in 1.4.5, where a “postcompile” parameter, again most
typically those used for LIMIT/OFFSET rendering in Oracle and
SQL Server, would fail to be processed correctly if the same
parameter rendered in multiple places in the statement.
- Executing a Subquery using Connection.execute() is deprecated
and will emit a deprecation warning; this use case was an
oversight that should have been removed from 1.4.
schema:
- The Table object now raises an informative error message if it
is instantiated without passing at least the Table.name and
Table.metadata arguments positionally. Previously, if these were
passed as keyword arguments, the object would silently fail to
initialize correctly.
mypy:
- Applied a series of refactorings and fixes to accommodate for
Mypy "incremental" mode across multiple files, which previously
was not taken into account. In this mode the Mypy plugin has to
accommodate Python datatypes expressed in other files coming in
with less information than they have on a direct run.
- Fixed issue where the Mypy plugin would fail to interpret the
"collection_class" of a relationship if it were a callable and
not a class. Also improved type matching and error reporting for
collection-oriented relationships.
asyncio:
- Added accessors .sqlstate and synonym .pgcode to the .orig
attribute of the SQLAlchemy exception class raised by the
asyncpg DBAPI adapter, that is, the intermediary exception
object that wraps on top of that raised by the asyncpg
library itself, but below the level of the SQLAlchemy dialect.
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit b649e45ab1f87346c535ef77052343594391bd39)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...{python3-sqlalchemy_1.4.5.bb => python3-sqlalchemy_1.4.6.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-sqlalchemy_1.4.5.bb => python3-sqlalchemy_1.4.6.bb} (85%)
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.5.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.6.bb
similarity index 85%
rename from meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.5.bb
rename to meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.6.bb
index 206a9ab3b0c..4d5aa33d1a9 100644
--- a/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.5.bb
+++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.6.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3359ed561ac16aaa25b6c6eff84df595"
-SRC_URI[sha256sum] = "1294f05916c044631fd626a4866326bbfbd17f62bd37510d000afaef4b35bd74"
+SRC_URI[sha256sum] = "193c3ca465fbc68de071995a461ab535466f041089d372ee6a6f0aae7b9307e6"
PYPI_PACKAGE = "SQLAlchemy"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 15/36] python3-bitarray: Upgrade 1.9.0 -> 1.9.1
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (13 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 14/36] python3-sqlalchemy: Upgrade 1.4.5 -> 1.4.6 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 16/36] python3-pysonos: Upgrade 0.0.41 -> 0.0.42 akuster
` (21 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 1.9.1:
- switch documentation from markdown to reStructuredText
- add tests
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 79d2873495faaa6406ec9d19e3f715701d2429c9)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{python3-bitarray_1.9.0.bb => python3-bitarray_1.9.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-bitarray_1.9.0.bb => python3-bitarray_1.9.1.bb} (77%)
diff --git a/meta-python/recipes-devtools/python/python3-bitarray_1.9.0.bb b/meta-python/recipes-devtools/python/python3-bitarray_1.9.1.bb
similarity index 77%
rename from meta-python/recipes-devtools/python/python3-bitarray_1.9.0.bb
rename to meta-python/recipes-devtools/python/python3-bitarray_1.9.1.bb
index 12ac3d964f4..e6bfb25c492 100644
--- a/meta-python/recipes-devtools/python/python3-bitarray_1.9.0.bb
+++ b/meta-python/recipes-devtools/python/python3-bitarray_1.9.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray"
LICENSE = "PSF"
LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d"
-SRC_URI[sha256sum] = "db00073387af7fe30852d96b04742a0cdbc7feaf3158558520ab7898b0435ee2"
+SRC_URI[sha256sum] = "ec99acc1b18f99b7e9d0b77766b99f80b3c42d4e83306334deef9745b41a2079"
inherit setuptools3 pypi
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 16/36] python3-pysonos: Upgrade 0.0.41 -> 0.0.42
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (14 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 15/36] python3-bitarray: Upgrade 1.9.0 -> 1.9.1 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 17/36] python3-django: Upgrade 3.1.7 -> 3.2 akuster
` (20 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 0.0.42:
- Handle parse_event_xml doing I/O in the asyncio event loop
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 478e0e5833e8815f0e6ba77860ad54c342f34fb5)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{python3-pysonos_0.0.41.bb => python3-pysonos_0.0.42.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-pysonos_0.0.41.bb => python3-pysonos_0.0.42.bb} (79%)
diff --git a/meta-python/recipes-devtools/python/python3-pysonos_0.0.41.bb b/meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb
similarity index 79%
rename from meta-python/recipes-devtools/python/python3-pysonos_0.0.41.bb
rename to meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb
index 564d60ee47b..25defabc51b 100644
--- a/meta-python/recipes-devtools/python/python3-pysonos_0.0.41.bb
+++ b/meta-python/recipes-devtools/python/python3-pysonos_0.0.42.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=07b0e2ca9ac77cd65cd4edf2e13367ea"
-SRC_URI[sha256sum] = "08d17fee04cc8209b915e61407673ea843b55792a9301fbe86adb9cc69a67a54"
+SRC_URI[sha256sum] = "20b45fa1779a01325e67822d243e1a3f7657d8b515308d84c1eb3c805cc3bdb5"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 17/36] python3-django: Upgrade 3.1.7 -> 3.2
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (15 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 16/36] python3-pysonos: Upgrade 0.0.41 -> 0.0.42 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 18/36] python3-tqdm: Upgrade 4.59.0 -> 4.60.0 akuster
` (19 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 3.2:
- Automatic AppConfig discovery
- Customizing type of auto-created primary keys
- Functional indexes
- pymemcache support
- New decorators for the admin site
- Other minor new features
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit f45f3862a64be2a8502a3a348bb3b7f72869c988)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../python/{python3-django_3.1.7.bb => python3-django_3.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-django_3.1.7.bb => python3-django_3.2.bb} (59%)
diff --git a/meta-python/recipes-devtools/python/python3-django_3.1.7.bb b/meta-python/recipes-devtools/python/python3-django_3.2.bb
similarity index 59%
rename from meta-python/recipes-devtools/python/python3-django_3.1.7.bb
rename to meta-python/recipes-devtools/python/python3-django_3.2.bb
index d22bd14e8c2..e147e2f9d1b 100644
--- a/meta-python/recipes-devtools/python/python3-django_3.1.7.bb
+++ b/meta-python/recipes-devtools/python/python3-django_3.2.bb
@@ -1,7 +1,7 @@
require python-django.inc
inherit setuptools3
-SRC_URI[sha256sum] = "32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7"
+SRC_URI[sha256sum] = "21f0f9643722675976004eb683c55d33c05486f94506672df3d6a141546f389d"
RDEPENDS_${PN} += "\
${PYTHON_PN}-sqlparse \
@@ -9,5 +9,5 @@ RDEPENDS_${PN} += "\
# Set DEFAULT_PREFERENCE so that the LTS version of django is built by
# default. To build the 3.x branch,
-# PREFERRED_VERSION_python3-django = "3.1.7" can be added to local.conf
+# PREFERRED_VERSION_python3-django = "3.2" can be added to local.conf
DEFAULT_PREFERENCE = "-1"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 18/36] python3-tqdm: Upgrade 4.59.0 -> 4.60.0
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (16 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 17/36] python3-django: Upgrade 3.1.7 -> 3.2 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 19/36] python3-xmlschema: Upgrade 1.5.3 -> 1.6.0 akuster
` (18 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 4.60.0:
- add contrib.logging helpers for redirecting to tqdm.write()
- support delay in notebook
- fix contrib.tmap, tzip not using tqdm_class
- add notebook tests
- updates & misc minor fixes for documentation
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 910579ddae89f1b85e18bae405eac5322eea3b9b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../python/{python3-tqdm_4.59.0.bb => python3-tqdm_4.60.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-tqdm_4.59.0.bb => python3-tqdm_4.60.0.bb} (78%)
diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.59.0.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.60.0.bb
similarity index 78%
rename from meta-python/recipes-devtools/python/python3-tqdm_4.59.0.bb
rename to meta-python/recipes-devtools/python/python3-tqdm_4.60.0.bb
index 32e5cf053a4..e20ba779af6 100644
--- a/meta-python/recipes-devtools/python/python3-tqdm_4.59.0.bb
+++ b/meta-python/recipes-devtools/python/python3-tqdm_4.60.0.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
LICENSE = "MIT & MPL-2.0"
LIC_FILES_CHKSUM = "file://LICENCE;md5=59e4271a933d33edfe60237db377a14b"
-SRC_URI[sha256sum] = "d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33"
+SRC_URI[sha256sum] = "ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 19/36] python3-xmlschema: Upgrade 1.5.3 -> 1.6.0
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (17 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 18/36] python3-tqdm: Upgrade 4.59.0 -> 4.60.0 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 20/36] pidgin: upgrade to 2.14.2 akuster
` (17 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Leon Anavi <leon.anavi@konsulko.com>
Upgrade to release 1.6.0:
- XML data bindings and code generators are now considered stable
- Add arguments 'max_depth' and 'extra_validator' to validation
methods
- Enhance decoding with 'value_hook' argument
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 0f32057302b1d9297e96319e501dde317b493eed)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{python3-xmlschema_1.5.3.bb => python3-xmlschema_1.6.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-python/recipes-devtools/python/{python3-xmlschema_1.5.3.bb => python3-xmlschema_1.6.0.bb} (83%)
diff --git a/meta-python/recipes-devtools/python/python3-xmlschema_1.5.3.bb b/meta-python/recipes-devtools/python/python3-xmlschema_1.6.0.bb
similarity index 83%
rename from meta-python/recipes-devtools/python/python3-xmlschema_1.5.3.bb
rename to meta-python/recipes-devtools/python/python3-xmlschema_1.6.0.bb
index 3f9c06365f8..2d207fb243e 100644
--- a/meta-python/recipes-devtools/python/python3-xmlschema_1.5.3.bb
+++ b/meta-python/recipes-devtools/python/python3-xmlschema_1.6.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=47489cb18c469474afeb259ed1d4832f"
-SRC_URI[sha256sum] = "a7db4c8ae2afa28654d15fcbf5d7f22f0441b5611e50426426e5418f369b5c79"
+SRC_URI[sha256sum] = "e951efc5ab3f251973f92cba7a7026adb32a4cd844d3425133d23eb269de4f8f"
PYPI_PACKAGE = "xmlschema"
inherit pypi setuptools3
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 20/36] pidgin: upgrade to 2.14.2
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (18 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 19/36] python3-xmlschema: Upgrade 1.5.3 -> 1.6.0 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 21/36] networkmanager: upgrade 1.28.0 -> 1.30.2 akuster
` (16 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Martin Jansa <Martin.Jansa@gmail.com>
* drop --with-python=python3 as it was renamed to --with-python3 and it defaults to
python3 now anyway
https://reviews.imfreedom.org/r/550/
* add PACKAGECONFIG for cyrus-sasl, it's enabled by default since:
commit 8d6c390002378664dea48e8766a0e4f063b12f78
Author: Gary Kramlich <grim@reaperworld.com>
Date: Mon Jul 13 03:34:57 2020 -0500
Enable cyrus-sasl support by default
but cyrus-sasl is in meta-networking layer, so we want to keep it disabled by default
* drop patches for autoconf-2.71, it was resolved upstream in:
commit aedf4a502e3b5875966e3f8277d7d43a0d9497a2
Author: Gary Kramlich <grim@reaperworld.com>
Date: Mon Mar 29 22:56:22 2021 -0500
Fix a bug where autoconf 2.71 complains about AC_PROG_INTLTOOL not being used.
* 2.14.1 was sometimes failing with
cat ../../pidgin-2.14.1/libpurple/account.h ../../pidgin-2.14.1/libpurple/accountopt.h ../../pidgin-2.14.1/libpurple/blist.h ../../pidgin-2.14.1/libpurple/buddyicon.h ../../pidgin-2.14.1/libpurple/certificate.h ../../pidgin-2.14.1/libpurple/cipher.h ../../pidgin-2.14.1/libpurple/circbuffer.h ../../pidgin-2.14.1/libpurple/cmds.h ../../pidgin-2.14.1/libpurple/connection.h ../../pidgin-2.14.1/libpurple/conversation.h ../../pidgin-2.14.1/libpurple/core.h ../../pidgin-2.14.1/libpurple/dbus-maybe.h ../../pidgin-2.14.1/libpurple/debug.h ../../pidgin-2.14.1/libpurple/desktopitem.h ../../pidgin-2.14.1/libpurple/eventloop.h ../../pidgin-2.14.1/libpurple/ft.h ../../pidgin-2.14.1/libpurple/gaim-compat.h ../../pidgin-2.14.1/libpurple/glibcompat.h
../../pidgin-2.14.1/libpurple/idle.h ../../pidgin-2.14.1/libpurple/imgstore.h ../../pidgin-2.14.1/libpurple/log.h ../../pidgin-2.14.1/libpurple/media.h ../../pidgin-2.14.1/libpurple/media-gst.h ../../pidgin-2.14.1/libpurple/mediamanager.h ../../pidgin-2.14.1/libpurple/mime.h ../../pidgin-2.14.1/libpurple/nat-pmp.h ../../pidgin-2.14.1/libpurple/network.h ../../pidgin-2.14.1/libpurple/notify.h ../../pidgin-2.14.1/libpurple/ntlm.h ../../pidgin-2.14.1/libpurple/plugin.h ../../pidgin-2.14.1/libpurple/pluginpref.h ../../pidgin-2.14.1/libpurple/pounce.h ../../pidgin-2.14.1/libpurple/prefs.h ../../pidgin-2.14.1/libpurple/privacy.h ../../pidgin-2.14.1/libpurple/proxy.h ../../pidgin-2.14.1/libpurple/prpl.h ../../pidgin-2.14.1/libpurple/request.h ../../pidgin-2.14.1/libpurple/roomlist.h ../../pidgin-2.14.1/libpurple/savedstatuses.h
../../pidgin-2.14.1/libpurple/server.h ../../pidgin-2.14.1/libpurple/signals.h ../../pidgin-2.14.1/libpurple/smiley.h ../../pidgin-2.14.1/libpurple/dnsquery.h ../../pidgin-2.14.1/libpurple/dnssrv.h ../../pidgin-2.14.1/libpurple/status.h ../../pidgin-2.14.1/libpurple/stringref.h ../../pidgin-2.14.1/libpurple/stun.h ../../pidgin-2.14.1/libpurple/sound.h ../../pidgin-2.14.1/libpurple/sound-theme.h ../../pidgin-2.14.1/libpurple/sound-theme-loader.h ../../pidgin-2.14.1/libpurple/sslconn.h ../../pidgin-2.14.1/libpurple/theme.h ../../pidgin-2.14.1/libpurple/theme-loader.h ../../pidgin-2.14.1/libpurple/theme-manager.h
../../pidgin-2.14.1/libpurple/upnp.h ../../pidgin-2.14.1/libpurple/util.h ../../pidgin-2.14.1/libpurple/value.h ../../pidgin-2.14.1/libpurple/xmlnode.h ../../pidgin-2.14.1/libpurple/whiteboard.h ../../pidgin-2.14.1/libpurple/media/backend-iface.h ../../pidgin-2.14.1/libpurple/media/candidate.h ../../pidgin-2.14.1/libpurple/media/codec.h ../../pidgin-2.14.1/libpurple/media/enum-types.h purple.h version.h marshallers.h | python3 ../../pidgin-2.14.1/libpurple/dbus-analyze-types.py --keyword=enum --verbatim > purple-client-bindings.h
cat: marshallers.h: No such file or directory
cat: marshallers.h: No such file or directory
cat: marshallers.h: No such file or directory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 92926a3e45dadb55cfcacb892c01d512c42d53c4)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...gure.ac-fix-build-with-autoconf-2.71.patch | 229 ------------------
...able-few-languages-not-compatible-wi.patch | 49 ----
.../{pidgin_2.14.1.bb => pidgin_2.14.2.bb} | 6 +-
3 files changed, 2 insertions(+), 282 deletions(-)
delete mode 100644 meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch
delete mode 100644 meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch
rename meta-oe/recipes-support/pidgin/{pidgin_2.14.1.bb => pidgin_2.14.2.bb} (94%)
diff --git a/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch b/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch
deleted file mode 100644
index cfb0290f9b7..00000000000
--- a/meta-oe/recipes-support/pidgin/pidgin/0001-configure.ac-fix-build-with-autoconf-2.71.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From e03d3ef5aadd582ebf7102b7d5785fed177a0cb1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 7 Feb 2021 13:25:29 +0100
-Subject: [PATCH] configure.ac: fix build with autoconf-2.71
-
-* fixes:
- | autoreconf: running: intltoolize --copy --force
- | ERROR: 'IT_PROG_INTLTOOL' must appear in configure.ac for intltool to work.
- | autoreconf: error: intltoolize failed with exit status: 1
-
-* replace AM_GLIB_GNU_GETTEXT with AM_GNU_GETTEXT as suggested in:
- https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
- https://blogs.gnome.org/jjardon/2010/10/08/use-upstream-gettext-instead-the-glib-one/
- because the former is causing issues with autoconf-2.71:
-
- -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
- -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
- -../autoconf-2.71/lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
- -../autoconf-2.71/lib/autoconf/headers.m4:89: _AC_CHECK_HEADER_COMPILE is expanded from...
- -../autoconf-2.71/lib/autoconf/headers.m4:56: AC_CHECK_HEADER is expanded from...
- -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from...
- -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from...
- -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from...
- -configure.ac:266: the top level])
- -m4trace:configure.ac:266: -1- m4_pattern_allow([^ENABLE_NLS$])
- -m4trace:configure.ac:266: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
- -You should run autoupdate.], [../autoconf-2.71/lib/autoconf/status.m4:1025: AC_OUTPUT_COMMANDS is expanded from...
- -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:150: GLIB_WITH_NLS is expanded from...
- -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:370: GLIB_GNU_GETTEXT is expanded from...
- -pidgin/2.14.1-r0/recipe-sysroot-native/usr/share/aclocal/glib-gettext.m4:470: AM_GLIB_GNU_GETTEXT is expanded from...
- -configure.ac:266: the top level])
-
- and then configure fails with:
-
- configure.ac:2621: error: `po/stamp-it' is already registered with AC_CONFIG_COMMANDS.
- autoconf-2.71/lib/autoconf/status.m4:1008: AC_CONFIG_COMMANDS is expanded from...
- configure.ac:2621: the top level
-
-* add AM_GNU_GETTEXT_VERSION as well to resolve warning with autoconf-2.71
- configure.ac: warning: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- ABOUT-NLS | 1 +
- Makefile.am | 6 +---
- configure.ac | 6 ++--
- pidgin/Makefile.am | 7 ++--
- po/Makevars | 82 ++++++++++++++++++++++++++++++++++++++++++++++
- po/POTFILES.in | 1 -
- 6 files changed, 92 insertions(+), 11 deletions(-)
- create mode 100644 ABOUT-NLS
- create mode 100644 po/Makevars
-
-diff --git a/ABOUT-NLS b/ABOUT-NLS
-new file mode 100644
-index 0000000..0a9d56d
---- /dev/null
-+++ b/ABOUT-NLS
-@@ -0,0 +1 @@
-+<https://www.gnu.org/software/gettext/manual/html_node/Users.html>
-diff --git a/Makefile.am b/Makefile.am
-index f8e2bc9..a74145f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,9 +13,6 @@ EXTRA_DIST = \
- fix-casts.sh \
- gaim.pc.in \
- gaim-uninstalled.pc.in \
-- intltool-extract.in \
-- intltool-merge.in \
-- intltool-update.in \
- package_revision.h \
- pidgin.apspec.in \
- pidgin.spec.in \
-@@ -139,5 +136,4 @@ endif
- distuninstallcheck_listfiles = \
- find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm
-
--DISTCLEANFILES= intltool-extract intltool-merge intltool-update \
-- package_revision_raw.txt
-+DISTCLEANFILES=package_revision_raw.txt
-diff --git a/configure.ac b/configure.ac
-index 81d8592..e2280cd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,7 @@ fi
-
- AC_CANONICAL_HOST
- AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2])
-+AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 foreign])
- dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-@@ -257,12 +257,12 @@ dnl #######################################################################
- AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
-
- if test x$enable_i18n = xyes; then
-- AC_PROG_INTLTOOL
- GETTEXT_PACKAGE=pidgin
- AC_SUBST(GETTEXT_PACKAGE)
-
- ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW"
-- AM_GLIB_GNU_GETTEXT
-+ AM_GNU_GETTEXT([external])
-+ AM_GNU_GETTEXT_VERSION([0.21])
-
- dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
- dnl AM_GLIB_GNU_GETTEXT found it.
-diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
-index 2278b88..4d32c53 100644
---- a/pidgin/Makefile.am
-+++ b/pidgin/Makefile.am
-@@ -192,13 +192,16 @@ DESKTOP_FILE=data/pidgin.desktop
- appsdir = $(datadir)/applications
- apps_in_files = data/pidgin.desktop.in
- apps_DATA = $(apps_in_files:.desktop.in=.desktop)
--@INTLTOOL_DESKTOP_RULE@
-+
-+data/pidgin.desktop: data/pidgin.desktop.in
-+ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
- appdatadir = $(datarootdir)/appdata
- appdata_DATA = $(appdata_in_files:.xml.in=.xml)
- appdata_in_files = data/pidgin.appdata.xml.in
-
--@INTLTOOL_XML_RULE@
-+data/pidgin.appdata.xml: data/pidgin.appdata.xml.in
-+ $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@
-
- endif # INSTALL_I18N
-
-diff --git a/po/Makevars b/po/Makevars
-new file mode 100644
-index 0000000..970237a
---- /dev/null
-+++ b/po/Makevars
-@@ -0,0 +1,82 @@
-+# Makefile variables for PO directory in any package using GNU gettext.
-+#
-+# Copyright (C) 2003-2019 Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to use, copy, distribute, and modify it.
-+
-+# Usually the message domain is the same as the package name.
-+DOMAIN = $(PACKAGE)
-+
-+# These two variables depend on the location of this directory.
-+subdir = po
-+top_builddir = ..
-+
-+# These options get passed to xgettext.
-+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
-+
-+# This is the copyright holder that gets inserted into the header of the
-+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
-+# package. (Note that the msgstr strings, extracted from the package's
-+# sources, belong to the copyright holder of the package.) Translators are
-+# expected to transfer the copyright for their translations to this person
-+# or entity, or to disclaim their copyright. The empty string stands for
-+# the public domain; in this case the translators are expected to disclaim
-+# their copyright.
-+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-+
-+# This tells whether or not to prepend "GNU " prefix to the package
-+# name that gets inserted into the header of the $(DOMAIN).pot file.
-+# Possible values are "yes", "no", or empty. If it is empty, try to
-+# detect it automatically by scanning the files in $(top_srcdir) for
-+# "GNU packagename" string.
-+PACKAGE_GNU =
-+
-+# This is the email address or URL to which the translators shall report
-+# bugs in the untranslated strings:
-+# - Strings which are not entire sentences, see the maintainer guidelines
-+# in the GNU gettext documentation, section 'Preparing Strings'.
-+# - Strings which use unclear terms or require additional context to be
-+# understood.
-+# - Strings which make invalid assumptions about notation of date, time or
-+# money.
-+# - Pluralisation problems.
-+# - Incorrect English spelling.
-+# - Incorrect formatting.
-+# It can be your email address, or a mailing list address where translators
-+# can write to without being subscribed, or the URL of a web page through
-+# which the translators can contact you.
-+MSGID_BUGS_ADDRESS =
-+
-+# This is the list of locale categories, beyond LC_MESSAGES, for which the
-+# message catalogs shall be used. It is usually empty.
-+EXTRA_LOCALE_CATEGORIES =
-+
-+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-+# context. Possible values are "yes" and "no". Set this to yes if the
-+# package uses functions taking also a message context, like pgettext(), or
-+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-+USE_MSGCTXT = no
-+
-+# These options get passed to msgmerge.
-+# Useful options are in particular:
-+# --previous to keep previous msgids of translated messages,
-+# --quiet to reduce the verbosity.
-+MSGMERGE_OPTIONS =
-+
-+# These options get passed to msginit.
-+# If you want to disable line wrapping when writing PO files, add
-+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-+# MSGINIT_OPTIONS.
-+MSGINIT_OPTIONS =
-+
-+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-+# has changed. Possible values are "yes" and "no". Set this to no if
-+# the POT file is checked in the repository and the version control
-+# program ignores timestamps.
-+PO_DEPENDS_ON_POT = no
-+
-+# This tells whether or not to forcibly update $(DOMAIN).pot and
-+# regenerate PO files on "make dist". Possible values are "yes" and
-+# "no". Set this to no if the POT file and PO files are maintained
-+# externally.
-+DIST_DEPENDS_ON_UPDATE_PO = no
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index a5691a1..b494bf3 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -1,4 +1,3 @@
--[encoding: UTF-8]
- finch/finch.c
- finch/gntaccount.c
- finch/gntblist.c
diff --git a/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch b/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch
deleted file mode 100644
index 99c523d5d9d..00000000000
--- a/meta-oe/recipes-support/pidgin/pidgin/0002-configure.ac-disable-few-languages-not-compatible-wi.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 861c8a63c36f9ee7d46238c9bc13a2c1f14372c3 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 7 Feb 2021 14:35:14 +0000
-Subject: [PATCH] configure.ac: disable few languages not compatible with
- modern gettext
-
-* as pidgin-3 development is moving to meson and probably
- most of these changes won't be applicable there, lets just
- disable them until someone interested steps-up to maintain it
-
-* these 3 fail with:
-cd ../../pidgin-2.14.1/po && rm -f brx.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o brx.1po brx.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o brx.gmo brx.1po && rm -f brx.1po
-cd ../../pidgin-2.14.1/po && rm -f zh_HK.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_HK.1po zh_HK.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_HK.gmo zh_HK.1po && rm -f zh_HK.1po
-cd ../../pidgin-2.14.1/po && rm -f zh_TW.gmo && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgmerge --for-msgfmt -o zh_TW.1po zh_TW.po pidgin.pot && pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt -c --statistics --verbose -o zh_TW.gmo zh_TW.1po && rm -f zh_TW.1po
-zh_HK.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications.
-pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error
-zh_TW.1po:2790: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications.
-pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 1 fatal error
-zh_HK.1po: 3234 translated messages.
-make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_HK.gmo] Error 1
-make[3]: *** Waiting for unfinished jobs....
-zh_TW.1po: 3234 translated messages.
-make[3]: *** [Makefile:415: ../../pidgin-2.14.1/po/zh_TW.gmo] Error 1
-brx.1po:778: number of format specifications in 'msgid' and 'msgstr' does not match
-brx.1po:3179: number of format specifications in 'msgid' and 'msgstr' does not match
-brx.1po:5175: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same
-brx.1po:5184: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same
-brx.1po:7754: format specifications in 'msgid_plural' and 'msgstr[0]' for argument 1 are not the same
-pidgin/2.14.1-r0/recipe-sysroot-native/usr/bin/msgfmt: found 8 fatal errors
-brx.1po: 3246 translated messages.
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e2280cd..9332932 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -260,7 +260,7 @@ if test x$enable_i18n = xyes; then
- GETTEXT_PACKAGE=pidgin
- AC_SUBST(GETTEXT_PACKAGE)
-
-- ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br brx bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN zh_HK zh_TW"
-+ ALL_LINGUAS="af am ar ar_SA as ast az be@latin bg bn_IN bn br bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es_AR es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ks ku_IQ ku lt lv mai mhr mk ml mn mr ms_MY my_MM nb ne nl nn oc or pa pl ps pt_BR pt ro ru sd si sk sl sq sr@latin sr sv sw ta te th tr tt uk ur uz vi xh zh_CN"
- AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.21])
-
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb
similarity index 94%
rename from meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb
rename to meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb
index d22380eb0df..ba0dca233ba 100644
--- a/meta-oe/recipes-support/pidgin/pidgin_2.14.1.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb
@@ -11,11 +11,9 @@ SRC_URI = "\
${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
file://sanitize-configure.ac.patch \
file://purple-OE-branding-25.patch \
- file://0001-configure.ac-fix-build-with-autoconf-2.71.patch \
- file://0002-configure.ac-disable-few-languages-not-compatible-wi.patch \
"
-SRC_URI[sha256sum] = "f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780"
+SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603"
PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \
@@ -39,9 +37,9 @@ PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss"
+PACKAGECONFIG[cyrus-sasl] = "--enable-cyrus-sasl,--disable-cyrus-sasl,cyrus-sasl"
EXTRA_OECONF = " \
- --with-python=python3 \
--disable-perl \
--disable-tcl \
--disable-gevolution \
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 21/36] networkmanager: upgrade 1.28.0 -> 1.30.2
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (19 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 20/36] pidgin: upgrade to 2.14.2 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 22/36] mousepad: upgrade 0.5.3 -> 0.5.4 akuster
` (15 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 22104 bytes --]
From: Vinicius Aquino <voa.aquino@gmail.com>
Upgrade to release 1.30.2:
- 0004-fix_reallocarray_check.patch removed because the current
version of nm already includes boths malloc.h and stdlib.h
- musl/0002-Fix-build-with-musl.patch removed because the commit
c50da167bc of nm solves the build issue with musl
- musl/0001-Fix-build-with-musl-systemd-specific.patch modified
to avoid conflicts when applied to current version of nm
- musl/0003-Fix-build-with-musl-systemd-specific.patch renamed
to musl/0002-Fix-build-with-musl-systemd-specific.patch and
modified to avoid conflicts when applied to current version of nm
Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 12a241278aec8893d65dc6fa8d045b0bac0220ea)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ttings-settings-property-documentati.patch | 50 ++------
.../0004-fix_reallocarray_check.patch | 27 ----
...Fix-build-with-musl-systemd-specific.patch | 52 +++-----
...Fix-build-with-musl-systemd-specific.patch | 26 ++++
.../musl/0002-Fix-build-with-musl.patch | 121 ------------------
...Fix-build-with-musl-systemd-specific.patch | 26 ----
...ger_1.28.0.bb => networkmanager_1.30.2.bb} | 6 +-
7 files changed, 59 insertions(+), 249 deletions(-)
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.28.0.bb => networkmanager_1.30.2.bb} (96%)
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
index ecd13504d33..0a86abafc06 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
@@ -1,34 +1,29 @@
-From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 16 Jan 2021 14:27:38 +0100
+From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001
+From: Vinicius Aquino <voa.aquino@gmail.com>
+Date: Thu, 1 Apr 2021 14:13:07 -0300
Subject: [PATCH] Do not create settings settings/property documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
It was tried to get this work by adding python3-pygobject-native to DEPENDS but
-compile could not find (configure passed) python module gi.
+compile could not find (configure passed) python module gi.
Anyway it is not necessary for us to have the settings/property docs.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
+Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
---
- Makefile.am | 13 -------------
- configure.ac | 5 -----
- 2 files changed, 18 deletions(-)
+ Makefile.am | 4 ----
+ configure.ac | 5 -----
+ 2 files changed, 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 110957a..b4cfbcc 100644
+index 9279672c1..2e52acbb2 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -1587,14 +1587,10 @@ libnm/libnm.typelib: libnm/libnm.gir
+@@ -1686,14 +1686,10 @@ libnm/libnm.typelib: libnm/libnm.gir
INTROSPECTION_GIRS += libnm/NM-1.0.gir
libnm_noinst_data = \
@@ -43,30 +38,11 @@ index 110957a..b4cfbcc 100644
$(NULL)
noinst_DATA += $(libnm_noinst_data)
-@@ -4448,18 +4444,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
- $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
-
- clients_common_settings_doc_h = clients/common/settings-docs.h
--if HAVE_INTROSPECTION
--$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp
-- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
--DISTCLEANFILES += $(clients_common_settings_doc_h)
--check-local-settings-docs: $(clients_common_settings_doc_h)
-- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
--check_local += check-local-settings-docs
--else
- $(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
- $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
- check-local-settings-docs:
--endif
- EXTRA_DIST += \
- $(clients_common_settings_doc_h) \
- $(clients_common_settings_doc_h).in
diff --git a/configure.ac b/configure.ac
-index 704b1c1..18bba87 100644
+index 784ac4695..681e6cb32 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1228,11 +1228,6 @@ GTK_DOC_CHECK(1.0)
+@@ -1241,11 +1241,6 @@ GTK_DOC_CHECK(1.0)
# check if we can build setting property documentation
build_docs=no
if test -n "$INTROSPECTION_MAKEFILE"; then
@@ -79,5 +55,5 @@ index 704b1c1..18bba87 100644
if test -z "$PERL"; then
AC_MSG_ERROR([--enable-introspection requires perl])
--
-2.26.2
+2.20.1
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
deleted file mode 100644
index 2df449f2eba..00000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-fix_reallocarray_check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-reallocarray() is coming from stdlib.h which maybe indirectly included
-by malloc.h but not on all libc implementations
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/meson.build
-+++ b/meson.build
-@@ -114,7 +114,7 @@ config_h.set10('HAVE_GETRANDOM', use_sys
- #include <sys/wait.h>'''))
- config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
- config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv'))
--config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <malloc.h>'))
-+config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <stdlib.h>'))
- config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include <string.h>'))
- config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include <sys/mman.h>'))
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,7 +82,7 @@ AC_CHECK_DECLS([
- AC_CHECK_DECLS([
- reallocarray],
- [], [], [[
--#include <malloc.h>
-+#include <stdlib.h>
- ]])
-
- AC_CHECK_DECLS([
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
index 7807fc77c68..692f1ffa4f4 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch
@@ -1,12 +1,11 @@
-From 9597122867c22e949ef3b69c779e0facebce6eb5 Mon Sep 17 00:00:00 2001
+From 44884c7e7655b889f41cb02ffc8ab72a29b52ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 2 Apr 2019 01:34:35 +0200
-Subject: [PATCH] Fix build with musl - systemd specific
+Subject: [PATCH 1/2] Fix build with musl - systemd specific
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -17,18 +16,18 @@ for musl.
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
+Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com>
---
shared/systemd/src/basic/in-addr-util.c | 1 +
shared/systemd/src/basic/process-util.c | 9 +++++++++
shared/systemd/src/basic/socket-util.h | 6 ++++++
- shared/systemd/src/basic/sort-util.h | 27 ++++---------------------
+ shared/systemd/src/basic/sort-util.h | 13 ++++---------
shared/systemd/src/basic/stdio-util.h | 2 ++
shared/systemd/src/basic/string-util.h | 5 +++++
- 6 files changed, 27 insertions(+), 23 deletions(-)
+ 6 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
-index 1ea3e7f..1204393 100644
+index c315dcbb8..5b7e04eb7 100644
--- a/shared/systemd/src/basic/in-addr-util.c
+++ b/shared/systemd/src/basic/in-addr-util.c
@@ -15,6 +15,7 @@
@@ -40,7 +39,7 @@ index 1ea3e7f..1204393 100644
#include "string-util.h"
#include "strxcpyx.h"
diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
-index 03ca04e..be8bca8 100644
+index 0e25b0200..ea2c0fbb4 100644
--- a/shared/systemd/src/basic/process-util.c
+++ b/shared/systemd/src/basic/process-util.c
@@ -17,6 +17,9 @@
@@ -80,7 +79,7 @@ index 03ca04e..be8bca8 100644
cached_pid = CACHED_PID_UNSET;
return new_pid;
diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
-index 1ece911..290e94c 100644
+index 1de069476..f6834fbd2 100644
--- a/shared/systemd/src/basic/socket-util.h
+++ b/shared/systemd/src/basic/socket-util.h
@@ -14,6 +14,12 @@
@@ -94,10 +93,10 @@ index 1ece911..290e94c 100644
+#endif
+
#include "macro.h"
+ #include "missing_network.h"
#include "missing_socket.h"
- #include "sparse-endian.h"
diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h
-index a8dc3bb..ff0aa88 100644
+index a8984fc16..5fb90f8c5 100644
--- a/shared/systemd/src/basic/sort-util.h
+++ b/shared/systemd/src/basic/sort-util.h
@@ -5,15 +5,10 @@
@@ -120,40 +119,22 @@ index a8dc3bb..ff0aa88 100644
/**
* Normal bsearch requires base to be nonnull. Here were require
-@@ -54,17 +49,3 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f
- int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \
- _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
- })
--
--static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) {
-- if (nmemb <= 1)
-- return;
--
-- assert(base);
-- qsort_r(base, nmemb, size, compar, userdata);
--}
--
--#define typesafe_qsort_r(p, n, func, userdata) \
-- ({ \
-- int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \
-- qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \
-- })
diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h
-index c3b9448..e80a938 100644
+index d45d3c1a6..fee1a57ca 100644
--- a/shared/systemd/src/basic/stdio-util.h
+++ b/shared/systemd/src/basic/stdio-util.h
-@@ -1,7 +1,9 @@
- /* SPDX-License-Identifier: LGPL-2.1+ */
+@@ -2,7 +2,9 @@
#pragma once
+ #if 0 /* NM_IGNORED */
+#if defined(__GLIBC__)
#include <printf.h>
+#endif
+ #endif /* NM_IGNORED */
#include <stdarg.h>
#include <stdio.h>
- #include <sys/types.h>
diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
-index cefbda3..71e4dec 100644
+index 593cf04ae..541c393f6 100644
--- a/shared/systemd/src/basic/string-util.h
+++ b/shared/systemd/src/basic/string-util.h
@@ -26,6 +26,11 @@
@@ -168,3 +149,6 @@ index cefbda3..71e4dec 100644
int strcmp_ptr(const char *a, const char *b) _pure_;
int strcasecmp_ptr(const char *a, const char *b) _pure_;
+--
+2.20.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch
new file mode 100644
index 00000000000..d83efd39e46
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch
@@ -0,0 +1,26 @@
+From 7d9a11a17da425d106791ada7100d7a6559e6065 Mon Sep 17 00:00:00 2001
+From: Adrian Freihofer <adrian.freihofer@siemens.com>
+Date: Sat, 7 Mar 2020 14:24:01 +0100
+Subject: [PATCH 2/2] Fix build with musl - systemd specific
+
+---
+ src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
+index 3fafd3c0e..79d6096c2 100644
+--- a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
++++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c
+@@ -8,7 +8,9 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #if 0 /* NM_IGNORED */
++#ifdef __GLIBC__ /* musl supplies full set of userspace headers */
+ #include <linux/if_arp.h>
++#endif
+ #else /* NM_IGNORED */
+ #include <net/if_arp.h>
+ #endif /* NM_IGNORED */
+--
+2.20.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
deleted file mode 100644
index 0f43c0c6840..00000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From bacc14089c80ec757025789ff054a05e1f9c088d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 8 Apr 2019 23:10:43 +0200
-Subject: [PATCH] Fix build with musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The build issues caused by definition conflicts musl vs linux-libc headers
-(error: redefinition of ...) can be reduced to two headers:
-
-1. netinet/if_ether.h <-> linux/if_ether.h: linux-libc header plays well with
- glibc and musl headers in case libc's variant (netinet/if_ether.h) is
- included BEFORE linux variant [1]. We add include at two positions:
- 1. shared/nm-default.h: This is a global which used for networkmanager and
- is included at the very beginning of all c-files.
- 2. libnm-core/nm-utils.h: This file makes it into installation and is used
- by dependent packages as network-manager-applet
-2. net/if_arp. <-> linux/if_ether.h: linux-libc: Unfortunaly these files do
- not play together in harmony. Therefore the libc variant is included early in
- shared/nm-default.h and occurances linux/if_arp.h are removed.
-
-Note:
-Be aware that this is still nasty business: We have to trust that musl headers
-define same signatures as linux would do - just because musl-makers consider
-linux-libc headers 'notoriously broken for userspace' [2] (search for
-'error: redefinition of').
-
-[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-March/280440.html
-[2] https://wiki.musl-libc.org/faq.html
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
----
- clients/tui/nmt-device-entry.c | 1 -
- libnm-core/nm-utils.h | 4 ++++
- shared/nm-default.h | 3 +++
- src/devices/nm-device.c | 2 +-
- src/platform/nm-linux-platform.c | 1 -
- 5 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
-index 692a467..cf9b32e 100644
---- a/clients/tui/nmt-device-entry.c
-+++ b/clients/tui/nmt-device-entry.c
-@@ -26,7 +26,6 @@
- #include "nmt-device-entry.h"
-
- #include <sys/socket.h>
--#include <linux/if_arp.h>
-
- #include "nmtui.h"
-
-diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 9589c51..b82c5cf 100644
---- a/libnm-core/nm-utils.h
-+++ b/libnm-core/nm-utils.h
-@@ -10,6 +10,10 @@
- #error "Only <NetworkManager.h> can be included directly."
- #endif
-
-+/* include as early as possible for musl */
-+#include <netinet/if_ether.h>
-+/* #include <net/if_arp.h> - uncoment for broken dependents?? */
-+
- #include <glib.h>
-
- #include <netinet/in.h>
-diff --git a/shared/nm-default.h b/shared/nm-default.h
-index b322f1d..c287dbe 100644
---- a/shared/nm-default.h
-+++ b/shared/nm-default.h
-@@ -178,6 +178,9 @@
- #endif
-
- #include <stdlib.h>
-+/* include as early as possible for musl */
-+#include <netinet/if_ether.h>
-+#include <net/if_arp.h>
-
- /*****************************************************************************/
-
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 0be05f2..04061f9 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -9,6 +9,7 @@
- #include "nm-device.h"
-
- #include <netinet/in.h>
-+#include <net/if.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <signal.h>
-@@ -17,7 +18,6 @@
- #include <arpa/inet.h>
- #include <fcntl.h>
- #include <linux/if_addr.h>
--#include <linux/if_arp.h>
- #include <linux/rtnetlink.h>
-
- #include "nm-std-aux/unaligned.h"
-diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
-index b377c85..87af59a 100644
---- a/src/platform/nm-linux-platform.c
-+++ b/src/platform/nm-linux-platform.c
-@@ -14,7 +14,6 @@
- #include <libudev.h>
- #include <linux/fib_rules.h>
- #include <linux/ip.h>
--#include <linux/if_arp.h>
- #include <linux/if_bridge.h>
- #include <linux/if_link.h>
- #include <linux/if_tun.h>
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
deleted file mode 100644
index 5735d51a8cd..00000000000
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-systemd-specific.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ed748a28076eada9f38e3f4a476f28d7a10ba84b Mon Sep 17 00:00:00 2001
-From: Adrian Freihofer <adrian.freihofer@siemens.com>
-Date: Sat, 7 Mar 2020 14:24:01 +0100
-Subject: [PATCH] Fix build with musl - systemd specific
-
----
- src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-index ec7f1be..31bcd4d 100644
---- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
-@@ -7,7 +7,9 @@
-
- #include <errno.h>
- #include <sys/ioctl.h>
-+#ifdef __GLIBC__ /* musl supplies full set of userspace headers */
- #include <linux/if_arp.h>
-+#endif
- #include <linux/if_infiniband.h>
-
- #include "sd-dhcp6-client.h"
---
-2.24.1
-
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb
similarity index 96%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb
index 7a20e914f16..ec3bdd22bdc 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.2.bb
@@ -26,14 +26,12 @@ SRC_URI = " \
file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
file://0002-Do-not-create-settings-settings-property-documentati.patch \
file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \
- file://0004-fix_reallocarray_check.patch \
"
SRC_URI_append_libc-musl = " \
file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
- file://musl/0002-Fix-build-with-musl.patch \
- file://musl/0003-Fix-build-with-musl-systemd-specific.patch \
+ file://musl/0002-Fix-build-with-musl-systemd-specific.patch \
"
-SRC_URI[sha256sum] = "3e170e9045e20598d2630e40c5789b2e2c46b942bfe5cb220f36202299253062"
+SRC_URI[sha256sum] = "0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2"
S = "${WORKDIR}/NetworkManager-${PV}"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 22/36] mousepad: upgrade 0.5.3 -> 0.5.4
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (20 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 21/36] networkmanager: upgrade 1.28.0 -> 1.30.2 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 23/36] xfce4-battery-plugin: upgrade 1.1.3 -> 1.1.4 akuster
` (14 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
Release notes for 0.5.4
=======================
- New Features:
- Add --line/-l and --column/-c number (#107, !83)
- Port to GtkSourceView 4 (#55, #80, !10)
- Bug Fixes:
- Delay request to scroll to cursor for the correct active view
- Monitor hardlinks with glib 2.56.2 (#110, !82)
- Transfer encoding from remote to primary instance (#109)
- Prevent a crash when no language is found
- Make window require attention when opening new tabs (#106, #93, !81)
- Fix BOM array (!80)
- Correctly initialize toolbar style combo box (#103)
- Allow checking parent sources when looking up schema (#101)
- Fix missing parameter to "select-all" signal (!79)
- Translation Updates
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 60480f82af8c5d40932c469b0674641b73f7ced1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../mousepad/{mousepad_0.5.3.bb => mousepad_0.5.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-apps/mousepad/{mousepad_0.5.3.bb => mousepad_0.5.4.bb} (67%)
diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.5.3.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb
similarity index 67%
rename from meta-xfce/recipes-apps/mousepad/mousepad_0.5.3.bb
rename to meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb
index 1fba679148d..7a2f12b1e29 100644
--- a/meta-xfce/recipes-apps/mousepad/mousepad_0.5.3.bb
+++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.5.4.bb
@@ -3,11 +3,11 @@ SECTION = "x11/application"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native"
+DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native"
inherit xfce-app gsettings mime-xdg
-SRC_URI[sha256sum] = "e7208bb9e96a1525d3358a64f9cdd165005078e84e81984a953a2a03491fcaa8"
+SRC_URI[sha256sum] = "d90f492e5d0cba5f5b3b0c1eb7fd7c1701aef57e3fa244d2c457e7f9b0a42aa1"
FILES_${PN} += " \
${datadir}/glib-2.0/schemas \
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 23/36] xfce4-battery-plugin: upgrade 1.1.3 -> 1.1.4
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (21 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 22/36] mousepad: upgrade 0.5.3 -> 0.5.4 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 24/36] gigolo: upgrade 0.5.1 -> 0.5.2 akuster
` (13 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
Release notes for 1.1.4
=======================
- Add help button to properties dialog
- Drop subtitle from settings dialog
- Fix labels alignment for very small panels
- Fix compilation warnings
- automake: INCLUDES -> AM_CPPFLAGS
- autoconf: Some updates
- Remove unnecessary boxes
- Remove GSourceFunc casts
- Add new README.md, update AM_INIT_AUTOMAKE
- Add basic GitLab pipeline
- Update URLs from goodies.xfce.org to docs.xfce.org (Bug #16154)
- Translation Updates
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 745e253618a10224d653f6c0f0eefb1e11b5a87c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...4-battery-plugin_1.1.3.bb => xfce4-battery-plugin_1.1.4.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-xfce/recipes-panel-plugins/battery/{xfce4-battery-plugin_1.1.3.bb => xfce4-battery-plugin_1.1.4.bb} (66%)
diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb
similarity index 66%
rename from meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb
rename to meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb
index ecbdc265e48..9e65cf688a8 100644
--- a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb
+++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb
@@ -5,5 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
inherit xfce-panel-plugin
-SRC_URI[md5sum] = "9f82c7e77de0a417716d68d33367973b"
-SRC_URI[sha256sum] = "12be0a44d16bd1e1618513ee64f946814925872db7d1c1188ab1454b00d040a3"
+SRC_URI[sha256sum] = "107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 24/36] gigolo: upgrade 0.5.1 -> 0.5.2
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (22 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 23/36] xfce4-battery-plugin: upgrade 1.1.3 -> 1.1.4 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 25/36] thunar: upgrade 4.16.4 -> 4.16.6 akuster
` (12 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
Release notes for 0.5.2
=======================
A bugfix and translation update, a new icon, various cleanups.. thanks
to all contributors !
======
- Update TODO
- Refresh Glade file, drop unused tab labels (fixes #13)
- move the logic setting GtkSpin port value to setup_for_type() (#11)
- Use new icon in window titlebar
- Fix compilation warnings
- autoconf: Some updates
- Only show an error dialog if the host field is visible/required
- Remove capitalization from icon name
- Update GenericName (#2)
- Fix comment style.
- Remove GSourceFunc casts
- Update Makefile.am
- Add gigolo.ui to POTFILES.in (Issue #6)
- Added new icons following new style and reverse DNS format.
- Add new README.md and update AM_INIT_AUTOMAKE
- Add basic GitLab pipeline
- Bug #16717: Move from exo-csource to xdt-csource
- Translation Updates
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e2add121d2713ca72f3c4cf6ae2d557dd4cfc062)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-apps/gigolo/{gigolo_0.5.1.bb => gigolo_0.5.2.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta-xfce/recipes-apps/gigolo/{gigolo_0.5.1.bb => gigolo_0.5.2.bb} (67%)
diff --git a/meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb
similarity index 67%
rename from meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb
rename to meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb
index 1233fe0693c..517f1f4c506 100644
--- a/meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb
+++ b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb
@@ -7,5 +7,4 @@ DEPENDS = "gtk+3 intltool-native xfce4-dev-tools-native"
inherit xfce-app
-SRC_URI[md5sum] = "94e89ad3fabba7167760004b64062f4a"
-SRC_URI[sha256sum] = "ca87badb5871e4844579704704ea9e5ede444f710a3b264c12b60b2a0e48e14e"
+SRC_URI[sha256sum] = "e34a1aa0755f9f6c234c7d24b23a6cecd6ef50741d79da3bb6f698a2281dbbc3"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 25/36] thunar: upgrade 4.16.4 -> 4.16.6
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (23 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 24/36] gigolo: upgrade 0.5.1 -> 0.5.2 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 26/36] poppler: upgrade 21.03.0 -> 21.04.0 akuster
` (11 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
4.16.6
======
- Reload current directory before selecting new files (Issue #524)
- tree-view: Hide menu-item "properties" for unmounted devices
- Removed 'the root folder has no parent' dialog box
- Revamp documentation to modernize/uniformize accross components
- Remove watches on shortcuts (Issue #513) (Issue #47)
- Translation Updates:
Finnish, Occitan
4.16.5
======
- Revert "Bookmarks no longer need an existing file (Issue #47)"
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 905b27cc610c78c28424ab1a1d122852b0787367)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-xfce/thunar/{thunar_4.16.4.bb => thunar_4.16.6.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.4.bb => thunar_4.16.6.bb} (89%)
diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.16.4.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb
similarity index 89%
rename from meta-xfce/recipes-xfce/thunar/thunar_4.16.4.bb
rename to meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb
index e5fd5ffd3ad..128043d19b7 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_4.16.4.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb
@@ -8,7 +8,7 @@ inherit xfce gobject-introspection features_check mime-xdg
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[sha256sum] = "d51a2018c1ba7dcc420e7a84d85cc17a58f26fb1c80ee4c15e689a49f10425f9"
+SRC_URI[sha256sum] = "cb531d3fe67196a43ca04979ef271ece7858bbc80c15b0ee4323c1252a1a02b7"
PACKAGECONFIG ??= ""
PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 26/36] poppler: upgrade 21.03.0 -> 21.04.0
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (24 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 25/36] thunar: upgrade 4.16.4 -> 4.16.6 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 27/36] opencv: Upgrade to 5.4.2 akuster
` (10 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@gmail.com>
Release 21.04.0
core:
* Hide symbols by default
* TextSelectionDumper: fix word order for RTL text
* Fix rendering of text in some files. Issue #1052
* Implement rendering of Masks of Image subtype. Issue #1058
* Forms: fix unclicking standalone form buttons. Issue #1034
glib:
* Expose more fields from MediaRendition in PopplerMedia
* Use stock glib macro to define boxed type
* Remove incorrecly used volatile from enum type registration code
qt5:
* Fix crash in files with malformed signatures
* Fix memory leak when QImage constructor "fails"
qt6:
* Fix crash in files with malformed signatures
* Fix memory leak when QImage constructor "fails"
utils:
* pdfsig: New paragraph for "-sign" in manpage
* pdfimages: Do not assert in "too big images". Issue #1061
build system:
* Require cmake >= 3.10
* Require Qt 5 >= 5.9
* Require glib >= 2.56
* Require gtk 3 >= 3.22
* Require gdk-pixbuf >= 2.36
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 643af3ee2cf61d12123374ba915ce71c4a56410b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...tock-glib-macro-to-define-boxed-type.patch | 228 ------------------
...rrecly-used-volatile-from-enum-type-.patch | 47 ----
...{poppler_21.03.0.bb => poppler_21.04.0.bb} | 4 +-
3 files changed, 1 insertion(+), 278 deletions(-)
delete mode 100644 meta-oe/recipes-support/poppler/poppler/0001-glib-Use-stock-glib-macro-to-define-boxed-type.patch
delete mode 100644 meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch
rename meta-oe/recipes-support/poppler/{poppler_21.03.0.bb => poppler_21.04.0.bb} (89%)
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-glib-Use-stock-glib-macro-to-define-boxed-type.patch b/meta-oe/recipes-support/poppler/poppler/0001-glib-Use-stock-glib-macro-to-define-boxed-type.patch
deleted file mode 100644
index 89de98c0cb9..00000000000
--- a/meta-oe/recipes-support/poppler/poppler/0001-glib-Use-stock-glib-macro-to-define-boxed-type.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 17b25e3122685d8277fe70fb6d27ab1eaf15b3e7 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 26 Mar 2021 18:17:25 +0100
-Subject: [PATCH 1/2] glib: Use stock glib macro to define boxed type
-
-Upstream-Staus: Backport [https://github.com/freedesktop/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b]
-Poppler already depends on a sufficiently new glib version, so we can
-simply use G_DEFINE_BOXED_TYPE instead of defining our own macro.
----
- glib/poppler-action.cc | 4 ++--
- glib/poppler-annot.cc | 2 +-
- glib/poppler-document.cc | 6 +++---
- glib/poppler-page.cc | 20 ++++++++++----------
- glib/poppler-private.h | 15 ---------------
- glib/poppler-structure-element.cc | 4 ++--
- 6 files changed, 18 insertions(+), 33 deletions(-)
-
-diff --git a/glib/poppler-action.cc b/glib/poppler-action.cc
-index d395db7..b772a3c 100644
---- a/glib/poppler-action.cc
-+++ b/glib/poppler-action.cc
-@@ -25,7 +25,7 @@
- * @title: PopplerAction
- */
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
-+G_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
-
- /**
- * poppler_dest_copy:
-@@ -88,7 +88,7 @@ static PopplerActionLayer *poppler_action_layer_copy(PopplerActionLayer *action_
- return retval;
- }
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, poppler_action_free)
-+G_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, poppler_action_free)
-
- /**
- * poppler_action_free:
-diff --git a/glib/poppler-annot.cc b/glib/poppler-annot.cc
-index f4c5bb1..5320565 100644
---- a/glib/poppler-annot.cc
-+++ b/glib/poppler-annot.cc
-@@ -1693,7 +1693,7 @@ gchar *poppler_annot_file_attachment_get_name(PopplerAnnotFileAttachment *popple
- }
-
- /* PopplerAnnotCalloutLine */
--POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, poppler_annot_callout_line_copy, poppler_annot_callout_line_free)
-+G_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, poppler_annot_callout_line_copy, poppler_annot_callout_line_free)
-
- /**
- * poppler_annot_callout_line_new:
-diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
-index bd26bc7..9e62ff6 100644
---- a/glib/poppler-document.cc
-+++ b/glib/poppler-document.cc
-@@ -2360,7 +2360,7 @@ struct _PopplerIndexIter
- int index;
- };
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, poppler_index_iter_copy, poppler_index_iter_free)
-+G_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, poppler_index_iter_copy, poppler_index_iter_free)
-
- /**
- * poppler_index_iter_copy:
-@@ -2579,7 +2579,7 @@ struct _PopplerFontsIter
- int index;
- };
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, poppler_fonts_iter_copy, poppler_fonts_iter_free)
-+G_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, poppler_fonts_iter_copy, poppler_fonts_iter_free)
-
- /**
- * poppler_fonts_iter_get_full_name:
-@@ -3111,7 +3111,7 @@ struct _PopplerLayersIter
- int index;
- };
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, poppler_layers_iter_copy, poppler_layers_iter_free)
-+G_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, poppler_layers_iter_copy, poppler_layers_iter_free)
-
- /**
- * poppler_layers_iter_copy:
-diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
-index 7e21c71..2e229bf 100644
---- a/glib/poppler-page.cc
-+++ b/glib/poppler-page.cc
-@@ -1566,7 +1566,7 @@ void poppler_page_remove_annot(PopplerPage *page, PopplerAnnot *annot)
-
- /* PopplerRectangle type */
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, poppler_rectangle_copy, poppler_rectangle_free)
-+G_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, poppler_rectangle_copy, poppler_rectangle_free)
-
- /**
- * poppler_rectangle_new:
-@@ -1608,7 +1608,7 @@ void poppler_rectangle_free(PopplerRectangle *rectangle)
-
- /* PopplerPoint type */
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, poppler_point_free)
-+G_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, poppler_point_free)
-
- /**
- * poppler_point_new:
-@@ -1657,7 +1657,7 @@ void poppler_point_free(PopplerPoint *point)
-
- /* PopplerQuadrilateral type */
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, poppler_quadrilateral_copy, poppler_quadrilateral_free)
-+G_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, poppler_quadrilateral_copy, poppler_quadrilateral_free)
-
- /**
- * poppler_quadrilateral_new:
-@@ -1705,7 +1705,7 @@ void poppler_quadrilateral_free(PopplerQuadrilateral *quad)
-
- /* PopplerTextAttributes type */
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, poppler_text_attributes_copy, poppler_text_attributes_free)
-+G_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, poppler_text_attributes_copy, poppler_text_attributes_free)
-
- /**
- * poppler_text_attributes_new:
-@@ -1804,7 +1804,7 @@ void poppler_text_attributes_free(PopplerTextAttributes *text_attrs)
- */
-
- /* PopplerColor type */
--POPPLER_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, poppler_color_free)
-+G_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, poppler_color_free)
-
- /**
- * poppler_color_new:
-@@ -1848,7 +1848,7 @@ void poppler_color_free(PopplerColor *color)
- }
-
- /* PopplerLinkMapping type */
--POPPLER_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, poppler_link_mapping_copy, poppler_link_mapping_free)
-+G_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, poppler_link_mapping_copy, poppler_link_mapping_free)
-
- /**
- * poppler_link_mapping_new:
-@@ -1900,7 +1900,7 @@ void poppler_link_mapping_free(PopplerLinkMapping *mapping)
- }
-
- /* Poppler Image mapping type */
--POPPLER_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, poppler_image_mapping_copy, poppler_image_mapping_free)
-+G_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, poppler_image_mapping_copy, poppler_image_mapping_free)
-
- /**
- * poppler_image_mapping_new:
-@@ -1939,7 +1939,7 @@ void poppler_image_mapping_free(PopplerImageMapping *mapping)
- }
-
- /* Page Transition */
--POPPLER_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, poppler_page_transition_copy, poppler_page_transition_free)
-+G_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, poppler_page_transition_copy, poppler_page_transition_free)
-
- /**
- * poppler_page_transition_new:
-@@ -1983,7 +1983,7 @@ void poppler_page_transition_free(PopplerPageTransition *transition)
- }
-
- /* Form Field Mapping Type */
--POPPLER_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, poppler_form_field_mapping_copy, poppler_form_field_mapping_free)
-+G_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, poppler_form_field_mapping_copy, poppler_form_field_mapping_free)
-
- /**
- * poppler_form_field_mapping_new:
-@@ -2035,7 +2035,7 @@ void poppler_form_field_mapping_free(PopplerFormFieldMapping *mapping)
- }
-
- /* PopplerAnnot Mapping Type */
--POPPLER_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, poppler_annot_mapping_copy, poppler_annot_mapping_free)
-+G_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, poppler_annot_mapping_copy, poppler_annot_mapping_free)
-
- /**
- * poppler_annot_mapping_new:
-diff --git a/glib/poppler-private.h b/glib/poppler-private.h
-index d41b59c..1027271 100644
---- a/glib/poppler-private.h
-+++ b/glib/poppler-private.h
-@@ -143,21 +143,6 @@ gboolean _poppler_convert_pdf_date_to_gtime(const GooString *date, time_t *gdate
- GDateTime *_poppler_convert_pdf_date_to_date_time(const GooString *date);
- GooString *_poppler_convert_date_time_to_pdf_date(GDateTime *datetime);
-
--/*
-- * A convenience macro for boxed type implementations, which defines a
-- * type_name_get_type() function registering the boxed type.
-- */
--#define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) \
-- GType type_name##_get_type(void) \
-- { \
-- static volatile gsize g_define_type_id__volatile = 0; \
-- if (g_once_init_enter(&g_define_type_id__volatile)) { \
-- GType g_define_type_id = g_boxed_type_register_static(g_intern_static_string(#TypeName), (GBoxedCopyFunc)copy_func, (GBoxedFreeFunc)free_func); \
-- g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \
-- } \
-- return g_define_type_id__volatile; \
-- }
--
- void _poppler_error_cb(ErrorCategory category, Goffset pos, const char *message);
-
- #endif
-diff --git a/glib/poppler-structure-element.cc b/glib/poppler-structure-element.cc
-index aec7cd1..29d3e5c 100644
---- a/glib/poppler-structure-element.cc
-+++ b/glib/poppler-structure-element.cc
-@@ -581,7 +581,7 @@ struct _PopplerStructureElementIter
- unsigned index;
- };
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerStructureElementIter, poppler_structure_element_iter, poppler_structure_element_iter_copy, poppler_structure_element_iter_free)
-+G_DEFINE_BOXED_TYPE(PopplerStructureElementIter, poppler_structure_element_iter, poppler_structure_element_iter_copy, poppler_structure_element_iter_free)
-
- /**
- * poppler_structure_element_iter_copy:
-@@ -763,7 +763,7 @@ struct _PopplerTextSpan
- PopplerColor color;
- };
-
--POPPLER_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, poppler_text_span_copy, poppler_text_span_free)
-+G_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, poppler_text_span_copy, poppler_text_span_free)
-
- enum
- {
---
-2.31.1
-
diff --git a/meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch b/meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch
deleted file mode 100644
index f4a54a184f2..00000000000
--- a/meta-oe/recipes-support/poppler/poppler/0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8b0890e2d1623e580d8a849e56c1f3a2984e782d Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Fri, 26 Mar 2021 18:17:25 +0100
-Subject: [PATCH 2/2] glib: Remove incorrecly used volatile from enum type
- registration code
-
-Upstream-Status: Backport [https://github.com/freedesktop/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5]
----
- glib/poppler-enums.c.template | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template
-index 26a51b4..eefc769 100644
---- a/glib/poppler-enums.c.template
-+++ b/glib/poppler-enums.c.template
-@@ -15,9 +15,9 @@
- GType
- @enum_name@_get_type (void)
- {
-- static volatile gsize g_define_type_id__volatile = 0;
-+ static volatile gsize g_define_type_id = 0;
-
-- if (g_once_init_enter (&g_define_type_id__volatile)) {
-+ if (g_once_init_enter (&g_define_type_id)) {
- static const G@Type@Value values[] = {
- /*** END value-header ***/
-
-@@ -28,13 +28,13 @@ GType
- /*** BEGIN value-tail ***/
- { 0, NULL, NULL }
- };
-- GType g_define_type_id =
-+ GType type =
- g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
-
-- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-+ g_once_init_leave (&g_define_type_id, type);
- }
-
-- return g_define_type_id__volatile;
-+ return g_define_type_id;
- }
-
- /*** END value-tail ***/
---
-2.31.1
-
diff --git a/meta-oe/recipes-support/poppler/poppler_21.03.0.bb b/meta-oe/recipes-support/poppler/poppler_21.04.0.bb
similarity index 89%
rename from meta-oe/recipes-support/poppler/poppler_21.03.0.bb
rename to meta-oe/recipes-support/poppler/poppler_21.04.0.bb
index b272bc82cce..de5f3803610 100644
--- a/meta-oe/recipes-support/poppler/poppler_21.03.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_21.04.0.bb
@@ -6,10 +6,8 @@ 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-glib-Use-stock-glib-macro-to-define-boxed-type.patch \
- file://0002-glib-Remove-incorrecly-used-volatile-from-enum-type-.patch \
"
-SRC_URI[sha256sum] = "fd51ead4aac1d2f4684fa6e7b0ec06f0233ed21667e720a4e817e4455dd63d27"
+SRC_URI[sha256sum] = "5e2219656c6bbd36154133fef2e12b7d0938464518827098b29a10b1697ea79c"
DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 27/36] opencv: Upgrade to 5.4.2
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (25 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 26/36] poppler: upgrade 21.03.0 -> 21.04.0 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 28/36] mosquitto: upgrade 2.0.9 -> 2.0.10 akuster
` (9 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Drop patch which is already in 5.4.2 release
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ae4dd366014a87e7a196f5b2e168666cdda5a43f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...building-opencv-using-gcc-11.x-19244.patch | 28 -------------------
.../{opencv_4.5.1.bb => opencv_4.5.2.bb} | 5 ++--
2 files changed, 2 insertions(+), 31 deletions(-)
delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch
rename meta-oe/recipes-support/opencv/{opencv_4.5.1.bb => opencv_4.5.2.bb} (98%)
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch b/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch
deleted file mode 100644
index ce6499bfce5..00000000000
--- a/meta-oe/recipes-support/opencv/opencv/0001-Fix-building-opencv-using-gcc-11.x-19244.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 67e1a5400383543b28fc69eb09c9429cb9d8c026 Mon Sep 17 00:00:00 2001
-From: Your Name <you@example.com>
-Date: Sat, 2 Jan 2021 17:43:11 +0000
-Subject: [PATCH] Fix building opencv using gcc 11.x #19244
-
-Add missing `#include <thread>` in modules/gapi/test/test_precomp.hpp
-
-Upstream-Status: Backport [https://github.com/opencv/opencv/pull/19247]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- modules/gapi/test/test_precomp.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/gapi/test/test_precomp.hpp b/modules/gapi/test/test_precomp.hpp
-index 7b3c695443..e92b1d03bf 100644
---- a/modules/gapi/test/test_precomp.hpp
-+++ b/modules/gapi/test/test_precomp.hpp
-@@ -11,6 +11,7 @@
- #define __OPENCV_GAPI_TEST_PRECOMP_HPP__
-
- #include <cstdint>
-+#include <thread>
- #include <vector>
-
- #include <opencv2/ts.hpp>
---
-2.30.1
-
diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.1.bb b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb
similarity index 98%
rename from meta-oe/recipes-support/opencv/opencv_4.5.1.bb
rename to meta-oe/recipes-support/opencv/opencv_4.5.2.bb
index d87e140ba7d..553fb4e08a2 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.5.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
-SRCREV_opencv = "1363496c1106606684d40447f5d1149b2c66a9f8"
-SRCREV_contrib = "b91a781cbc1285d441aa682926d93d8c23678b0b"
+SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03"
+SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd"
SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
@@ -49,7 +49,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
file://0001-Dont-use-isystem.patch \
file://download.patch \
file://0001-Make-ts-module-external.patch \
- file://0001-Fix-building-opencv-using-gcc-11.x-19244.patch \
"
SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 28/36] mosquitto: upgrade 2.0.9 -> 2.0.10
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (26 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 27/36] opencv: Upgrade to 5.4.2 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 29/36] nbdkit: upgrade 1.25.4 -> 1.25.5 akuster
` (8 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit bb60da5cfc3fd9a636a15f319a372d935f68355e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../mosquitto/{mosquitto_2.0.9.bb => mosquitto_2.0.10.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.9.bb => mosquitto_2.0.10.bb} (95%)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.10.bb
similarity index 95%
rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.9.bb
rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.10.bb
index 97a380117e6..b815ac3b494 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.9.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.10.bb
@@ -19,8 +19,8 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \
file://1571.patch \
"
-SRC_URI[md5sum] = "b77cee4ee6f0d32ca8816a58167e8b1d"
-SRC_URI[sha256sum] = "1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4"
+SRC_URI[md5sum] = "3d1c327d8c5881f56983bee1e3c8f068"
+SRC_URI[sha256sum] = "0188f7b21b91d6d80e992b8d6116ba851468b3bd154030e8a003ed28fb6f4a44"
inherit systemd update-rc.d useradd cmake
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 29/36] nbdkit: upgrade 1.25.4 -> 1.25.5
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (27 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 28/36] mosquitto: upgrade 2.0.9 -> 2.0.10 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 30/36] stunnel: upgrade 5.58 -> 5.59 akuster
` (7 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5bd0f88c775ea69db85e1589e833e50648932f22)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../nbdkit/{nbdkit_1.25.4.bb => nbdkit_1.25.5.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-support/nbdkit/{nbdkit_1.25.4.bb => nbdkit_1.25.5.bb} (95%)
diff --git a/meta-networking/recipes-support/nbdkit/nbdkit_1.25.4.bb b/meta-networking/recipes-support/nbdkit/nbdkit_1.25.5.bb
similarity index 95%
rename from meta-networking/recipes-support/nbdkit/nbdkit_1.25.4.bb
rename to meta-networking/recipes-support/nbdkit/nbdkit_1.25.5.bb
index 37f6a8b76be..a6070ccf854 100644
--- a/meta-networking/recipes-support/nbdkit/nbdkit_1.25.4.bb
+++ b/meta-networking/recipes-support/nbdkit/nbdkit_1.25.5.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0"
SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https \
"
-SRCREV = "7b04baeb1858fa04f5f4e0d6f2d23bef706e80da"
+SRCREV = "c828c6d48ff6b69454cad98054a1920d03c4b4c7"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 30/36] stunnel: upgrade 5.58 -> 5.59
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (28 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 29/36] nbdkit: upgrade 1.25.4 -> 1.25.5 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 31/36] usbredir: upgrade 0.8.0 -> 0.9.0 akuster
` (6 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
Refresh the following patch:
fix-openssl-no-des.patch
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 83c8e6bcc0ad57628baac2ee15fac5f5b48ca7c2)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../stunnel/stunnel/fix-openssl-no-des.patch | 10 +++++-----
.../stunnel/{stunnel_5.58.bb => stunnel_5.59.bb} | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
rename meta-networking/recipes-support/stunnel/{stunnel_5.58.bb => stunnel_5.59.bb} (94%)
diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
index 209b0dd409d..aeb0bece971 100644
--- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
+++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
@@ -11,7 +11,7 @@ diff --git a/src/common.h b/src/common.h
index f7d38b0..bf485af 100644
--- a/src/common.h
+++ b/src/common.h
-@@ -471,7 +471,9 @@ extern char *sys_errlist[];
+@@ -478,7 +478,9 @@ extern char *sys_errlist[];
#ifndef OPENSSL_NO_MD4
#include <openssl/md4.h>
#endif /* !defined(OPENSSL_NO_MD4) */
@@ -25,8 +25,8 @@ diff --git a/src/protocol.c b/src/protocol.c
index 587df09..8198eb6 100644
--- a/src/protocol.c
+++ b/src/protocol.c
-@@ -66,7 +66,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE);
- NOEXPORT char *nntp_client(CLI *, SERVICE_OPTIONS *, const PHASE);
+@@ -67,7 +67,7 @@ NOEXPORT char *imap_server(CLI *, SERVICE_OPTIONS *, const PHASE);
+ NOEXPORT char *ldap_client(CLI *, SERVICE_OPTIONS *, const PHASE);
NOEXPORT char *connect_server(CLI *, SERVICE_OPTIONS *, const PHASE);
NOEXPORT char *connect_client(CLI *, SERVICE_OPTIONS *, const PHASE);
-#ifndef OPENSSL_NO_MD4
@@ -34,7 +34,7 @@ index 587df09..8198eb6 100644
NOEXPORT void ntlm(CLI *, SERVICE_OPTIONS *);
NOEXPORT char *ntlm1();
NOEXPORT char *ntlm3(char *, char *, char *, char *);
-@@ -1175,7 +1175,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
+@@ -1332,7 +1332,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
fd_printf(c, c->remote_fd.fd, "Host: %s", opt->protocol_host);
if(opt->protocol_username && opt->protocol_password) {
if(!strcasecmp(opt->protocol_authentication, "ntlm")) {
@@ -43,7 +43,7 @@ index 587df09..8198eb6 100644
ntlm(c, opt);
#else
s_log(LOG_ERR, "NTLM authentication is not available");
-@@ -1216,7 +1216,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
+@@ -1376,7 +1376,7 @@ NOEXPORT char *connect_client(CLI *c, SERVICE_OPTIONS *opt, const PHASE phase) {
return NULL;
}
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.58.bb b/meta-networking/recipes-support/stunnel/stunnel_5.59.bb
similarity index 94%
rename from meta-networking/recipes-support/stunnel/stunnel_5.58.bb
rename to meta-networking/recipes-support/stunnel/stunnel_5.59.bb
index 1f1ca4e6b8b..e3704ae1d0e 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_5.58.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_5.59.bb
@@ -14,7 +14,7 @@ SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \
file://fix-openssl-no-des.patch \
"
-SRC_URI[sha256sum] = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79"
+SRC_URI[sha256sum] = "137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f"
inherit autotools
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 31/36] usbredir: upgrade 0.8.0 -> 0.9.0
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (29 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 30/36] stunnel: upgrade 5.58 -> 5.59 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 32/36] hostapd: fix CVE-2021-0326 and CVE-2021-27803 akuster
` (5 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 613729e7803c5faacc39823925e0c711d0da7682)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../spice/{usbredir_0.8.0.bb => usbredir_0.9.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-support/spice/{usbredir_0.8.0.bb => usbredir_0.9.0.bb} (88%)
diff --git a/meta-networking/recipes-support/spice/usbredir_0.8.0.bb b/meta-networking/recipes-support/spice/usbredir_0.9.0.bb
similarity index 88%
rename from meta-networking/recipes-support/spice/usbredir_0.8.0.bb
rename to meta-networking/recipes-support/spice/usbredir_0.9.0.bb
index 9ee43be1ea6..079f52f99bc 100644
--- a/meta-networking/recipes-support/spice/usbredir_0.8.0.bb
+++ b/meta-networking/recipes-support/spice/usbredir_0.9.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
DEPENDS = "libusb1"
-SRCREV = "07b98b8e71f620dfdd57e92ddef6b677b259a092"
+SRCREV = "bca484fc6f206ab9da2f73e8a0118fad45374d4e"
SRC_URI = " \
git://anongit.freedesktop.org/spice/usbredir \
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 32/36] hostapd: fix CVE-2021-0326 and CVE-2021-27803
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (30 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 31/36] usbredir: upgrade 0.8.0 -> 0.9.0 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 33/36] hwdata: upgrade 0.345 -> 0.346 akuster
` (4 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: Mingli Yu <mingli.yu@windriver.com>
Backport 2 patches to fix two CVEs.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5a085c588adaf79bb2bca7921c82d893877b28a1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../hostapd/hostapd/CVE-2021-0326.patch | 43 +++++++++++++++
.../hostapd/hostapd/CVE-2021-27803.patch | 54 +++++++++++++++++++
.../hostapd/hostapd_2.9.bb | 2 +
3 files changed, 99 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch
create mode 100644 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch b/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch
new file mode 100644
index 00000000000..54c405b539c
--- /dev/null
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-0326.patch
@@ -0,0 +1,43 @@
+From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Mon, 9 Nov 2020 11:43:12 +0200
+Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group
+ client
+
+Parsing and copying of WPS secondary device types list was verifying
+that the contents is not too long for the internal maximum in the case
+of WPS messages, but similar validation was missing from the case of P2P
+group information which encodes this information in a different
+attribute. This could result in writing beyond the memory area assigned
+for these entries and corrupting memory within an instance of struct
+p2p_device. This could result in invalid operations and unexpected
+behavior when trying to free pointers from that corrupted memory.
+
+CVE: CVE-2021-0326
+
+Upstream-Status: Backport
+
+Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269
+Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers")
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ src/p2p/p2p.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
+index 74b7b52ae..5cbfc217f 100644
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev,
+ dev->info.config_methods = cli->config_methods;
+ os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8);
+ dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types;
++ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN)
++ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN;
+ os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types,
+ dev->info.wps_sec_dev_type_list_len);
+ }
+--
+2.17.1
+
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch b/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch
new file mode 100644
index 00000000000..fedff76b180
--- /dev/null
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2021-27803.patch
@@ -0,0 +1,54 @@
+From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Tue, 8 Dec 2020 23:52:50 +0200
+Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request
+
+p2p_add_device() may remove the oldest entry if there is no room in the
+peer table for a new peer. This would result in any pointer to that
+removed entry becoming stale. A corner case with an invalid PD Request
+frame could result in such a case ending up using (read+write) freed
+memory. This could only by triggered when the peer table has reached its
+maximum size and the PD Request frame is received from the P2P Device
+Address of the oldest remaining entry and the frame has incorrect P2P
+Device Address in the payload.
+
+Fix this by fetching the dev pointer again after having called
+p2p_add_device() so that the stale pointer cannot be used.
+
+CVE: CVE-2021-27803
+
+Upstream-Status: Backport
+
+Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request")
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/p2p/p2p_pd.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
+index 3994ec03f..05fd59349 100644
+--- a/src/p2p/p2p_pd.c
++++ b/src/p2p/p2p_pd.c
+@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa,
+ goto out;
+ }
+
++ dev = p2p_get_device(p2p, sa);
+ if (!dev) {
+- dev = p2p_get_device(p2p, sa);
+- if (!dev) {
+- p2p_dbg(p2p,
+- "Provision Discovery device not found "
+- MACSTR, MAC2STR(sa));
+- goto out;
+- }
++ p2p_dbg(p2p,
++ "Provision Discovery device not found "
++ MACSTR, MAC2STR(sa));
++ goto out;
+ }
+ } else if (msg.wfd_subelems) {
+ wpabuf_free(dev->info.wfd_subelems);
+--
+2.17.1
+
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb
index 1f38eee0ffe..87899f3da20 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb
@@ -13,6 +13,8 @@ SRC_URI = " \
file://hostapd.service \
file://CVE-2019-16275.patch \
file://CVE-2019-5061.patch \
+ file://CVE-2021-0326.patch \
+ file://CVE-2021-27803.patch \
"
SRC_URI[md5sum] = "f188fc53a495fe7af3b6d77d3c31dee8"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 33/36] hwdata: upgrade 0.345 -> 0.346
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (31 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 32/36] hostapd: fix CVE-2021-0326 and CVE-2021-27803 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 34/36] live555: upgrade 20210322 -> 20210406 akuster
` (3 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5b02a417845d91ce57ce89de0a597edc63966213)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_git.bb
index 56d814db887..738c32d637b 100644
--- a/meta-oe/recipes-support/hwdata/hwdata_git.bb
+++ b/meta-oe/recipes-support/hwdata/hwdata_git.bb
@@ -5,8 +5,8 @@ SECTION = "System/Base"
LICENSE = "GPL-2.0+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
-PV = "0.345"
-SRCREV = "5d7d97bae533401f60ce9a5a036ff7152c8aca8c"
+PV = "0.346"
+SRCREV = "a2bff16032a68b089eeb169f09dea08094891c9c"
SRC_URI = "git://github.com/vcrhonek/${BPN}.git"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 34/36] live555: upgrade 20210322 -> 20210406
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (32 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 33/36] hwdata: upgrade 0.345 -> 0.346 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 35/36] rabbitmq-c: upgrade 0.10.0 -> 0.11.0 akuster
` (2 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ed78d5d038520edef91982f7b1e9a86f6d169c13)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../live555/{live555_20210322.bb => live555_20210406.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-multimedia/live555/{live555_20210322.bb => live555_20210406.bb} (97%)
diff --git a/meta-oe/recipes-multimedia/live555/live555_20210322.bb b/meta-oe/recipes-multimedia/live555/live555_20210406.bb
similarity index 97%
rename from meta-oe/recipes-multimedia/live555/live555_20210322.bb
rename to meta-oe/recipes-multimedia/live555/live555_20210406.bb
index 89133854898..cc138adb671 100644
--- a/meta-oe/recipes-multimedia/live555/live555_20210322.bb
+++ b/meta-oe/recipes-multimedia/live555/live555_20210406.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz
# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n"
-SRC_URI[sha256sum] = "b451c7ded8becbfa239e8f4fbe69784413270fb4c5e9b2e74269247dc3dd2e59"
+SRC_URI[sha256sum] = "0bd182fac7d6297d924af4405ce840515a38fa5438cb1a4b90fcb6bc737b36d6"
S = "${WORKDIR}/live"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 35/36] rabbitmq-c: upgrade 0.10.0 -> 0.11.0
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (33 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 34/36] live555: upgrade 20210322 -> 20210406 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 2:20 ` [hardknott 36/36] xterm: upgrade 366 -> 367 akuster
2021-04-09 16:16 ` [oe] [hardknott 00/36] Patch review part 2 Martin Jansa
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e1185b272a48e8b797bc7c4e96645cc2fce3d298)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../rabbitmq-c/{rabbitmq-c_0.10.0.bb => rabbitmq-c_0.11.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-connectivity/rabbitmq-c/{rabbitmq-c_0.10.0.bb => rabbitmq-c_0.11.0.bb} (88%)
diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.10.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb
similarity index 88%
rename from meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.10.0.bb
rename to meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb
index 2ef6b187e94..0cfd225cf88 100644
--- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.10.0.bb
+++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=6b7424f9db80cfb11fdd5c980b583f53"
LICENSE = "MIT"
SRC_URI = "git://github.com/alanxz/rabbitmq-c.git"
-# v0.10.0-master
-SRCREV = "ffe918a5fcef72038a88054dca3c56762b1953d4"
+# v0.11.0-master
+SRCREV = "a64c08c68aff34d49a2ac152f04988cd921084f9"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* [hardknott 36/36] xterm: upgrade 366 -> 367
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (34 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 35/36] rabbitmq-c: upgrade 0.10.0 -> 0.11.0 akuster
@ 2021-04-09 2:20 ` akuster
2021-04-09 16:16 ` [oe] [hardknott 00/36] Patch review part 2 Martin Jansa
36 siblings, 0 replies; 38+ messages in thread
From: akuster @ 2021-04-09 2:20 UTC (permalink / raw)
To: openembedded-devel
From: zangrc <zangrc.fnst@fujitsu.com>
-License-Update: Copyright year updated to 2021.
Refresh the following patch:
0001-Add-configure-time-check-for-setsid.patch
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 97f59fb2063dae01c72e1e3a690edf5dfe645571)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../0001-Add-configure-time-check-for-setsid.patch | 10 +++++-----
.../xorg-app/{xterm_366.bb => xterm_367.bb} | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
rename meta-oe/recipes-graphics/xorg-app/{xterm_366.bb => xterm_367.bb} (89%)
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
index d3beea8be19..92ecdac224b 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
+++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
@@ -18,7 +18,7 @@ diff --git a/configure b/configure
index 0aafefc..03e8df0 100755
--- a/configure
+++ b/configure
-@@ -5411,6 +5411,7 @@ for ac_func in \
+@@ -5605,6 +5605,7 @@ for ac_func in \
unsetenv \
sched_yield \
setpgid \
@@ -42,7 +42,7 @@ diff --git a/main.c b/main.c
index 5e60589..b81d2be 100644
--- a/main.c
+++ b/main.c
-@@ -2868,7 +2868,7 @@ main(int argc, char *argv[]ENVP_ARG)
+@@ -2903,7 +2903,7 @@ main(int argc, char *argv[]ENVP_ARG)
}
}
@@ -51,7 +51,7 @@ index 5e60589..b81d2be 100644
#define USE_OPENPTY 1
static int opened_tty = -1;
#endif
-@@ -4040,7 +4040,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
+@@ -4074,7 +4074,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
/*
* now in child process
*/
@@ -64,14 +64,14 @@ diff --git a/xtermcfg.hin b/xtermcfg.hin
index 1dbc3b8..4f3ff5b 100644
--- a/xtermcfg.hin
+++ b/xtermcfg.hin
-@@ -96,6 +96,7 @@
+@@ -95,6 +95,7 @@
#undef HAVE_PUTENV /* AC_CHECK_FUNCS(putenv) */
#undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */
#undef HAVE_SETPGID /* AC_CHECK_FUNCS(setpgid) */
+#undef HAVE_SETSID /* AC_CHECK_FUNCS(setsid) */
#undef HAVE_STDINT_H /* AC_PROG_CC_STDC */
#undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */
- #undef HAVE_STRFTIME /* AC_CHECK_FUNCS(strftime) */
+ #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */
--
2.24.1
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
similarity index 89%
rename from meta-oe/recipes-graphics/xorg-app/xterm_366.bb
rename to meta-oe/recipes-graphics/xorg-app/xterm_367.bb
index 969159bc57b..e0d3dcec135 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
@@ -2,13 +2,13 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
SUMMARY = "xterm is the standard terminal emulator for the X Window System"
DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native"
-LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e"
+LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17"
SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
file://0001-Add-configure-time-check-for-setsid.patch \
"
-SRC_URI[sha256sum] = "858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e"
+SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f"
PACKAGECONFIG ?= ""
PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
--
2.17.1
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [oe] [hardknott 00/36] Patch review part 2
2021-04-09 2:20 [hardknott 00/36] Patch review part 2 akuster
` (35 preceding siblings ...)
2021-04-09 2:20 ` [hardknott 36/36] xterm: upgrade 366 -> 367 akuster
@ 2021-04-09 16:16 ` Martin Jansa
36 siblings, 0 replies; 38+ messages in thread
From: Martin Jansa @ 2021-04-09 16:16 UTC (permalink / raw)
To: akuster; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
On Thu, Apr 08, 2021 at 07:20:13PM -0700, akuster wrote:
> Additional sync with master.
>
> Excludes: Revert "iwd: Upgade to 1.13"
>
> Please have feedback by Saturday.
Acked-by: Martin Jansa <martin.jansa@gmail.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread