summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-devtools/geany
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-02-13 00:32:45 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-02-25 23:15:06 +0300
commitac970dd705934286df062e0f1501f776dc2ef01d (patch)
treefadcf250bad7a38afc33bc423c0ebb8733b33345 /meta-openembedded/meta-oe/recipes-devtools/geany
parent1110521700bbfe9ffd32338fed19492114e8bbd4 (diff)
downloadopenbmc-ac970dd705934286df062e0f1501f776dc2ef01d.tar.xz
meta-openembedded: subtree update:fd123c9bb2..7206f7f5bc
Adam Miartus (1): cereal: add cereal a header-only c++11 serialization library Andreas Müller (14): xfce4-appfinder: upgrade 4.16.0 -> 4.16.1 xfce4-whiskermenu-plugin: upgrade 2.5.2 -> 2.5.3 xfce4-panel: upgrade 4.16.0 -> 4.16.1 xfce4-notes-plugin: re-add 1.9.0 gparted: upgrade 1.1.0 -> 1.2.0 poppler: upgrade 21.01.0 -> 21.02.0 fluidsynth: upgrade 2.1.6 -> 2.1.7 mousepad: upgrade 0.5.1 -> 0.5.2 xfce4-cpugraph-plugin: upgrade 1.2.0 -> 1.2.1 babl: upgrade 0.1.82 -> 0.1.84 gegl: upgrade 0.4.26 -> 0.4.28 gtk+: upgrade 2.24.32 -> 2.24.33 libsigc++-2.0: upgrade 2.10.3 -> 2.10.6 gtkmm3: upgrade 3.24.2 -> 3.24.3 Andrei Gherzan (1): gateone: Cleanup assets for removed recipe Andrey Zhizhikin (1): iperf3: fix build with autoconf 2.71 Gianfranco (1): mosquitto: Upgrade 1.6.12 -> 2.0.7 Harpritkaur Bhandari (1): rapidjson: Remove unwanted patches Hongxu Jia (4): lksctp-tools: make conpatible to autoconf-2.70 spice: make conpatible to autoconf-2.70 freeradius: fix build failure with autoconf 2.71 ndpi: fix autoconf-2.71 compatibility Kai Kang (3): meta-oe: add crash to NON_MULTILIB_RECIPES lxdm: support to change user password lxdm: disallow empty new password Khem Raj (28): libssh2: Fix build with autoconf 2.70+ yasm: Fix build with autotools 2.70+ boinc-client: Upgrade to 7.16.16 release net-snmp: Remove hardcoded paths to build host in net-snmp-config keepalived: Upgrade to 2.2.1 gst-shark: Upgrade to 0.7.2 hidapi: Backport patch to fix build with autotools 2.70+ libsrtp: Update to 2.3.0 libsrtp: Do not invoke automake during configure klibc: Upgrade to 2.0.8 release geany,geany-plugins: Upgrade to 1.37.x libstatgrab: Fix build with autoconf 2.70+ libmypaint: Fix build with autotools 2.70+ geany: Fix build with autotools 2.70+ ubi-utils-klibc: Fix build with clang kexecboot: Fix build with clang glm: Upgrade to 0.9.9.8 gimp: Fix build with autoconf-2.70+ klibc: Fix x86_64 build with binutils 2.36+ pavucontrol: Depend on libxml-parser-perl-native libsrtp: Copy ar-lib from automake libmcrypt: Run autoreconf steps manually libsdl2-mixer: Fix build with autoconf 2.70+ openldap: Fix build with autoconf 2.70+ transmission: Fix build with autotools 2.70+ boinc-client: Fix build with autotools 2.70+ iwd: Fix build with ell 0.37 kernel-selftest: Disable building bpf Leon Anavi (29): python3-gevent: Upgrade 20.9.0 -> 21.1.2 python3-prompt-toolkit: Upgrade 3.0.11 -> 3.0.14 python3-urllib3: Upgrade 1.26.2 -> 1.26.3 python3-pybind11: Upgrade 2.5.0 -> 2.6.2 python3-xlrd: Upgrade 1.2.0 -> 2.0.1 python3-croniter: Upgrade 1.0.2 -> 1.0.4 python3-cantools: Upgrade 36.1.0 -> 36.2.0 python3-pyzmq: Upgrade 21.0.2 -> 22.0.2 python3-aiohttp-jinja2: Upgrade 1.2.0 -> 1.4.2 python3-prctl: Upgrade 1.7 -> 1.8.1 python3-cmd2: Upgrade 1.4.0 -> 1.5.0 python3-elementpath: Upgrade 2.1.2 -> 2.1.3 python3-croniter: Upgrade 1.0.4 -> 1.0.5 python3-pychromecast: Upgrade 7.7.2 -> 8.0.0 python3-alembic: Upgrade 1.5.2 -> 1.5.3 python3-meh: Upgrade 0.49 -> 0.50 python3-pywbem: Upgrade 1.1.0 -> 1.1.3 python3-ipython: Upgrade 7.19.0 -> 7.20.0 python3-croniter: Upgrade 1.0.5 -> 1.0.6 python3-pywbemtools: Upgrade 0.8.0 -> 0.8.1 python3-sqlalchemy: Upgrade 1.3.22 -> 1.3.23 python3-flask-migrate: Upgrade 2.5.3 -> 2.6.0 python3-javaobj-py3: Upgrade 0.4.1 -> 0.4.2 python3-pytest-html: Upgrade 2.1.1 -> 3.1.1 python3-graphviz: Upgrade 0.14.2 -> 0.16 python3-tqdm: Upgrade 4.51.0 -> 4.56.0 python3-alembic: Upgrade 1.5.3 -> 1.5.4 python3-pymongo: Upgrade 3.11.2 -> 3.11.3 python3-pymisp: Upgrade 2.4.137.1 -> 2.4.137.3 Martin Jansa (6): zbar: fix random do_prepare_recipe_sysroot_gettext failures zbar: use 4 spaces for indentation net-snmp: fix build with dash wireguard-module: remove PKG assignment graphviz: drop unused SRCREV and outdated comment pidgin: upgrade to 2.14.1 and fix autoconf-2.71 compatibility Mingli Yu (5): net-snmp: improve reproducibility python3-h5py: improve reproducibility opencv: improve reproducibility mozjs: improve reproducibility netsnmp: remove --with-openssl=PATH configure option Nicolas Jeker (2): network-manager-applet: Build without libteam support networkmanager: Add PACKAGECONFIG for ovs Oleksandr Kravchuk (24): iwd: update to 1.11 cpuid: update to 20201006 libblockdev: update to 2.25 nano: update to 5.5 plymouth: update to 0.9.5 adcli: update to 0.9.0 cannelloni: update to 1.0.0 ipset: update to 7.10 kronosnet: update 1.20 nghttp2: update to 1.43.0 atftp: update to 0.7.4 cereal: update to 1.3.0 python3-aws-iot-device-sdk-python: update to 1.4.9 python3-flask-socketio: update to 4.3.1 python3-greenstalk: update to 2.0.0 python3-twitter: update to 3.10.0 fetchmail: udpate to 6.4.16 wireshark: update to 3.4.3 iqrencode: update to 4.1.1 libconfig add UPSTREAM_CHECK_URI ceres-solver: update to 2.0.0 libgit2: update to 1.1.0 hexedit: update to 1.5 ttf-abyssinica: update to 2.000 Oleksiy Obitotskyy (1): libhugetlbfs: improve reproducibility Peter Smith (1): python3-ruamel-yaml: add support for native and nativesdk Qi.Chen@windriver.com (1): minifi-cpp: set PSEUDO_CONSIDER_PATHS Ramon Fried (2): fluentbit: fix systemd input plugin fluentbit: Fix SIGSEGV caused by using flb_free instead of mk_mem_free Robert P. J. Day (1): correct "RRCOMMENDS" typo in ipset recipe Ross Burton (2): python3-ruamel-yaml: add native and nativesdk class extension python3-pykwalify: fix RDEPENDS Sakib Sajal (2): libgpiod: add ptest xfce4-session: increase ALTERNATIVE_PRIORITY Wang Mingyu (1): dnsmasq: upgrade 2.82 -> 2.84 Yi Fan Yu (1): postgresql: bypass autoconf version check Yi Zhao (1): openipmi: upgrade 2.0.30 -> 2.0.31 Zang Ruochen (7): libfastjson: upgrade 0.99.8 -> 0.99.9 libio-pty-perl: upgrade 1.15 -> 1.16 libjson-perl: upgrade 4.02000 -> 4.03000 libmbim: upgrade 1.24.4 -> 1.24.6 sanlock: upgrade 3.8.2 -> 3.8.3 python3-matplotlib: upgrade 3.3.2 -> 3.3.4 python3-pytz: upgrade 2020.1 -> 2021.1 akuster (2): enca: Fix SRC_URI meta-oe/README: add Ubuntu prerequisite information zangrc (6): libtalloc: upgrade 2.3.1 -> 2.3.2 gensio: upgrade 2.2.0 -> 2.2.3 zchunk: upgrade 1.1.8 -> 1.1.9 libnet-ldap-perl: upgrade 0.67 -> 0.68 librole-tiny-perl: upgrade 2.002003 -> 2.002004 cpprest: upgrade 2.10.17 -> 2.10.18 zhengruoqin (4): open-isns: upgrade 0.99 -> 0.101 gd: upgrade 2.3.0 -> 2.3.1 live555: upgrade 20210101 -> 20210129 python3-periphery: upgrade 2.1.0 -> 2.2.0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I65a2b942fbfbc262976e6417d7481ae3fc82cb17
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/geany')
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch55
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb)4
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch22
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb)7
4 files changed, 27 insertions, 61 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0002-Make-libgit2-version-preprocessor-conditionals-compatible.patch
deleted file mode 100644
index 25e5ac4ea..000000000
--- a/meta-openembedded/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-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.37.bb
index 3cf260573..890bbdb44 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb
+++ b/meta-openembedded/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-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
new file mode 100644
index 000000000..b96684719
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
@@ -0,0 +1,22 @@
+From 51e145b43e66134aa4b33c9af0319331ec8a5bce Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 5 Feb 2021 23:15:45 -0800
+Subject: [PATCH] configure: Use AC_PROG_INTLTOOL
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects])
+ AC_CONFIG_HEADERS([config.h])
+-
++AC_PROG_INTLTOOL
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+ GEANY_PREFIX
diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb
index 039999f6b..b361b1187 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.37.1.bb
@@ -9,9 +9,10 @@ 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 = "https://download.geany.org/${BP}.tar.bz2 \
+ file://0001-configure-Upgrade-to-a-modern-Gettext.patch \
+ "
+SRC_URI[sha256sum] = "18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18"
FILES_${PN} += "${datadir}/icons"