[meta-gnome][Patch 0/2] Update gvfs and libgtop

[meta-gnome][Patch 0/2] Update gvfs and libgtop

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

Hi Khem,

Please ignore the previous patch to inherit upstream-version-is-even that they
are included in these patches.

Kai Kang (2):
  libgtop: 2.38.0 -> 2.39.91
  gvfs: 1.39.92 -> 1.40.0

 .../gvfs/{gvfs_1.39.92.bb => gvfs_1.40.0.bb}     |  6 +++---
 .../recipes-gnome/libgtop/libgtop_2.38.0.bb      | 13 -------------
 .../recipes-gnome/libgtop/libgtop_2.40.0.bb      | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 16 deletions(-)
 rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.39.92.bb => gvfs_1.40.0.bb} (91%)
 delete mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
 create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb

-- 
2.20.0

[meta-gnome][Patch 1/2] libgtop: 2.38.0 -> 2.39.91

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

Update libgtop from 2.38.0 to 2.39.91.

* reset LIBGTOP_LIBS to avoid compile errors which caused by host
  contamination
* inherit upstream-version-is-even to ensures that the upstream
  version check only accepts even minor(stable) versions.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../recipes-gnome/libgtop/libgtop_2.38.0.bb      | 13 -------------
 .../recipes-gnome/libgtop/libgtop_2.40.0.bb      | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
 create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb

diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
deleted file mode 100644
index 494934fe7..000000000
--- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "LibGTop2"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspection gettext
-
-# depends on libxau
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI[archive.md5sum] = "bb0ce7de6b28694b40405eedac8a31b5"
-SRC_URI[archive.sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612"
-
-DEPENDS = "glib-2.0 libxau"
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
new file mode 100644
index 000000000..b594198a4
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
@@ -0,0 +1,16 @@
+SUMMARY = "LibGTop2"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even
+
+# depends on libxau
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947"
+SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4"
+
+DEPENDS = "glib-2.0 libxau"
+
+EXTRA_OEMAKE += "LIBGTOP_LIBS="
-- 
2.20.0

Re: [meta-gnome][Patch 1/2] libgtop: 2.38.0 -> 2.39.91

[Kang Kai]

On 2019/3/15 下午3:47, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> Update libgtop from 2.38.0 to 2.39.91.

Oops. Forgot  to update  commit message. V2 will be sent.

Kai


>
> * reset LIBGTOP_LIBS to avoid compile errors which caused by host
>    contamination
> * inherit upstream-version-is-even to ensures that the upstream
>    version check only accepts even minor(stable) versions.
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>   .../recipes-gnome/libgtop/libgtop_2.38.0.bb      | 13 -------------
>   .../recipes-gnome/libgtop/libgtop_2.40.0.bb      | 16 ++++++++++++++++
>   2 files changed, 16 insertions(+), 13 deletions(-)
>   delete mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
>   create mode 100644 meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
>
> diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
> deleted file mode 100644
> index 494934fe7..000000000
> --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -SUMMARY = "LibGTop2"
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> -
> -inherit gnomebase lib_package gtk-doc distro_features_check gobject-introspection gettext
> -
> -# depends on libxau
> -REQUIRED_DISTRO_FEATURES = "x11"
> -
> -SRC_URI[archive.md5sum] = "bb0ce7de6b28694b40405eedac8a31b5"
> -SRC_URI[archive.sha256sum] = "4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612"
> -
> -DEPENDS = "glib-2.0 libxau"
> diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
> new file mode 100644
> index 000000000..b594198a4
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
> @@ -0,0 +1,16 @@
> +SUMMARY = "LibGTop2"
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> +
> +inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even
> +
> +# depends on libxau
> +inherit distro_features_check
> +REQUIRED_DISTRO_FEATURES = "x11"
> +
> +SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947"
> +SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4"
> +
> +DEPENDS = "glib-2.0 libxau"
> +
> +EXTRA_OEMAKE += "LIBGTOP_LIBS="


-- 
Kai Kang

[meta-gnome][Patch 2/2] gvfs: 1.39.92 -> 1.40.0

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

Update gvfs from 1.39.92 to 1.40.0.

* inherit upstream-version-is-even to ensures that the upstream version
  check only accepts even minor(stable) versions.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../recipes-gnome/gvfs/{gvfs_1.39.92.bb => gvfs_1.40.0.bb}  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.39.92.bb => gvfs_1.40.0.bb} (91%)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.92.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
similarity index 91%
rename from meta-gnome/recipes-gnome/gvfs/gvfs_1.39.92.bb
rename to meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
index fef5d68e3..7f239c413 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.92.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
@@ -3,14 +3,14 @@ LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
 
 GNOMEBASEBUILDCLASS = "meson"
-inherit gnome bash-completion gettext
+inherit gnome bash-completion gettext upstream-version-is-even
 
 DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit shadow-native"
 
 SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
 
-SRC_URI[archive.md5sum] = "5b60e70ea5a6421bc72eb339059b1175"
-SRC_URI[archive.sha256sum] = "ae44307c127268b6c8cbe5a93bb4a248fb8a6df430d29726e8aeb2ba40bd5513"
+SRC_URI[archive.md5sum] = "96ef53ed613e4d223e0db3a7acea44f0"
+SRC_URI[archive.sha256sum] = "3739d64b79c95a9f0f9faf2c5f9e5298b4b2ebdd6431435ce656ecd19b31e2f2"
 
 
 EXTRA_OEMESON = " \
-- 
2.20.0