diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-02-04 23:44:47 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-02-05 10:59:44 -0800 |
commit | e81cc160019e3ccea527d079620961db3def83e9 (patch) | |
tree | 71b616581b1478f67e8c7b1d6134459a9b91e3b9 /meta-oe/recipes-devtools/geany | |
parent | 326d19c39389f977d22a745ca3fcf6ab58c235ea (diff) | |
download | meta-openembedded-contrib-e81cc160019e3ccea527d079620961db3def83e9.tar.gz |
geany,geany-plugins: Upgrade to 1.37.x
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/geany')
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch | 55 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb (renamed from meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/geany/geany_1.37.1.bb (renamed from meta-oe/recipes-devtools/geany/geany_1.36.bb) | 8 |
3 files changed, 7 insertions, 60 deletions
diff --git a/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch b/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch deleted file mode 100644 index 25e5ac4ea2..0000000000 --- a/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 -From: Dominik Schmidt <dominik@schm1dt.ch> -Date: Sun, 23 Feb 2020 19:15:30 +0100 -Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible - with libgit2-0.99 - -LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99", -from libgit2-0.99 and beyond. Arithmetic checks against this -variable whill hence fail. This patch switches the checks to -compare against the LIBGIT2_VER_* family, which should be more stable. ---- - git-changebar/src/gcb-plugin.c | 6 +++--- - workbench/src/plugin_main.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c -index b7083199..a911815f 100644 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -32,11 +32,11 @@ - #include <geany.h> - #include <document.h> - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) - /* 0.23 added @p binary_cb */ - # define git_diff_buffers(old_buffer, old_len, old_as_path, \ - new_buffer, new_len, new_as_path, options, \ -@@ -45,7 +45,7 @@ - new_buffer, new_len, new_as_path, options, \ - file_cb, hunk_cb, line_cb, payload) - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) - # define git_buf_dispose git_buf_free - # define git_error_last giterr_last - #endif -diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c -index 6fa6fc84..25ecdf6d 100644 ---- a/workbench/src/plugin_main.c -+++ b/workbench/src/plugin_main.c -@@ -36,7 +36,7 @@ - #include "tm_control.h" - - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif diff --git a/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb index 3cf2605733..890bbdb447 100644 --- a/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb +++ b/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb @@ -31,10 +31,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ - file://0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch \ " -SRC_URI[md5sum] = "91fb4634953702f914d9105da7048a33" -SRC_URI[sha256sum] = "ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6" +SRC_URI[sha256sum] = "c98f9b1303f4ab9bed7587e749cd0b5594d9136a1bf8ba110900d46a17fa9cd8" do_configure_prepend() { rm -f ${S}/build/cache/glib-gettext.m4 diff --git a/meta-oe/recipes-devtools/geany/geany_1.36.bb b/meta-oe/recipes-devtools/geany/geany_1.37.1.bb index 039999f6bf..330daaace2 100644 --- a/meta-oe/recipes-devtools/geany/geany_1.36.bb +++ b/meta-oe/recipes-devtools/geany/geany_1.37.1.bb @@ -10,11 +10,15 @@ inherit features_check autotools pkgconfig perlnative gettext mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://download.geany.org/${BP}.tar.bz2" -SRC_URI[md5sum] = "53216a43345e2b6dbefa02ac24885753" -SRC_URI[sha256sum] = "9184dd3dd40b7b84fca70083284bb9dbf2ee8022bf2be066bdc36592d909d53e" +SRC_URI[sha256sum] = "18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18" FILES_${PN} += "${datadir}/icons" EXTRA_OECONF = "--disable-html-docs" +do_configure_prepend() { + cd ${S} + intltoolize --copy --force --automake +} + RRECOMMENDS_${PN} += "source-code-pro-fonts" |