summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-21 15:31:46 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-21 15:31:57 +0300
commit0e2770ca218e5a902986a5ec9529c6a6877cacf1 (patch)
tree8ddaef8df38fe420fea652943c45e99135702574 /meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch
parente2375b556f8744dbfb57f561cfa7c6e67df63474 (diff)
downloadopenbmc-0e2770ca218e5a902986a5ec9529c6a6877cacf1.tar.xz
meta-openembedded: subtree update:ea8604a0e3..d0748372d2
Adrian Bunk (1): libnih: Remove Alexander Kanavin (3): sysprof: add a recipe from oe-core sysprof: update to 3.34.1 sysprof: fix ARM builds Andreas Müller (2): evolution-data-server: remove pythonnative from inherit fontforge: rework for python3 Diego Rondini (2): cups-filters: use libexecdir and cleanup cups-filters: upgrade 1.26.0 -> 1.26.2 Gianfranco Costamagna (2): websocketpp: refresh clang patch vboxguestdrivers: update to new version 6.1.2 Khem Raj (14): sysprof: avoid namesapace conflict with glibc headers jack: Use c++ compiler for programs which use c++ source files iozone3: Do not define prototype for pread64() libhugetlbfs: Fix missing file mode in create() API rdma-core: Use overloadable attribute with clang sysprof: Correct systemdunitdir location opencv: Tend for the compiler --param option rename in gcc10 grpc: Link with libatomic on powerpc ssiapi: Needs boost/ppc support fluentbit: Fix build on powerpc mozjs: extend --with-intl-api=build to ppc mpv: Disable lua support on powerpc packagegroup-meta-oe: Remove unbuildable recipes for ppc64le from rdeps opensc: Upgrade to 0.20.0 Mingde (Matthew) Zeng (2): byacc: upgrade 20191103 -> 20191125 keyutils: upgrade 1.6 -> 1.6.1 Peter Kjellerstedt (1): gitpkgv.bbclass: Add support for extending the supported tag formats S. Lockwood-Childs (1): lcov: geninfo needs another perl module Wang Mingyu (15): python3-cheetah: upgrade 3.2.3 -> 3.2.4 python3-coverage: 4.4.2 -> 5.0.2 python3-keras-applications: upgrade 1.0.6 -> 1.0.8 python3-keras-preprocessing: upgrade 1.0.5 -> 1.1.0 python3-more-itertools: 7.2.0 -> 8.1.0 python3-multidict: 4.5.2 -> 4.7.4 python3-ordered-set: 3.0.1 -> 3.1.1 python3-pulsectl: upgrade 18.12.5 -> 20.1.2 python-cmd2: upgrade 0.9.22 -> 0.9.23 python-engineio: upgrade 3.11.1 -> 3.11.2 python-javaobj-py3: upgrade 0.3.0 -> 0.4.0.1 python-kconfiglib: upgrade 10.42.0 -> 13.7.0 python-packaging: 19.2 -> 20.0 python-periphery: 2.0.0 -> 2.0.1 python-pyrsistent: upgrade 0.15.5 -> 0.15.7 William A. Kennington III via Openembedded-devel (1): cppzmq: bump to version 4.6.0 Yi Zhao (3): crda: fix UDEV_RULE_DIR open-vm-tools: fix build error with usrmerge feature multipath-tools: fix libudevdir Zang Ruochen (14): dhcpcd: upgrade 8.1.1 -> 8.1.5 fio: upgrade 3.16 -> 3.17 libencode-perl: upgrade 3.01 -> 3.02 zabbix: modify service file libmicrohttpd: upgrade 0.9.68 -> 0.9.69 libsass: upgrade 3.6.1 -> 3.6.3 pcsc-lite: upgrade 1.8.25 -> 1.8.26 python3-yarl: upgrade 1.3.0 -> 1.4.2 python3-wheel: upgrade 0.32.3 -> 0.33.6 python3-websockets: upgrade 8.0.2 -> 8.1 python-wcwidth: upgrade 0.1.7 -> 0.1.8 python-waitress: upgrade 1.4.1 -> 1.4.2 python-tqdm: upgrade 4.38.0 -> 4.41.1 python-supervisor: upgrade 4.0.2 -> 4.1.0 Change-Id: I2c394941fc3140bfeadcec3542cd72892fdcda6e Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch')
-rw-r--r--meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch b/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch
new file mode 100644
index 000000000..1e2b3c92b
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch
@@ -0,0 +1,63 @@
+From 4bd0d5d5dd6841fbac8385527617d18e7731244d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 15 Jan 2020 13:17:58 -0800
+Subject: [PATCH] libsysprof-ui: Rename environ to sys_environ
+
+This helps avoid namesapace conflict with glibc headers
+
+Fixes
+/usr/include/unistd.h:545:15: note: previous declaration is here
+
+extern char **environ;
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/libsysprof-ui/sysprof-profiler-assistant.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/libsysprof-ui/sysprof-profiler-assistant.c b/src/libsysprof-ui/sysprof-profiler-assistant.c
+index 22e3e24..c55d551 100644
+--- a/src/libsysprof-ui/sysprof-profiler-assistant.c
++++ b/src/libsysprof-ui/sysprof-profiler-assistant.c
+@@ -235,7 +235,7 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self,
+ {
+ g_auto(GStrv) argv = NULL;
+ g_auto(GStrv) env = NULL;
+- SysprofEnviron *environ;
++ SysprofEnviron *sys_environ;
+ const gchar *command;
+ gint argc;
+
+@@ -245,8 +245,8 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self,
+ sysprof_profiler_set_spawn (profiler, TRUE);
+ sysprof_profiler_set_spawn_argv (profiler, (const gchar * const *)argv);
+
+- environ = sysprof_environ_editor_get_environ (self->environ_editor);
+- env = sysprof_environ_get_environ (environ);
++ sys_environ = sysprof_environ_editor_get_environ (self->environ_editor);
++ env = sysprof_environ_get_environ (sys_environ);
+ sysprof_profiler_set_spawn_env (profiler, (const gchar * const *)env);
+
+ sysprof_profiler_set_spawn_inherit_environ (profiler,
+@@ -405,7 +405,7 @@ sysprof_profiler_assistant_class_init (SysprofProfilerAssistantClass *klass)
+ static void
+ sysprof_profiler_assistant_init (SysprofProfilerAssistant *self)
+ {
+- g_autoptr(SysprofEnviron) environ = sysprof_environ_new ();
++ g_autoptr(SysprofEnviron) sys_environ = sysprof_environ_new ();
+
+ gtk_widget_init_template (GTK_WIDGET (self));
+
+@@ -445,7 +445,7 @@ sysprof_profiler_assistant_init (SysprofProfilerAssistant *self)
+ self,
+ G_CONNECT_SWAPPED);
+
+- sysprof_environ_editor_set_environ (self->environ_editor, environ);
++ sysprof_environ_editor_set_environ (self->environ_editor, sys_environ);
+ }
+
+ void
+--
+2.25.0
+