All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Andreas Müller" <schnitzeltony@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 17/19] gnome-system-monitor: upgrade 3.32.0 -> 3.32.1
Date: Mon, 28 Oct 2019 00:35:43 +0100	[thread overview]
Message-ID: <20191027233545.4146-18-schnitzeltony@gmail.com> (raw)
In-Reply-To: <20191027233545.4146-1-schnitzeltony@gmail.com>

* pack help files optionally
* add upstream-version-is-even to inherit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...t-build-help-we-do-not-have-yelp-yet.patch | 30 -------------------
 ...32.0.bb => gnome-system-monitor_3.32.1.bb} |  8 ++---
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
 rename meta-gnome/recipes-gnome/gnome-system-monitor/{gnome-system-monitor_3.32.0.bb => gnome-system-monitor_3.32.1.bb} (64%)

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 @@
-From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 24 Mar 2019 02:46:07 +0100
-Subject: [PATCH] Do not build help - we do not have yelp yet
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded-specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index d60ced7..6a0ab4b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -183,7 +183,6 @@ subdir('data')
- subdir('po')
- subdir('scripts')
- subdir('src')
--subdir('help')
- 
- 
- message('\n'.join(['',
--- 
-2.20.1
-
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
similarity index 64%
rename from meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
rename to 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS = " \
-    itstool-native \
     gnome-common-native \
     libxml2-native \
     glib-2.0-native \
@@ -15,13 +14,12 @@ DEPENDS = " \
 
 GNOMEBASEBUILDCLASS = "meson"
 
-inherit gnomebase gconf gtk-icon-cache distro_features_check gettext
+inherit gnomebase gnome-help itstool gtk-icon-cache distro_features_check gettext upstream-version-is-even
 
 REQUIRED_DISTRO_FEATURES = "x11 polkit"
 
-SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd"
-SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3"
-SRC_URI += "file://0001-Do-not-build-help-we-do-not-have-yelp-yet.patch"
+SRC_URI[archive.md5sum] = "37356a1b8c20939adc6f47f739d2e49a"
+SRC_URI[archive.sha256sum] = "48c131335091bd927862f40ef56400f997981df2acfc82abea662bf91a1ea4f1"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
-- 
2.21.0



  parent reply	other threads:[~2019-10-27 23:36 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-27 23:35 [PATCH 00/19] next gnome batch Andreas Müller
2019-10-27 23:35 ` [PATCH 01/19] itstool: rework native shebang and add class to make native itstool work Andreas Müller
2019-10-27 23:35 ` [PATCH 02/19] yelp-tools: use itstools.bbclass Andreas Müller
2019-10-27 23:35 ` [PATCH 03/19] yelp-xsl: use itstool.bbclass Andreas Müller
2019-10-27 23:35 ` [PATCH 04/19] yelp: " Andreas Müller
2019-10-27 23:35 ` [PATCH 05/19] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles' Andreas Müller
2019-10-27 23:35 ` [PATCH 06/19] zenity: rework recipe Andreas Müller
2019-10-27 23:35 ` [PATCH 07/19] colord: initial add 1.4.4 Andreas Müller
2019-10-28 20:08   ` Khem Raj
2019-10-28 20:50     ` Andreas Müller
2019-10-28 21:40       ` Khem Raj
2019-10-27 23:35 ` [PATCH 08/19] colord-gtk: initial add 0.2.0 Andreas Müller
2019-10-27 23:35 ` [PATCH 09/19] dconf: extend to native build for upcoming gdm Andreas Müller
2019-10-27 23:35 ` [PATCH 10/19] dconf-editor: upgrade 3.32.0 -> 3.34.0 Andreas Müller
2019-10-27 23:35 ` [PATCH 11/19] gtksourceview4: upgrade 4.2.0 -> 4.4.0 Andreas Müller
2019-10-27 23:35 ` [PATCH 12/19] gnome-menus3: upgrade 3.10.1 -> 3.32.0 Andreas Müller
2019-10-27 23:35 ` [PATCH 13/19] gnome-desktop3: upgrade 3.34.0 -> 3.34.1 Andreas Müller
2019-10-27 23:35 ` [PATCH 14/19] gnome-bluetooth: upgrade 3.32.1 -> 3.34.0 Andreas Müller
2019-10-27 23:35 ` [PATCH 15/19] glade3: upgrade 3.8.5 -> 3.8.6 Andreas Müller
2019-10-28 20:08   ` Khem Raj
2019-10-28 21:11     ` Andreas Müller
2019-10-27 23:35 ` [PATCH 16/19] gspell: upgrade 1.8.1 -> 1.8.2 Andreas Müller
2019-10-27 23:35 ` Andreas Müller [this message]
2019-10-27 23:35 ` [PATCH 18/19] network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup Andreas Müller
2019-10-27 23:35 ` [PATCH 19/19] ibus: initial add 1.5.21 Andreas Müller
2019-10-27 23:59   ` Andreas Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191027233545.4146-18-schnitzeltony@gmail.com \
    --to=schnitzeltony@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.