aboutsummaryrefslogtreecommitdiff
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:45:50 +0100
commite922e23a7b3868b2dc9c5845fc5c5df1940df00d (patch)
tree16fd149a8e01b1bcfd82aa586e6fbd21ba8a7595
parent2704c84098bb8b23dc79c4369947048a1a67c655 (diff)
downloadopenembedded-core-e922e23a7b3868b2dc9c5845fc5c5df1940df00d.zip
openembedded-core-e922e23a7b3868b2dc9c5845fc5c5df1940df00d.tar.gz
openembedded-core-e922e23a7b3868b2dc9c5845fc5c5df1940df00d.tar.bz2
adwaita-icon-theme: Upgrade 3.22.0 -> 3.24.0
Add patch to fix allarch-build by removing a useless AC_CANONICAL_HOST. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 0000000..e7ac97b
--- /dev/null
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
@@ -0,0 +1,29 @@
+From d2b9ad8a80bf9320fe35c9aee8f52e55ebd40e06 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 d855b7a..6908f59 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,6 @@ AC_PREREQ(2.53)
+
+ AC_INIT([adwaita-icon-theme], [3.24.0],
+ [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])
+
+--
+2.1.4
+
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 1cbc1e6..5fdc71d 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
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
+ file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
"
-SRC_URI[md5sum] = "cde51d7dfcbcfa3b8cdc3e5f0df8c799"
-SRC_URI[sha256sum] = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7"
+SRC_URI[md5sum] = "3ccac0d600ffc936d2adfb80e9245bc5"
+SRC_URI[sha256sum] = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"
do_install_append() {
# Build uses gtk-encode-symbolic-svg to create png versions: