diff options
author | Kai Kang <kai.kang@windriver.com> | 2023-09-22 16:04:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-26 10:35:28 +0100 |
commit | 0ccd6425db2cc91406fae14e4e5a7e4fe354ff77 (patch) | |
tree | 2dd46f08903dfc4c2134125069ab72c9a3a7e163 /meta/recipes-gnome/gnome | |
parent | 6b26f40c859b79e87945e09f23d5465124f8cd54 (diff) | |
download | poky-0ccd6425db2cc91406fae14e4e5a7e4fe354ff77.tar.gz |
adwaita-icon-theme: 43 -> 45.0
Update adwaita-icon-theme from 43 to 45.0.
* meson is used to replace autotools, then the patch is redundant
* not overwrite PACKAGES, and remove sub-packages ${PN}-hires and
${PN}-symbolic-hires which are created to handle big icon files which
do not exist in adwaita-icon-theme 45.0
* update FILES of ${PN}-symbolic and split license files to ${PN}-doc
(From OE-Core rev: 6207395b2efe91d6f683c758fac782a5f617c20a)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome')
3 files changed, 30 insertions, 67 deletions
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 @@ | |||
1 | From e1a12b73c25d1ad0f267b22ac5d799bc1fbd0fa4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 30 May 2017 14:55:49 +0300 | ||
4 | Subject: [PATCH] Don't use AC_CANONICAL_HOST | ||
5 | |||
6 | This won't work when building allarch (and is only used to find out if | ||
7 | target is windows). | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
11 | |||
12 | --- | ||
13 | configure.ac | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 6ddc49b..39752bb 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -3,7 +3,6 @@ AC_PREREQ(2.53) | ||
21 | |||
22 | AC_INIT([adwaita-icon-theme], [43], | ||
23 | [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) | ||
24 | -AC_CANONICAL_HOST | ||
25 | AC_CONFIG_MACRO_DIR([m4]) | ||
26 | AC_CONFIG_SRCDIR([index.theme.in]) | ||
27 | |||
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb deleted file mode 100644 index 8cb4d147f1..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_43.bb +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | SUMMARY = "GTK+ icon theme" | ||
2 | DESCRIPTION = "The Adwaita icon theme is the default icon theme of the GNOME desktop \ | ||
3 | This package package contains an icon theme for Gtk+ 3 applications." | ||
4 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" | ||
5 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" | ||
6 | SECTION = "x11/gnome" | ||
7 | |||
8 | LICENSE = "LGPL-3.0-only | CC-BY-SA-3.0" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ | ||
10 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ | ||
11 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" | ||
12 | |||
13 | inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase | ||
14 | |||
15 | SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" | ||
16 | |||
17 | SRC_URI[archive.sha256sum] = "2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6" | ||
18 | |||
19 | DEPENDS += "librsvg-native" | ||
20 | |||
21 | PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" | ||
22 | |||
23 | RREPLACES:${PN} = "gnome-icon-theme" | ||
24 | RCONFLICTS:${PN} = "gnome-icon-theme" | ||
25 | RPROVIDES:${PN} = "gnome-icon-theme" | ||
26 | |||
27 | FILES:${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/" | ||
28 | FILES:${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.png \ | ||
29 | ${prefix}/share/icons/Adwaita/64x64/*/*.symbolic.png \ | ||
30 | ${prefix}/share/icons/Adwaita/48x48/*/*.symbolic.png \ | ||
31 | ${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png" | ||
32 | FILES:${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \ | ||
33 | ${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png \ | ||
34 | ${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg" | ||
35 | FILES:${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ | ||
36 | ${prefix}/share/icons/Adwaita/512x512/" | ||
37 | FILES:${PN} = "${prefix}/share/icons/Adwaita/ \ | ||
38 | ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" | ||
39 | |||
40 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb new file mode 100644 index 0000000000..4dbcced5c3 --- /dev/null +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | SUMMARY = "GTK+ icon theme" | ||
2 | DESCRIPTION = "The Adwaita icon theme is the default icon theme of the GNOME desktop \ | ||
3 | This package package contains an icon theme for Gtk+ 3 applications." | ||
4 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" | ||
5 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" | ||
6 | SECTION = "x11/gnome" | ||
7 | |||
8 | LICENSE = "LGPL-3.0-only | CC-BY-SA-3.0" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ | ||
10 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ | ||
11 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" | ||
12 | |||
13 | GNOMEBASEBUILDCLASS = "meson" | ||
14 | inherit gnomebase allarch gtk-icon-cache | ||
15 | |||
16 | SRC_URI[archive.sha256sum] = "2442bfb06f4e6cc95bf6e2682fdff98fa5eddc688751b9d6215c623cb4e42ff1" | ||
17 | |||
18 | DEPENDS += "librsvg-native" | ||
19 | |||
20 | PACKAGES =+ "${PN}-cursors ${PN}-symbolic" | ||
21 | |||
22 | RREPLACES:${PN} = "gnome-icon-theme" | ||
23 | RCONFLICTS:${PN} = "gnome-icon-theme" | ||
24 | RPROVIDES:${PN} = "gnome-icon-theme" | ||
25 | |||
26 | FILES:${PN}-cursors = "${datadir}/icons/Adwaita/cursors/" | ||
27 | FILES:${PN}-symbolic = "${datadir}/icons/Adwaita/symbolic*/" | ||
28 | FILES:${PN}-doc += "${datadir}/licenses/adwaita-icon-theme" | ||
29 | |||
30 | BBCLASSEXTEND = "native nativesdk" | ||