Signed-off-by: Khem Raj <[email protected]> --- ...-Do-not-tinker-with-pkg-config-paths.patch | 32 ----------------- ...bar-Adjust-structs-for-libgit2-1.4.x.patch | 36 ------------------- ...e-Use-0-instead-of-NULL-for-gboolean.patch | 34 ------------------ 3 files changed, 102 deletions(-) delete mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch delete mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch delete mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch deleted file mode 100644 index cd417e0d7b..0000000000 --- a/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b2187b45f61ce362a9d58d9081d66daddb4e577f Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 20 Mar 2022 15:54:14 -0700 -Subject: [PATCH] geany.m4: Do not tinker with pkg-config paths - -OE sets up these paths correctly w.r.t. target sysroot - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <[email protected]> ---- - build/geany.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/build/geany.m4 -+++ b/build/geany.m4 -@@ -32,7 +32,8 @@ AC_DEFUN([GP_CHECK_GEANY], - [ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - -- GP_GEANY_PKG_CONFIG_PATH_PUSH -+ dnl GP_GEANY_PKG_CONFIG_PATH_PUSH -+ AC_REQUIRE([_GP_GEANY_LIBDIR]) - - PKG_CHECK_MODULES([GEANY], [geany >= $1]) - geanypluginsdir=$geany_libdir/geany -@@ -40,5 +41,5 @@ AC_DEFUN([GP_CHECK_GEANY], - AC_SUBST([geanypluginsdir]) - AC_SUBST([GEANY_VERSION]) - -- GP_GEANY_PKG_CONFIG_PATH_POP -+ dnl GP_GEANY_PKG_CONFIG_PATH_POP - ]) diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch deleted file mode 100644 index fe2d9f54ba..0000000000 --- a/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 90c46235ad69a411d83a5e978492421e8e378934 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 18 Feb 2022 23:35:58 -0800 -Subject: [PATCH] git-changebar: Adjust structs for libgit2 1.4.x - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - git-changebar/src/gcb-plugin.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c -index f8ce20c..4488b22 100644 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -216,7 +216,7 @@ static int - gcb_git_buf_grow (git_buf *buf, - size_t target_size) - { -- if (buf->asize == 0) { -+ if (buf->reserved == 0) { - if (target_size == 0) { - target_size = buf->size; - } -@@ -234,7 +234,7 @@ buf_zero (git_buf *buf) - if (buf) { - buf->ptr = NULL; - buf->size = 0; -- buf->asize = 0; -+ buf->reserved = 0; - } - } - --- -2.35.1 - diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch deleted file mode 100644 index bb03fa63de..0000000000 --- a/meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9ee9388bc66e6cf68db96b2014dca2115f745dc9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 30 Aug 2022 22:33:46 -0700 -Subject: [PATCH] scope: Use 0 instead of NULL for gboolean - -Fixes warnings with clang 15+ - -scope/src/stack.c:168:11: error: incompatible pointer to integer conversion initializing 'gboolean' (aka 'int') with an expression of type 'void *' [-Wint-conversion] - gboolean entry = NULL; - ^ ~~~~ -1 error generated. - -Upstream-Status: Submitted [https://github.com/geany/geany-plugins/pull/1191] -Signed-off-by: Khem Raj <[email protected]> ---- - scope/src/stack.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scope/src/stack.c b/scope/src/stack.c -index b03909fe..041dd415 100644 ---- a/scope/src/stack.c -+++ b/scope/src/stack.c -@@ -165,7 +165,7 @@ void on_stack_follow(GArray *nodes) - gboolean stack_entry(void) - { - GtkTreeIter iter; -- gboolean entry = NULL; -+ gboolean entry = 0; - - if (gtk_tree_selection_get_selected(selection, NULL, &iter)) - { --- -2.37.3 -
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122647): https://lists.openembedded.org/g/openembedded-devel/message/122647 Mute This Topic: https://lists.openembedded.org/mt/116774775/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
