summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch30
-rw-r--r--meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb (renamed from meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb)8
2 files changed, 3 insertions, 35 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
deleted file mode 100644
index f2e720e9e..000000000
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sun, 24 Mar 2019 02:46:07 +0100
4Subject: [PATCH] Do not build help - we do not have yelp yet
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [embedded-specific]
10
11Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
12---
13 meson.build | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/meson.build b/meson.build
17index d60ced7..6a0ab4b 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -183,7 +183,6 @@ subdir('data')
21 subdir('po')
22 subdir('scripts')
23 subdir('src')
24-subdir('help')
25
26
27 message('\n'.join(['',
28--
292.20.1
30
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb
index 8930e1222..a9cbf22d7 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb
@@ -3,7 +3,6 @@ LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4 4
5DEPENDS = " \ 5DEPENDS = " \
6 itstool-native \
7 gnome-common-native \ 6 gnome-common-native \
8 libxml2-native \ 7 libxml2-native \
9 glib-2.0-native \ 8 glib-2.0-native \
@@ -15,13 +14,12 @@ DEPENDS = " \
15 14
16GNOMEBASEBUILDCLASS = "meson" 15GNOMEBASEBUILDCLASS = "meson"
17 16
18inherit gnomebase gconf gtk-icon-cache distro_features_check gettext 17inherit gnomebase gnome-help itstool gtk-icon-cache distro_features_check gettext upstream-version-is-even
19 18
20REQUIRED_DISTRO_FEATURES = "x11 polkit" 19REQUIRED_DISTRO_FEATURES = "x11 polkit"
21 20
22SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd" 21SRC_URI[archive.md5sum] = "37356a1b8c20939adc6f47f739d2e49a"
23SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3" 22SRC_URI[archive.sha256sum] = "48c131335091bd927862f40ef56400f997981df2acfc82abea662bf91a1ea4f1"
24SRC_URI += "file://0001-Do-not-build-help-we-do-not-have-yelp-yet.patch"
25 23
26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
27PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" 25PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"