summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch
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-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch
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-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch215
1 files changed, 215 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch
new file mode 100644
index 0000000000..8bb60b5557
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch
@@ -0,0 +1,215 @@
+From 51d66c1c257f7487497f562033ac32ac75f648cb Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 8 Feb 2021 12:27:51 +0100
+Subject: [PATCH] meson: import changes from 3.0.* version
+
+* we need to use the meson option to disable introspection and docs
+
+Upstream-Status: Backport
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ meson.build | 139 ++++++++++++++++++++++++++++------------------
+ meson_options.txt | 5 ++
+ 2 files changed, 90 insertions(+), 54 deletions(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index 1084c82..ed040b4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -53,9 +53,9 @@ compiler = meson.get_compiler('c')
+ pkgconfig = import('pkgconfig')
+
+ # #######################################################################
+-# # Check for GLib 2.16
++# # Check for GLib 2.44
+ # #######################################################################
+-glib = dependency('glib-2.0', version : '>= 2.16.0')
++glib = dependency('glib-2.0', version : '>= 2.44.0')
+ gobject = dependency('gobject-2.0')
+ gmodule = dependency('gmodule-2.0')
+ gnome = import('gnome')
+@@ -63,74 +63,88 @@ gnome = import('gnome')
+ #######################################################################
+ # Check for LibXML2
+ #######################################################################
+-libxml = dependency('libxml-2.0', version : '>= 2.6.0', required : false)
+-gnt_config.set('NO_LIBXML', not libxml.found())
++libxml = dependency('libxml-2.0', version : '>= 2.6.0')
+
+ #######################################################################
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+- compiler.find_library('ncursesw', required : false),
+- compiler.find_library('panelw', required : false),
+- compiler.find_library('tinfow', required : false),
+-]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+- ncurses_available = false
+-endif
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
+
+-if host_machine.system() == 'windows'
+- # FIXME: $host ?
+- ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++ncurses = [
++ dependency('ncursesw', required : false),
++ dependency('panelw', required : false),
++]
++if ncurses[0].found() and ncurses[1].found()
++ foreach location : ncursesw_header_paths
++ f = location + 'ncurses.h'
++ if compiler.has_header_symbol(f, 'get_wch',
++ prefix : '#define _XOPEN_SOURCE_EXTENDED')
++ ncurses_header = f
++ endif
++ endforeach
+ else
+- ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+- ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+- # Some distros put the headers in ncursesw/, some don't
+- found_ncurses_h = false
+- foreach location : ncurses_sys_dirs
+- f = location + '/ncurses.h'
+- if not found_ncurses_h
++ ncurses_available = false
++ ncurses_inc = []
++ ncurses_libs = [
++ compiler.find_library('ncursesw', required : false),
++ compiler.find_library('panelw', required : false)
++ ]
++ if ncurses_libs[0].found() and ncurses_libs[1].found()
++ foreach location : ncursesw_header_paths
++ f = location + 'ncurses.h'
+ if compiler.has_header_symbol(f, 'get_wch',
+ prefix : '#define _XOPEN_SOURCE_EXTENDED')
+- if location != '.'
+- ncurses_inc += [include_directories(location)]
+- endif
+- found_ncurses_h = true
++ ncurses_available = true
++ ncurses_header = f
+ endif
+- endif
+- endforeach
++ endforeach
+
+- if not found_ncurses_h
+- ncurses_inc = []
+- ncurses_libs = []
+- ncurses_available = false
++ if ncurses_available
++ ncurses = declare_dependency(
++ include_directories : ncurses_inc,
++ dependencies : ncurses_libs
++ )
++ endif
+ endif
+-else
++endif
++
++if not ncurses_available
+ # ncursesw was not found. Look for plain old ncurses
+- # The order of this list is important to the condition that follows.
+- ncurses_libs = [
+- compiler.find_library('ncurses', required : false),
+- compiler.find_library('panel', required : false),
+- compiler.find_library('tinfo', required : false),
++ ncurses = [
++ dependency('ncurses', required : false),
++ dependency('panel', required : false),
+ ]
+- ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+- gnt_config.set('NO_WIDECHAR', true)
++ if ncurses[0].found() and ncurses_libs[1].found()
++ ncurses_available = true
++ else
++ ncurses_libs = [
++ compiler.find_library('ncurses', required : false),
++ compiler.find_library('panel', required : false),
++ ]
++ ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++ ncurses = declare_dependency(dependencies : ncurses_libs)
++ endif
++ ncurses_widechar = false
+ endif
++
++if not ncurses_available and host_machine.system() == 'windows'
++ # Try pdcurses too.
++ ncurses_header = 'curses.h'
++ ncurses_libs = compiler.find_library('pdcurses', required : false)
++ ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++ ncurses = declare_dependency(dependencies : ncurses_libs)
++endif
++
+ if not ncurses_available
+ error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+- include_directories : ncurses_inc,
+- dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+
+ libgnt_SOURCES = [
+ 'gntwidget.c',
+@@ -191,7 +205,10 @@ libgnt_headers = [
+ ]
+
+ # Check for Python headers
+-python_dep = dependency('python2', required : false)
++python_dep = dependency('python3-embed', required: false)
++if not python_dep.found()
++ python_dep = dependency('python3', required : false)
++endif
+ gnt_config.set('USE_PYTHON', python_dep.found())
+
+ configure_file(output : 'gntconfig.h',
+@@ -233,6 +250,20 @@ pkgconfig.generate(
+ variables : ['plugindir = ${libdir}/gnt'],
+ )
+
++if get_option('introspection')
++ libgnt_gir = gnome.generate_gir(libgnt,
++ sources : libgnt_headers + [gnt_h],
++ includes : 'GObject-2.0',
++ namespace : 'Gnt',
++ symbol_prefix : 'gnt',
++ identifier_prefix : 'Gnt',
++ nsversion : '@0@.@1@'.format(gnt_major_version, gnt_minor_version),
++ install : true,
++ extra_args : ['-DGNT_COMPILATION', '--quiet'])
++endif
++
+ subdir('wms')
+ subdir('test')
+-subdir('doc')
++if get_option('doc')
++ subdir('doc')
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..f2414e2
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,5 @@
++option('doc', type : 'boolean', value : true, yield : true,
++ description : 'build documentation with gtk-doc')
++
++option('introspection', type : 'boolean', value : true, yield : true,
++ description : 'build introspection data')