From: Kai Kang <kai.k...@windriver.com> Update adwaita-icon-theme from 43 to 45.0.
* meson is used to replace autotools, then the patch is redundant * not overwrite PACKAGES and split license files to ${PN}-doc Signed-off-by: Kai Kang <kai.k...@windriver.com> --- v2: * not overwrite PACKAGES and split license files to ${PN}-doc .../0001-Don-t-use-AC_CANONICAL_HOST.patch | 27 ------------------- ...theme_43.bb => adwaita-icon-theme_45.0.bb} | 11 ++++---- 2 files changed, 6 insertions(+), 32 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} (84%) 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.kukko...@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.kukko...@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 84% 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..076dc63427 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb @@ -10,15 +10,14 @@ 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 +GNOMEBASEBUILDCLASS = "meson" +inherit allarch gnomebase gtk-icon-cache -SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" - -SRC_URI[archive.sha256sum] = "2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6" +SRC_URI[archive.sha256sum] = "2442bfb06f4e6cc95bf6e2682fdff98fa5eddc688751b9d6215c623cb4e42ff1" DEPENDS += "librsvg-native" -PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" +PACKAGES =+ "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires" RREPLACES:${PN} = "gnome-icon-theme" RCONFLICTS:${PN} = "gnome-icon-theme" @@ -37,4 +36,6 @@ FILES:${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ FILES:${PN} = "${prefix}/share/icons/Adwaita/ \ ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" +FILES:${PN}-doc = "${prefix}/share/licenses/adwaita-icon-theme" + BBCLASSEXTEND = "native nativesdk" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#187974): https://lists.openembedded.org/g/openembedded-core/message/187974 Mute This Topic: https://lists.openembedded.org/mt/101495186/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-