All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 12/22] epiphany: update to 3.28.0.1
Date: Wed,  4 Apr 2018 14:13:11 +0300	[thread overview]
Message-ID: <20180404111321.10824-12-alexander.kanavin@linux.intel.com> (raw)
In-Reply-To: <20180404111321.10824-1-alexander.kanavin@linux.intel.com>

Rebase 0002-help-meson.build-disable-the-use-of-yelp.patch.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{epiphany_3.26.6.bb => epiphany_3.28.0.1.bb}     |  6 +++---
 ...02-help-meson.build-disable-the-use-of-yelp.patch | 20 ++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename meta/recipes-gnome/epiphany/{epiphany_3.26.6.bb => epiphany_3.28.0.1.bb} (81%)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb b/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
similarity index 81%
rename from meta/recipes-gnome/epiphany/epiphany_3.26.6.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
index e250f76ed1e..c878ee3229a 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.28.0.1.bb
@@ -13,10 +13,10 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
            file://0002-help-meson.build-disable-the-use-of-yelp.patch \
            "
-SRC_URI[archive.md5sum] = "8449968366a6f9aaff3ac228ddfc7c66"
-SRC_URI[archive.sha256sum] = "01b16aa55d312ae0f17d3136f90d8c68ac748715f119412fb1917023c6f630a8"
+SRC_URI[archive.md5sum] = "3e127d843d3f255f426ab34804f29163"
+SRC_URI[archive.sha256sum] = "7154b06837655771f2240bf378fb8ba2315ae07dbc6f45d160ca29cd6d377808"
 
 EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}"
 
-FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
+FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
diff --git a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
index 249517d8f90..d4f3cc1d35f 100644
--- a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
+++ b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
@@ -1,34 +1,30 @@
-From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001
+From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 31 Jan 2018 15:50:38 +0200
-Subject: [PATCH 2/2] help/meson.build: disable the use of yelp
+Subject: [PATCH] help/meson.build: disable the use of yelp
 
 In particular this avoids calling itstool which oe-core doesn't provide.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
- help/meson.build | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ help/meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/help/meson.build b/help/meson.build
-index f720add..cbfeb1e 100644
+index fddcf4c..f7d76c6 100644
 --- a/help/meson.build
 +++ b/help/meson.build
-@@ -46,8 +46,8 @@ help_linguas = [
-   'sv'
+@@ -32,7 +32,7 @@ help_media = [
+   'media/web-browser.png'
  ]
  
 -gnome.yelp(meson.project_name(),
 -  sources: help_files,
 -  media: help_media,
--  languages: help_linguas,
 -)
 +#gnome.yelp(meson.project_name(),
 +#  sources: help_files,
 +#  media: help_media,
-+#  languages: help_linguas,
 +#)
--- 
-2.15.1
-
-- 
2.16.1



  parent reply	other threads:[~2018-04-04 11:20 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-04 11:13 [PATCH 01/22] lighttpd: upgrade 1.4.48 -> 1.4.49 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 02/22] gcr: upgrade 3.20.0 -> 3.28.0 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 03/22] sysprof: add RECIPE_NO_UPDATE_REASON Alexander Kanavin
2018-04-04 11:13 ` [PATCH 04/22] vala: update to 0.40.2 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 05/22] gobject-introspection: do not hardcode the current version in the tarball path Alexander Kanavin
2018-04-04 11:13 ` [PATCH 06/22] gobject-introspection: update to 1.56.0 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 07/22] glib-2.0: update to 2.56.0 Alexander Kanavin
2018-04-20 13:05   ` Burton, Ross
2018-04-04 11:13 ` [PATCH 08/22] bash-completion: update to 2.8 Alexander Kanavin
2018-04-05  0:18   ` Khem Raj
2018-04-05  9:27     ` Alexander Kanavin
2018-04-05 16:53       ` Khem Raj
2018-04-04 11:13 ` [PATCH 09/22] webkitgtk: update to 2.20.0 Alexander Kanavin
2018-04-30  0:43   ` Khem Raj
2018-04-30 13:07     ` Alexander Kanavin
2018-04-30 15:39       ` Khem Raj
2018-05-04 11:55         ` Alexander Kanavin
2018-04-04 11:13 ` [PATCH 10/22] gsettings-desktop-schemas: update to 3.28.0 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 11/22] gnome-desktop3: " Alexander Kanavin
2018-04-04 11:13 ` Alexander Kanavin [this message]
2018-04-04 11:13 ` [PATCH 13/22] gtk-doc: update to 1.28 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 14/22] icu: update to 61.1 Alexander Kanavin
2018-04-05  0:20   ` Khem Raj
2018-04-05  9:32     ` Alexander Kanavin
2018-04-05 16:51       ` Khem Raj
2018-04-04 11:13 ` [PATCH 15/22] babeltrace: update to 1.5.5 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 16/22] libaio: update to 0.3.111 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 17/22] meson: update to 0.45.1 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 18/22] btrfs-tools: update to 4.15.1 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 19/22] libidn: update to 1.34 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 20/22] procps: update to 3.3.13 Alexander Kanavin
2018-04-05 16:43   ` Richard Purdie
2018-04-06  8:24     ` Alexander Kanavin
2018-04-04 11:13 ` [PATCH 21/22] libsecret: update to 0.18.6 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 22/22] oeqa/runtime/cases/python: use python 3 rather than python 2 Alexander Kanavin

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=20180404111321.10824-12-alexander.kanavin@linux.intel.com \
    --to=alexander.kanavin@linux.intel.com \
    --cc=openembedded-core@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.