adwaita-icon-theme:upgrade to 3.30.0

Submitted by Hong Liu on Sept. 26, 2018, 12:44 a.m. | Patch ID: 155167

Details

Message ID 20180926004400.28526-1-hongl.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

Hong Liu Sept. 26, 2018, 12:44 a.m.
Upgrade adwaita-icon-theme from 3.28.0 to 3.30.0

Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com>
---
 .../{adwaita-icon-theme_3.28.0.bb => adwaita-icon-theme_3.30.0.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.28.0.bb => adwaita-icon-theme_3.30.0.bb} (93%)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
similarity index 93%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
index 40dd35b..464182d 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
@@ -15,8 +15,8 @@  SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://0001-Run-installation-commands-as-shell-jobs.patch \
            "
 
-SRC_URI[md5sum] = "b25b2d82cbebf2cc9cd469457b604f2c"
-SRC_URI[sha256sum] = "7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150"
+SRC_URI[md5sum] = "5ad28b28fecde7f997f56e76a903567e"
+SRC_URI[sha256sum] = "9106729174a3e6cc183d14f74454987f5378b46f213e698a6ab2702f70e4e64b"
 
 do_install_append() {
 	# Build uses gtk-encode-symbolic-svg to create png versions:

Comments

Ross Burton Sept. 26, 2018, 1:25 p.m.
Please verify the patches apply cleanly:

WARNING: adwaita-icon-theme-3.30.0-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 0001-Don-t-use-AC_CANONICAL_HOST.patch
patching file configure.ac
Hunk #1 succeeded at 3 with fuzz 2.

On Wed, 26 Sep 2018 at 01:50, Hong Liu <hongl.fnst@cn.fujitsu.com> wrote:
>
> Upgrade adwaita-icon-theme from 3.28.0 to 3.30.0
>
> Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com>
> ---
>  .../{adwaita-icon-theme_3.28.0.bb => adwaita-icon-theme_3.30.0.bb}    | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.28.0.bb => adwaita-icon-theme_3.30.0.bb} (93%)
>
> diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
> similarity index 93%
> rename from meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
> rename to meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
> index 40dd35b..464182d 100644
> --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
> +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
> @@ -15,8 +15,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
>             file://0001-Run-installation-commands-as-shell-jobs.patch \
>             "
>
> -SRC_URI[md5sum] = "b25b2d82cbebf2cc9cd469457b604f2c"
> -SRC_URI[sha256sum] = "7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150"
> +SRC_URI[md5sum] = "5ad28b28fecde7f997f56e76a903567e"
> +SRC_URI[sha256sum] = "9106729174a3e6cc183d14f74454987f5378b46f213e698a6ab2702f70e4e64b"
>
>  do_install_append() {
>         # Build uses gtk-encode-symbolic-svg to create png versions:
> --
> 2.7.4
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Alexander Kanavin Sept. 28, 2018, 8:07 a.m.
Better yet, just revert the upgrade, and do it again with 'devtool
upgrade adwaita-icon-them'. It will automagically pick the latest
version (subject to version regex) and rebase/refresh the patches.

Alex
ср, 26 сент. 2018 г. в 15:26, Burton, Ross <ross.burton@intel.com>:
>
> Please verify the patches apply cleanly:
>
> WARNING: adwaita-icon-theme-3.30.0-r0 do_patch:
> Some of the context lines in patches were ignored. This can lead to
> incorrectly applied patches.
> The context lines in the patches can be updated with devtool:
>
>     devtool modify <recipe>
>     devtool finish --force-patch-refresh <recipe> <layer_path>
>
> Then the updated patches and the source tree (in devtool's workspace)
> should be reviewed to make sure the patches apply in the correct place
> and don't introduce duplicate lines (which can, and does happen
> when some of the context is ignored). Further information:
> http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
> Details:
> Applying patch 0001-Don-t-use-AC_CANONICAL_HOST.patch
> patching file configure.ac
> Hunk #1 succeeded at 3 with fuzz 2.
>
> On Wed, 26 Sep 2018 at 01:50, Hong Liu <hongl.fnst@cn.fujitsu.com> wrote:
> >
> > Upgrade adwaita-icon-theme from 3.28.0 to 3.30.0
> >
> > Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com>
> > ---
> >  .../{adwaita-icon-theme_3.28.0.bb => adwaita-icon-theme_3.30.0.bb}    | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >  rename meta/recipes-gnome/gnome/{adwaita-icon-theme_3.28.0.bb => adwaita-icon-theme_3.30.0.bb} (93%)
> >
> > diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
> > similarity index 93%
> > rename from meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
> > rename to meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
> > index 40dd35b..464182d 100644
> > --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb
> > +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.30.0.bb
> > @@ -15,8 +15,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
> >             file://0001-Run-installation-commands-as-shell-jobs.patch \
> >             "
> >
> > -SRC_URI[md5sum] = "b25b2d82cbebf2cc9cd469457b604f2c"
> > -SRC_URI[sha256sum] = "7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150"
> > +SRC_URI[md5sum] = "5ad28b28fecde7f997f56e76a903567e"
> > +SRC_URI[sha256sum] = "9106729174a3e6cc183d14f74454987f5378b46f213e698a6ab2702f70e4e64b"
> >
> >  do_install_append() {
> >         # Build uses gtk-encode-symbolic-svg to create png versions:
> > --
> > 2.7.4
> >
> >
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core