diff options
3 files changed, 0 insertions, 102 deletions
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 @@ | |||
| 1 | From b2187b45f61ce362a9d58d9081d66daddb4e577f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 20 Mar 2022 15:54:14 -0700 | ||
| 4 | Subject: [PATCH] geany.m4: Do not tinker with pkg-config paths | ||
| 5 | |||
| 6 | OE sets up these paths correctly w.r.t. target sysroot | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | build/geany.m4 | 4 ++-- | ||
| 12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 13 | |||
| 14 | --- a/build/geany.m4 | ||
| 15 | +++ b/build/geany.m4 | ||
| 16 | @@ -32,7 +32,8 @@ AC_DEFUN([GP_CHECK_GEANY], | ||
| 17 | [ | ||
| 18 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
| 19 | |||
| 20 | - GP_GEANY_PKG_CONFIG_PATH_PUSH | ||
| 21 | + dnl GP_GEANY_PKG_CONFIG_PATH_PUSH | ||
| 22 | + AC_REQUIRE([_GP_GEANY_LIBDIR]) | ||
| 23 | |||
| 24 | PKG_CHECK_MODULES([GEANY], [geany >= $1]) | ||
| 25 | geanypluginsdir=$geany_libdir/geany | ||
| 26 | @@ -40,5 +41,5 @@ AC_DEFUN([GP_CHECK_GEANY], | ||
| 27 | AC_SUBST([geanypluginsdir]) | ||
| 28 | AC_SUBST([GEANY_VERSION]) | ||
| 29 | |||
| 30 | - GP_GEANY_PKG_CONFIG_PATH_POP | ||
| 31 | + dnl GP_GEANY_PKG_CONFIG_PATH_POP | ||
| 32 | ]) | ||
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 @@ | |||
| 1 | From 90c46235ad69a411d83a5e978492421e8e378934 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 18 Feb 2022 23:35:58 -0800 | ||
| 4 | Subject: [PATCH] git-changebar: Adjust structs for libgit2 1.4.x | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | git-changebar/src/gcb-plugin.c | 4 ++-- | ||
| 10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c | ||
| 13 | index f8ce20c..4488b22 100644 | ||
| 14 | --- a/git-changebar/src/gcb-plugin.c | ||
| 15 | +++ b/git-changebar/src/gcb-plugin.c | ||
| 16 | @@ -216,7 +216,7 @@ static int | ||
| 17 | gcb_git_buf_grow (git_buf *buf, | ||
| 18 | size_t target_size) | ||
| 19 | { | ||
| 20 | - if (buf->asize == 0) { | ||
| 21 | + if (buf->reserved == 0) { | ||
| 22 | if (target_size == 0) { | ||
| 23 | target_size = buf->size; | ||
| 24 | } | ||
| 25 | @@ -234,7 +234,7 @@ buf_zero (git_buf *buf) | ||
| 26 | if (buf) { | ||
| 27 | buf->ptr = NULL; | ||
| 28 | buf->size = 0; | ||
| 29 | - buf->asize = 0; | ||
| 30 | + buf->reserved = 0; | ||
| 31 | } | ||
| 32 | } | ||
| 33 | |||
| 34 | -- | ||
| 35 | 2.35.1 | ||
| 36 | |||
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 @@ | |||
| 1 | From 9ee9388bc66e6cf68db96b2014dca2115f745dc9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 30 Aug 2022 22:33:46 -0700 | ||
| 4 | Subject: [PATCH] scope: Use 0 instead of NULL for gboolean | ||
| 5 | |||
| 6 | Fixes warnings with clang 15+ | ||
| 7 | |||
| 8 | scope/src/stack.c:168:11: error: incompatible pointer to integer conversion initializing 'gboolean' (aka 'int') with an expression of type 'void *' [-Wint-conversion] | ||
| 9 | gboolean entry = NULL; | ||
| 10 | ^ ~~~~ | ||
| 11 | 1 error generated. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/geany/geany-plugins/pull/1191] | ||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | scope/src/stack.c | 2 +- | ||
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/scope/src/stack.c b/scope/src/stack.c | ||
| 20 | index b03909fe..041dd415 100644 | ||
| 21 | --- a/scope/src/stack.c | ||
| 22 | +++ b/scope/src/stack.c | ||
| 23 | @@ -165,7 +165,7 @@ void on_stack_follow(GArray *nodes) | ||
| 24 | gboolean stack_entry(void) | ||
| 25 | { | ||
| 26 | GtkTreeIter iter; | ||
| 27 | - gboolean entry = NULL; | ||
| 28 | + gboolean entry = 0; | ||
| 29 | |||
| 30 | if (gtk_tree_selection_get_selected(selection, NULL, &iter)) | ||
| 31 | { | ||
| 32 | -- | ||
| 33 | 2.37.3 | ||
| 34 | |||
