summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-16 23:51:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-20 10:40:41 +0100
commit6257bf7cb6d144e4335afac6ddbd1c6373c38628 (patch)
treeb4774ccb72ff60ebe1d9b9decf9680355a2c252a /meta
parent350b73f240f45cf3ae4d0f746090c9dbae039921 (diff)
downloadpoky-6257bf7cb6d144e4335afac6ddbd1c6373c38628.tar.gz
gnome-icon-theme: clean up icon-naming search
Previous this recipe added an argument to specify where the icon-name-mapping binary is installed, to override a failing pkg-config call (as target pkg-config won't find native .pc files), and munged libexecdir as it likely contains PN. This is all very complicated and we have a native pkg-config binary now, so just use pkg-config-native for that section of configure.ac. (From OE-Core rev: bbd1458444b06dafddad70e117eedfe0c85bfcc6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch49
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch28
-rw-r--r--meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb4
3 files changed, 29 insertions, 52 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
deleted file mode 100644
index f840fca599..0000000000
--- a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Version of the patch of the same name from sato-icon-theme JL - 20/10/10
2"
3pkg-config will only search the target sysroot and we want the native script. This
4patch adds an option to allow the path to the tool to be specified.
5
6RP - 12/8/10"
7
8Upstream-Status: Pending
9
10Index: gnome-icon-theme-2.31.0/configure.ac
11===================================================================
12--- gnome-icon-theme-2.31.0.orig/configure.ac 2010-12-01 11:00:22.000000000 +0800
13+++ gnome-icon-theme-2.31.0/configure.ac 2010-12-01 11:02:16.000000000 +0800
14@@ -38,18 +38,24 @@
15 ICONMAP="true"
16 if test "x$enable_mapping" != "xno"; then
17 UTILS_REQUIRED=0.8.7
18+ PKG_PROG_PKG_CONFIG()
19
20- AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
21- PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
22- have_utils=yes, have_utils=no)
23- if test "x$have_utils" = "xyes"; then
24- UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
25- ICONMAP="$UTILS_PATH/icon-name-mapping"
26- AC_MSG_RESULT([yes])
27- else
28- AC_MSG_RESULT([no])
29- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
30- and install gnome-icon-theme])
31+ AC_ARG_WITH(iconmap,
32+ AC_HELP_STRING([--with-iconmap=<dir>], [The location of the icon-name-mapping script to use]),
33+ ICONMAP=$withval, ICONMAP="")
34+ if test "x$ICONMAP" = "x"; then
35+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
36+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
37+ have_utils=yes, have_utils=no)
38+ if test "x$have_utils" = "xyes"; then
39+ UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
40+ ICONMAP="$UTILS_PATH/icon-name-mapping"
41+
42+ AC_MSG_RESULT([yes])
43+ else
44+ AC_MSG_RESULT([no])
45+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install sato-icon-theme"])
46+ fi
47 fi
48 else
49 ICONMAP="false"
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
new file mode 100644
index 0000000000..6139eaba0f
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
@@ -0,0 +1,28 @@
1icon-naming-utils is a native dependency so we need to use the native pkg-config
2to find it. Simply perform the old switcheroonie on $PKG_CONFIG so
3pkg-config-native is used temporarily.
4
5Upstream-Status: Inappropriate (OE-specific)
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/configure.ac b/configure.ac
9index 6074f2c..3d38e49 100644
10--- a/configure.ac
11+++ b/configure.ac
12@@ -40,6 +40,8 @@ if test "x$enable_mapping" != "xno"; then
13 UTILS_REQUIRED=0.8.7
14
15 AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
16+ save_PKG_CONFIG=$PKG_CONFIG
17+ PKG_CONFIG=pkg-config-native
18 PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
19 have_utils=yes, have_utils=no)
20 if test "x$have_utils" = "xyes"; then
21@@ -51,6 +53,7 @@ if test "x$enable_mapping" != "xno"; then
22 AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
23 and install gnome-icon-theme])
24 fi
25+ PKG_CONFIG=save_PKG_CONFIG
26 else
27 ICONMAP="false"
28 fi
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index df117aee80..a6a3afaa76 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -13,12 +13,10 @@ DEPENDS = "icon-naming-utils-native intltool-native libxml-simple-perl-native"
13inherit allarch autotools perlnative gtk-icon-cache pkgconfig gettext 13inherit allarch autotools perlnative gtk-icon-cache pkgconfig gettext
14 14
15SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \ 15SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \
16 file://iconpath-option.patch" 16 file://pkgconfig-native.patch"
17 17
18SRC_URI[md5sum] = "8e727703343d4c18c73c79dd2009f8ed" 18SRC_URI[md5sum] = "8e727703343d4c18c73c79dd2009f8ed"
19SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982" 19SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982"
20 20
21EXTRA_OECONF = "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('gnome-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
22
23FILES_${PN} += "${datadir}/*" 21FILES_${PN} += "${datadir}/*"
24RRECOMMENDS_${PN} += "librsvg-gtk" 22RRECOMMENDS_${PN} += "librsvg-gtk"