summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2021-01-21 07:29:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-21 23:25:53 (GMT)
commite5674ee26ed44917e9c241c5e45f86a617b6ee56 (patch)
treeab375b444417c644b461a49e418d1e70dc490c2f
parent85335647a316230ad78520955ba738f08c334659 (diff)
downloadpoky-master-test.tar.gz
adwaita-icon-theme: add version 3.34.3 backmaster-test
Newer versions of adwaita-icon-theme can't work well with librsvg 2.40. Boot up the core-image-sato image, and start "Media Player", most of the icons are not showed properly. The source code of librsvg has been adapted to rust, so it is impossible to update librsvg in oe core for now. Then add adwaita-icon-theme 3.34.3 back and set as preferred version. Duplicate one patch as well to fix patch fuzz issue. Ref: 1. https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/issues/84 2. https://people.gnome.org/~federico/blog/do-not-use-librsvg-2.40.x.html (From OE-Core rev: c3e2f819640f73893b8688c18a2b12fc2c5f9ed9) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/default-versions.inc1
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch27
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb43
3 files changed, 71 insertions, 0 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index a6f3313..5e6fd8a 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -2,3 +2,4 @@
2# Default preferred versions 2# Default preferred versions
3# 3#
4 4
5PREFERRED_VERSION_adwaita-icon-theme ?= "3.34.3"
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch
new file mode 100644
index 0000000..4ed5e15
--- /dev/null
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch
@@ -0,0 +1,27 @@
1From 8b3b153b6b95662316528ef083365b46cf5f7841 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 30 May 2017 14:55:49 +0300
4Subject: [PATCH] Don't use AC_CANONICAL_HOST
5
6This won't work when building allarch (and is only used to find out if
7target is windows).
8
9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11
12---
13 configure.ac | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index 449865d..888649e 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], [3.34.3],
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_3.34.3.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb
new file mode 100644
index 0000000..6cde6ff
--- /dev/null
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb
@@ -0,0 +1,43 @@
1SUMMARY = "GTK+ icon theme"
2HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
3BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues"
4SECTION = "x11/gnome"
5
6LICENSE = "LGPL-3.0 | CC-BY-SA-3.0"
7LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
8 file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
9 file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02"
10
11inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even
12
13MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
14SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
15 file://0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch \
16 file://0001-Run-installation-commands-as-shell-jobs.patch \
17 "
18
19SRC_URI[md5sum] = "9aea4ad9bc002aacad155ee0748b357f"
20SRC_URI[sha256sum] = "e7c2d8c259125d5f35ec09522b88c8fe7ecf625224ab0811213ef0a95d90b908"
21
22DEPENDS += "librsvg-native"
23
24PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}"
25
26RREPLACES_${PN} = "gnome-icon-theme"
27RCONFLICTS_${PN} = "gnome-icon-theme"
28RPROVIDES_${PN} = "gnome-icon-theme"
29
30FILES_${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/"
31FILES_${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.png \
32 ${prefix}/share/icons/Adwaita/64x64/*/*.symbolic.png \
33 ${prefix}/share/icons/Adwaita/48x48/*/*.symbolic.png \
34 ${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png"
35FILES_${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \
36 ${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png \
37 ${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg"
38FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \
39 ${prefix}/share/icons/Adwaita/512x512/"
40FILES_${PN} = "${prefix}/share/icons/Adwaita/ \
41 ${prefix}/share/pkgconfig/adwaita-icon-theme.pc"
42
43BBCLASSEXTEND = "native nativesdk"