diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-09-16 17:35:55 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 15:37:22 +0200 |
commit | d7eba2737f6dd8533296acd562e844c51f9460c6 (patch) | |
tree | af31081e213c3e270c03ce257a42e75ee285b563 /meta-gnome | |
parent | d5fd85dfbf3ebb3b0b2137e4333a89109bc4e766 (diff) | |
download | meta-openembedded-d7eba2737f6dd8533296acd562e844c51f9460c6.tar.gz |
evince: Remove pkg-config check for specific icon theme
Also rrecommend adwaita-icon-theme instead of gnome-icon-theme
(as latter is removed from oe-core).
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch | 35 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/evince/evince_2.32.0.bb | 5 |
2 files changed, 38 insertions, 2 deletions
diff --git a/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch b/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch new file mode 100644 index 0000000000..6368a315c0 --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch @@ -0,0 +1,35 @@ +From f4051f27aee7cbe88f206783461784c936d7f5db Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 15 Sep 2015 16:17:50 +0300 +Subject: [PATCH] Remove pkg-config check for gnome-icon-theme + +Theme is not required for building and the icons are provided by +adwaita-icon-theme anyway + +Upstream-Status: Inappropriate [Current versions are fixed] +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d061c2e..7856410 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,13 +175,6 @@ case "$with_platform" in + SHELL_PLATFORM_PKGS="hildon-1 hildon-fm-2 libosso" + ;; + gnome) +- # Evince has a rather soft run-time dependency on hicolor-icon-theme. +- # If the hicolor theme is not available, Evince fails to display some +- # icons. Because we cannot check for it at run-time, we instead +- # would like to require the icon theme at compile-time. But, because +- # the hicolor-icon-theme does not have a pkgconfig file, on gnome we +- # require the gnome icon theme instead. +- SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" + # The totem-screensaver and egg_smclient code use x11 directly. + SHELL_PLATFORM_PKGS="$SHELL_PLATFORM_PKGS x11" + ;; +-- +2.1.4 + diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb index e742edea9f..2d91075b87 100644 --- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb +++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb @@ -2,8 +2,7 @@ SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" SECTION = "x11/office" -DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade" - +DEPENDS = "gnome-doc-utils-native libgnome-keyring tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade" PR = "r5" inherit gnome pkgconfig gtk-icon-cache gsettings @@ -11,6 +10,7 @@ inherit gnome pkgconfig gtk-icon-cache gsettings SRC_URI += " \ file://cross-compile-fix.patch \ file://0001-tiff-fix-compile-warning.patch \ + file://Remove-pkg-config-check-for-gnome-icon-theme.patch \ " SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319" @@ -32,6 +32,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus" RDEPENDS_${PN} += "glib-2.0-utils" +RRECOMMMENDS_${PN} = "adwaita-icon-theme" PACKAGES =+ "${PN}-nautilus-extension" FILES_${PN} += "${datadir}/dbus-1" |