summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-08-31 16:24:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:33 +0100
commit30dc71d7567fd8b65604da0e2656219016e607b5 (patch)
tree5959d37ca8fc72449bd32e369d7c9f5c636d8ebb /meta/recipes-gnome
parent89118a364e1205e6cf647da0eb6215b3c02c76ab (diff)
downloadpoky-30dc71d7567fd8b65604da0e2656219016e607b5.tar.gz
gnome-icon-theme: remove the recipe
It is not used by anything in oe-core and will be moved to meta-gnome (From OE-Core rev: 9dde1ce547c8be064ff63ac832f62a08a9b00f10) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.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')
-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.bb22
2 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
deleted file mode 100644
index 6139eaba0f..0000000000
--- a/meta/recipes-gnome/gnome/gnome-icon-theme/pkgconfig-native.patch
+++ /dev/null
@@ -1,28 +0,0 @@
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
deleted file mode 100644
index a6a3afaa76..0000000000
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "GNOME 2 default icon themes"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4SECTION = "x11/gnome"
5
6LICENSE = "LGPLv3+ | CC-BY-SA-3.0"
7LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e"
8
9PR = "r5"
10
11DEPENDS = "icon-naming-utils-native intltool-native libxml-simple-perl-native"
12
13inherit allarch autotools perlnative gtk-icon-cache pkgconfig gettext
14
15SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \
16 file://pkgconfig-native.patch"
17
18SRC_URI[md5sum] = "8e727703343d4c18c73c79dd2009f8ed"
19SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982"
20
21FILES_${PN} += "${datadir}/*"
22RRECOMMENDS_${PN} += "librsvg-gtk"