[PATCH 0/4] Upgrade GNOME-related recipes

[PATCH 0/4] Upgrade GNOME-related recipes

[Jussi Kukkonen]

The following changes since commit fc15878af46c09512fc3cb73480359fcbb22e627:

  init-install-efi.sh: fix gummiboot entry installation (2015-04-21 07:20:27 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/update-gnomeish
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/update-gnomeish

Jussi Kukkonen (4):
  hicolor-icon-theme: Upgrade to 0.15
  json-glib: Upgrade 1.0.2 -> 1.0.4
  librsvg: Upgrade 0.40.6 -> 0.40.9
  libsoup-2.4: Upgrade 2.46.0 -> 2.50.0

 ...on-theme_0.14.bb => hicolor-icon-theme_0.15.bb} |  4 +--
 .../{json-glib_1.0.2.bb => json-glib_1.0.4.bb}     |  4 +--
 .../recipes-gnome/librsvg/librsvg/gtk-option.patch | 30 +++++++++++-----------
 .../{librsvg_2.40.6.bb => librsvg_2.40.9.bb}       |  4 +--
 ...libsoup-2.4_2.46.0.bb => libsoup-2.4_2.50.0.bb} |  5 ++--
 5 files changed, 23 insertions(+), 24 deletions(-)
 rename meta/recipes-gnome/hicolor-icon-theme/{hicolor-icon-theme_0.14.bb => hicolor-icon-theme_0.15.bb} (74%)
 rename meta/recipes-gnome/json-glib/{json-glib_1.0.2.bb => json-glib_1.0.4.bb} (79%)
 rename meta/recipes-gnome/librsvg/{librsvg_2.40.6.bb => librsvg_2.40.9.bb} (91%)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.46.0.bb => libsoup-2.4_2.50.0.bb} (85%)

-- 
2.1.4

[PATCH 1/4] hicolor-icon-theme: Upgrade to 0.15

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{hicolor-icon-theme_0.14.bb => hicolor-icon-theme_0.15.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/hicolor-icon-theme/{hicolor-icon-theme_0.14.bb => hicolor-icon-theme_0.15.bb} (74%)

diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.14.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb
similarity index 74%
rename from meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.14.bb
rename to meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb
index 9cb8056..a704632 100644
--- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.14.bb
+++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.15.bb
@@ -6,8 +6,8 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426"
 
 SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "56d2c6c3a9df5a0acd332430e3f3ae3e"
-SRC_URI[sha256sum] = "7bed06e6ef316318274bda0fdaf39fce960e4222a0165c968d84acb428902ecd"
+SRC_URI[md5sum] = "6aa2b3993a883d85017c7cc0cfc0fb73"
+SRC_URI[sha256sum] = "9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc"
 
 inherit allarch autotools
 
-- 
2.1.4

[PATCH 2/4] json-glib: Upgrade 1.0.2 -> 1.0.4

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../json-glib/{json-glib_1.0.2.bb => json-glib_1.0.4.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/json-glib/{json-glib_1.0.2.bb => json-glib_1.0.4.bb} (79%)

diff --git a/meta/recipes-gnome/json-glib/json-glib_1.0.2.bb b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
similarity index 79%
rename from meta/recipes-gnome/json-glib/json-glib_1.0.2.bb
rename to meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
index 0c25dec..4d2b613 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.0.2.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_1.0.4.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0"
 
 GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI[archive.md5sum] = "e43efaf6852958207982e79141bf371e"
-SRC_URI[archive.sha256sum] = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a"
+SRC_URI[archive.md5sum] = "3131b0417ecde3da1ae72acceaa375cf"
+SRC_URI[archive.sha256sum] = "80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd"
 
 inherit gnome gettext lib_package
 
-- 
2.1.4

[PATCH 3/4] librsvg: Upgrade 0.40.6 -> 0.40.9

[Jussi Kukkonen]

* modify gtk-option patch so it's for configure.ac and not
  configure.in

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../recipes-gnome/librsvg/librsvg/gtk-option.patch | 30 +++++++++++-----------
 .../{librsvg_2.40.6.bb => librsvg_2.40.9.bb}       |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename meta/recipes-gnome/librsvg/{librsvg_2.40.6.bb => librsvg_2.40.9.bb} (91%)

diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
index d44bdd3..584d87d 100644
--- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
@@ -1,27 +1,27 @@
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 19 Nov 2013 16:00:29 +0000
+From 85d4af4451283f388e1e101ee4710bb19854154d Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jku@goto.fi>
+Date: Fri, 10 Apr 2015 16:49:43 +0300
 Subject: [PATCH] configure: add option to enable/disable use of GTK+
 
 Distro packagers like predictability and automatically detected optional
 dependencies are not predicable.  Add a --with-gtk3 option (default to "auto")
 for forcibly controlling whether GTK+ will be used or not.
 
+https://bugzilla.gnome.org/show_bug.cgi?id=712693
+
 Signed-off-by: Ross Burton <ross.burton@intel.com>
 
-https://bugzilla.gnome.org/show_bug.cgi?id=712693
+Forward-ported to 2.40.9
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
 ---
- configure.in |   17 +++++++++++------
+ configure.ac | 17 +++++++++++------
  1 file changed, 11 insertions(+), 6 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index f7a89dc..1498f72 100644
---- a/configure.in
-+++ b/configure.in
-@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
+diff --git a/configure.ac b/configure.ac
+index e86c052..16b0e34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r)
  # GTK
  # ===========================================================================
  
@@ -49,7 +49,7 @@ index f7a89dc..1498f72 100644
  
  dnl ===========================================================================
  dnl GDK-Pixbuf SVG loader
-@@ -305,6 +310,6 @@ librsvg-$VERSION
+@@ -289,6 +294,6 @@ librsvg-$VERSION
  	Build introspectable bindings:  ${found_introspection}
  	Build Vala bindings:            ${enable_vala}
  	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
@@ -58,5 +58,5 @@ index f7a89dc..1498f72 100644
  	Build miscellaenous tools:      ${build_misc_tools}
  "
 -- 
-1.7.10.4
+2.1.4
 
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
similarity index 91%
rename from meta/recipes-gnome/librsvg/librsvg_2.40.6.bb
rename to meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
index 483d309..9a14f29 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.9.bb
@@ -16,8 +16,8 @@ GNOME_COMPRESS_TYPE = "xz"
 
 SRC_URI += "file://gtk-option.patch"
 
-SRC_URI[archive.md5sum] = "259fd160b47ec11f3c27d7e18e507c99"
-SRC_URI[archive.sha256sum] = "8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06"
+SRC_URI[archive.md5sum] = "31df15e3beaa8fbbf538ca3c52b400d2"
+SRC_URI[archive.sha256sum] = "13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a"
 
 EXTRA_OECONF = "--disable-introspection --disable-vala"
 
-- 
2.1.4

[PATCH 4/4] libsoup-2.4: Upgrade 2.46.0 -> 2.50.0

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../libsoup/{libsoup-2.4_2.46.0.bb => libsoup-2.4_2.50.0.bb}         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libsoup/{libsoup-2.4_2.46.0.bb => libsoup-2.4_2.50.0.bb} (85%)

diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.46.0.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
similarity index 85%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.46.0.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
index 81da911..044db31 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.46.0.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.50.0.bb
@@ -17,9 +17,8 @@ PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
 
-
-SRC_URI[md5sum] = "86765c0093efaf3006fa2960d170d097"
-SRC_URI[sha256sum] = "fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3"
+SRC_URI[md5sum] = "9a84d66e1b7ccd3bd340574b11eccc15"
+SRC_URI[sha256sum] = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b"
 
 S = "${WORKDIR}/libsoup-${PV}"
 
-- 
2.1.4

Re: [PATCH 3/4] librsvg: Upgrade 0.40.6 -> 0.40.9

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

On 21 April 2015 at 16:49, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:

> -Upstream-Status: Submitted [
> https://bugzilla.gnome.org/show_bug.cgi?id=712693]
>

This tag disappears in the updated patch, please add it back.

Ross

[-- Attachment #2: Type: text/html, Size: 728 bytes --]

Re: [PATCH 3/4] librsvg: Upgrade 0.40.6 -> 0.40.9

[Jussi Kukkonen]

On 23 April 2015 at 11:50, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 21 April 2015 at 16:49, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
>>
>> -Upstream-Status: Submitted
>> [https://bugzilla.gnome.org/show_bug.cgi?id=712693]
>
> This tag disappears in the updated patch, please add it back.

I fixed Upstream-Status tag in that patch and re-pushed the same
branch (rebased to current master):

  git://git.yoctoproject.org/poky-contrib jku/update-gnomeish
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/update-gnomeish


Thanks,
  Jussi