summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-02-18 23:38:05 -0800
committerKhem Raj <raj.khem@gmail.com>2022-02-20 17:14:10 -0800
commit3d848269585a3fc5e1ff739bd4393bd7586106e0 (patch)
treea6bb43ff086daaf346eb8df69042e33021408259 /meta-oe
parent19c0838f175f31902e9a95a367d707fa348871c4 (diff)
downloadmeta-openembedded-3d848269585a3fc5e1ff739bd4393bd7586106e0.tar.gz
geany-plugins: Fix build with libgit2 1.4+
Fixes git-changebar/src/gcb-plugin.c:219:12: error: no member named 'asize' in 'git_buf'; did you mean 'size'? | if (buf->asize == 0) { | ^~~~~ | size Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch36
-rw-r--r--meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb1
2 files changed, 37 insertions, 0 deletions
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
new file mode 100644
index 0000000000..fe2d9f54ba
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany-plugins/0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch
@@ -0,0 +1,36 @@
1From 90c46235ad69a411d83a5e978492421e8e378934 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 18 Feb 2022 23:35:58 -0800
4Subject: [PATCH] git-changebar: Adjust structs for libgit2 1.4.x
5
6Upstream-Status: Pending
7Signed-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
12diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
13index 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--
352.35.1
36
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb
index 16dd71c16f..bb419c976a 100644
--- a/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb
+++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb
@@ -31,6 +31,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
31SRC_URI = " \ 31SRC_URI = " \
32 https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ 32 https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \
33 file://0001-Use-pkg-config-to-find-gpgme.patch \ 33 file://0001-Use-pkg-config-to-find-gpgme.patch \
34 file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \
34" 35"
35SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" 36SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586"
36 37