mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

sysprof: update to 3.34.1

Browse Source 
0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
is replaced by a meson option.

Enable all options, as polkit is now available.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Alexander Kanavin
2020-01-13 20:01:02 +01:00
committed by Khem Raj
parent 7836ff731b
commit 84e87356aa
4 changed files with 46 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
-27
View File
@@ -1,27 +0,0 @@
From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 23 Aug 2017 18:38:26 +0300
Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3986273..ae2f65e 100644
--- a/meson.build
+++ b/meson.build
@@ -164,7 +164,6 @@ subdir('tools')
subdir('tests')
subdir('data')
-subdir('help')
subdir('po')
meson.add_install_script('build-aux/meson/post_install.sh')
--
2.7.4
meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
+35
View File
@@ -0,0 +1,35 @@
From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 18 Jul 2011 16:00:17 -0700
Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined
On uclibc elf.h does not have GNU extentions but we need this define
so we define it locally if its not getting it from elf.h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
%% original patch: define-NT_GNU_BUILD_ID.patch
---
src/libsysprof/elfparser.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h
index 160e4c9..94fa5c0 100644
--- a/src/libsysprof/elfparser.h
+++ b/src/libsysprof/elfparser.h
@@ -18,6 +18,10 @@
#include <glib.h>
+#ifndef NT_GNU_BUILD_ID
+#define NT_GNU_BUILD_ID 3
+#endif
+
typedef struct ElfSym ElfSym;
typedef struct ElfParser ElfParser;
--
2.17.1
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
-22
View File
@@ -1,22 +0,0 @@
On uclibc elf.h does not have GNU extentions but we need this define
so we define it locally if its not getting it from elf.h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: git/elfparser.h
===================================================================
--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700
+++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700
@@ -17,6 +17,10 @@
*/
#include <glib.h>
+#ifndef NT_GNU_BUILD_ID
+#define NT_GNU_BUILD_ID 3
+#endif
+
typedef struct ElfSym ElfSym;
typedef struct ElfParser ElfParser;
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb → meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb
+11 -7
View File
@@ -2,23 +2,26 @@ SUMMARY = "System-wide Performance Profiler for Linux"
HOMEPAGE = "http://www.sysprof.com"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext systemd upstream-version-is-even gsettings
DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af"
SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d"
SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629"
SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0"
SRC_URI += " \
file://define-NT_GNU_BUILD_ID.patch \
file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \
"
PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle"
PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit"
# Enablig this requries yelp
EXTRA_OEMESON += "-Dhelp=false -Dsystemdunitdir=${systemd_unitdir}"
SOLIBS = ".so"
FILES_SOLIBSDEV = ""
@@ -28,5 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysp
FILES_${PN} += " \
${datadir}/dbus-1/system-services \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/interfaces \
${datadir}/metainfo \
"