diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-13 20:01:02 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-14 14:40:52 -0800 |
commit | 84e87356aa7fcd3190b288702f971b6b5c1b8b6f (patch) | |
tree | 91fdd62ab29af97c0e4f407a987c3e626d13fb31 /meta-gnome/recipes-kernel | |
parent | 7836ff731b1c562cd6dc195be0030792da560623 (diff) | |
download | meta-openembedded-84e87356aa7fcd3190b288702f971b6b5c1b8b6f.tar.gz |
sysprof: update to 3.34.1
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>
Diffstat (limited to 'meta-gnome/recipes-kernel')
-rw-r--r-- | meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch | 27 | ||||
-rw-r--r-- | meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 35 | ||||
-rw-r--r-- | meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch | 22 | ||||
-rw-r--r-- | meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb (renamed from meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb) | 18 |
4 files changed, 46 insertions, 56 deletions
diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch deleted file mode 100644 index ade51cf86..000000000 --- a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 23 Aug 2017 18:38:26 +0300 | ||
4 | Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | meson.build | 1 - | ||
11 | 1 file changed, 1 deletion(-) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index 3986273..ae2f65e 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -164,7 +164,6 @@ subdir('tools') | ||
18 | subdir('tests') | ||
19 | |||
20 | subdir('data') | ||
21 | -subdir('help') | ||
22 | subdir('po') | ||
23 | |||
24 | meson.add_install_script('build-aux/meson/post_install.sh') | ||
25 | -- | ||
26 | 2.7.4 | ||
27 | |||
diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch new file mode 100644 index 000000000..75aa86cdb --- /dev/null +++ b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 18 Jul 2011 16:00:17 -0700 | ||
4 | Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined | ||
5 | |||
6 | On uclibc elf.h does not have GNU extentions but we need this define | ||
7 | so we define it locally if its not getting it from elf.h | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | %% original patch: define-NT_GNU_BUILD_ID.patch | ||
14 | --- | ||
15 | src/libsysprof/elfparser.h | 4 ++++ | ||
16 | 1 file changed, 4 insertions(+) | ||
17 | |||
18 | diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h | ||
19 | index 160e4c9..94fa5c0 100644 | ||
20 | --- a/src/libsysprof/elfparser.h | ||
21 | +++ b/src/libsysprof/elfparser.h | ||
22 | @@ -18,6 +18,10 @@ | ||
23 | |||
24 | #include <glib.h> | ||
25 | |||
26 | +#ifndef NT_GNU_BUILD_ID | ||
27 | +#define NT_GNU_BUILD_ID 3 | ||
28 | +#endif | ||
29 | + | ||
30 | typedef struct ElfSym ElfSym; | ||
31 | typedef struct ElfParser ElfParser; | ||
32 | |||
33 | -- | ||
34 | 2.17.1 | ||
35 | |||
diff --git a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch deleted file mode 100644 index f75ddad43..000000000 --- a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | On uclibc elf.h does not have GNU extentions but we need this define | ||
2 | so we define it locally if its not getting it from elf.h | ||
3 | |||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: git/elfparser.h | ||
9 | =================================================================== | ||
10 | --- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 | ||
11 | +++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 | ||
12 | @@ -17,6 +17,10 @@ | ||
13 | */ | ||
14 | #include <glib.h> | ||
15 | |||
16 | +#ifndef NT_GNU_BUILD_ID | ||
17 | +#define NT_GNU_BUILD_ID 3 | ||
18 | +#endif | ||
19 | + | ||
20 | typedef struct ElfSym ElfSym; | ||
21 | typedef struct ElfParser ElfParser; | ||
22 | |||
diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb index b92933806..b7e7bee6b 100644 --- a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb | |||
@@ -2,23 +2,26 @@ SUMMARY = "System-wide Performance Profiler for Linux" | |||
2 | HOMEPAGE = "http://www.sysprof.com" | 2 | HOMEPAGE = "http://www.sysprof.com" |
3 | LICENSE = "GPLv3+" | 3 | LICENSE = "GPLv3+" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
5 | file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" | 5 | file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" |
6 | 6 | ||
7 | GNOMEBASEBUILDCLASS = "meson" | 7 | GNOMEBASEBUILDCLASS = "meson" |
8 | inherit gnomebase gettext systemd upstream-version-is-even gsettings | 8 | inherit gnomebase gettext systemd upstream-version-is-even gsettings |
9 | 9 | ||
10 | DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" | 10 | DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" |
11 | 11 | ||
12 | SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" | 12 | SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629" |
13 | SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" | 13 | SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0" |
14 | SRC_URI += " \ | 14 | SRC_URI += " \ |
15 | file://define-NT_GNU_BUILD_ID.patch \ | 15 | file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ |
16 | file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ | ||
17 | " | 16 | " |
18 | 17 | ||
19 | PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" | 18 | PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" |
20 | PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" | 19 | PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" |
21 | PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" | 20 | PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" |
21 | PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" | ||
22 | |||
23 | # Enablig this requries yelp | ||
24 | EXTRA_OEMESON += "-Dhelp=false -Dsystemdunitdir=${systemd_unitdir}" | ||
22 | 25 | ||
23 | SOLIBS = ".so" | 26 | SOLIBS = ".so" |
24 | FILES_SOLIBSDEV = "" | 27 | FILES_SOLIBSDEV = "" |
@@ -28,5 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysp | |||
28 | FILES_${PN} += " \ | 31 | FILES_${PN} += " \ |
29 | ${datadir}/dbus-1/system-services \ | 32 | ${datadir}/dbus-1/system-services \ |
30 | ${datadir}/dbus-1/system.d \ | 33 | ${datadir}/dbus-1/system.d \ |
34 | ${datadir}/dbus-1/interfaces \ | ||
31 | ${datadir}/metainfo \ | 35 | ${datadir}/metainfo \ |
32 | " | 36 | " |