summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-05-31 14:23:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:46:06 +0100
commit98c6788abbe122c058063b5b1b1d121b2f13cee2 (patch)
treead503911bf6dfd4afe13549ff9e4b05b11b9fc5c /meta/recipes-gnome/gnome
parentb8f5dd3e34cab6489cc5df9340f26748be7e3e53 (diff)
downloadpoky-98c6788abbe122c058063b5b1b1d121b2f13cee2.tar.gz
adwaita-icon-theme: Upgrade 3.22.0 -> 3.24.0
Add patch to fix allarch-build by removing a useless AC_CANONICAL_HOST. (From OE-Core rev: e922e23a7b3868b2dc9c5845fc5c5df1940df00d) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome')
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch29
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb (renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_3.22.0.bb)5
2 files changed, 32 insertions, 2 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
new file mode 100644
index 0000000000..e7ac97b732
--- /dev/null
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
@@ -0,0 +1,29 @@
1From d2b9ad8a80bf9320fe35c9aee8f52e55ebd40e06 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 configure.ac | 1 -
13 1 file changed, 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index d855b7a..6908f59 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -3,7 +3,6 @@ AC_PREREQ(2.53)
20
21 AC_INIT([adwaita-icon-theme], [3.24.0],
22 [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
23-AC_CANONICAL_HOST
24 AC_CONFIG_MACRO_DIR([m4])
25 AC_CONFIG_SRCDIR([index.theme.in])
26
27--
282.1.4
29
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.22.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb
index 1cbc1e6779..5fdc71d1e3 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.22.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.24.0.bb
@@ -11,10 +11,11 @@ inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-e
11 11
12MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 12MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
13SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ 13SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
14 file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "cde51d7dfcbcfa3b8cdc3e5f0df8c799" 17SRC_URI[md5sum] = "3ccac0d600ffc936d2adfb80e9245bc5"
17SRC_URI[sha256sum] = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7" 18SRC_URI[sha256sum] = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"
18 19
19do_install_append() { 20do_install_append() {
20 # Build uses gtk-encode-symbolic-svg to create png versions: 21 # Build uses gtk-encode-symbolic-svg to create png versions: