| Message ID | 20230921051435.1234043-1-kai.kang@windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | 6207395b2efe91d6f683c758fac782a5f617c20a |
| Headers | show |
| Series | adwaita-icon-theme: 43 -> 45.0 | expand |
On Thu, 21 Sept 2023 at 07:14, Kai Kang <kai.kang@eng.windriver.com> wrote: > -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. > + ${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
On 9/21/23 13:49, Alexander Kanavin wrote: > On Thu, 21 Sept 2023 at 07:14, Kai Kang <kai.kang@eng.windriver.com> wrote: >> -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. ok. > >> + ${prefix}/share/licenses/adwaita-icon-theme \ > This should probably go to ${PN}-doc? ok. > > 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. I'll send v2 though it may be merged in next release. Regards, Kai > > Alex
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch deleted file mode 100644 index 0a1487f8e3..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e1a12b73c25d1ad0f267b22ac5d799bc1fbd0fa4 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -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 <jussi.kukkonen@intel.com> - ---- - 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]) - diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb similarity index 88% rename from meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb rename to meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb index 8cb4d147f1..b0d955cc47 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb @@ -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"