adwaita-icon-theme: 43 -> 45.0
PATCH 1/1 adwaita-icon-theme: 43 -> 45.0
From: Kai Kang <[email protected]>
Update adwaita-icon-theme from 43 to 45.0.
* meson is used to replace autotools, then the patch is redundant
---
.../0001-Don-t-use-AC_CANONICAL_HOST.patch | 27 -------------------
...theme_43.bb => adwaita-icon-theme_45.0.bb} | 7 +++--
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
rename meta/recipes-gnome/gnome/{adwaita-icon-theme_43.bb => adwaita-icon-theme_45.0.bb} (88%)meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From e1a12b73c25d1ad0f267b22ac5d799bc1fbd0fa4 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <[email protected]> -Date: Tue, 30 May 2017 14:55:49 +0300 -Subject: [PATCH] Don't use AC_CANONICAL_HOST - -This won't work when building allarch (and is only used to find out if -target is windows). - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Jussi Kukkonen <[email protected]> - ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6ddc49b..39752bb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,6 @@ AC_PREREQ(2.53) - - AC_INIT([adwaita-icon-theme], [43], - [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) --AC_CANONICAL_HOST - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR([index.theme.in]) -
meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb +3 -4
@@ -10,11 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" -inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase +inherit allarch gnomebase gtk-icon-cache meson -SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" - -SRC_URI[archive.sha256sum] = "2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6" +SRC_URI[archive.sha256sum] = "2442bfb06f4e6cc95bf6e2682fdff98fa5eddc688751b9d6215c623cb4e42ff1" DEPENDS += "librsvg-native"
@@ -35,6 +33,7 @@ FILES:${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \ FILES:${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ ${prefix}/share/icons/Adwaita/512x512/" FILES:${PN} = "${prefix}/share/icons/Adwaita/ \ + ${prefix}/share/licenses/adwaita-icon-theme \ ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.34.1
meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ · line 13
Quoted 2 lines · Kai Kang
meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb +1
-1-inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase +inherit allarch gnomebase gtk-icon-cache meson
gnomebase inherits autotools by default via GNOMEBASEBUILDCLASS, so that needs to be reset, and then inherit meson is redundant here.
Quoted 1 line
+ ${prefix}/share/licenses/adwaita-icon-theme \
This should probably go to ${PN}-doc?
I also got a fail here with the same update:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/5795/steps/14/logs/stdio
This has potential to mess up sato icons, and that would fail QA checks inside feature freeze and make RP grumpy, so we should probably hold this update until after that. Or someone needs to verify that sato still looks ok.
Alex
Quoted 5 lines · Alexander Kanavin
meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ · line 13
Quoted 2 lines · Kai Kang
meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb +1
-1-inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase +inherit allarch gnomebase gtk-icon-cache mesongnomebase inherits autotools by default via GNOMEBASEBUILDCLASS, so that needs to be reset, and then inherit meson is redundant here.
ok.
Quoted 3 lines
Quoted 2 lines
+ ${prefix}/share/licenses/adwaita-icon-theme \
This should probably go to ${PN}-doc?
ok.
Quoted 8 lines
I also got a fail here with the same update:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/5795/steps/14/logs/stdioThis has potential to mess up sato icons, and that would fail QA checks inside feature freeze and make RP grumpy, so we should probably hold this update until after that. Or someone needs to verify that sato still looks ok.
I'll send v2 though it may be merged in next release.
Regards,
Kai
Quoted 2 lines
Alex
Signature · 2 lines
Kai Kang Wind River Linux