From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com ([134.134.136.24]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1ShkSH-0003cd-E5 for openembedded-core@lists.openembedded.org; Thu, 21 Jun 2012 18:42:01 +0200 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 21 Jun 2012 09:31:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="160796497" Received: from unknown (HELO [10.255.12.124]) ([10.255.12.124]) by orsmga002.jf.intel.com with ESMTP; 21 Jun 2012 09:31:13 -0700 Message-ID: <4FE34C51.1000502@linux.intel.com> Date: Thu, 21 Jun 2012 09:31:13 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1340276276-11520-1-git-send-email-ross.burton@intel.com> In-Reply-To: <1340276276-11520-1-git-send-email-ross.burton@intel.com> Subject: Re: [PATCH] sato-icon-theme: inherit the GNOME icon theme (Yocto #2594) X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jun 2012 16:42:01 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 06/21/2012 03:57 AM, Ross Burton wrote: > Many apps want to use the full GNOME icon theme and install it, but if our theme > doesn't inherit it the the icons are not available. > Merged into OE-Core In the future, please use the [YOCTO #nnnn] tag in the commit message rather than on the subject. Thanks Sau! > Signed-off-by: Ross Burton > --- > .../0001-Inherit-the-GNOME-icon-theme.patch | 31 ++++++++++++++++++++ > .../sato-icon-theme/sato-icon-theme_0.4.1.bb | 5 ++- > 2 files changed, 34 insertions(+), 2 deletions(-) > create mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch > > diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch > new file mode 100644 > index 0000000..fa595dc > --- /dev/null > +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/0001-Inherit-the-GNOME-icon-theme.patch > @@ -0,0 +1,31 @@ > +From b9f02989310a3c920589f1aa646bcbf16b2572a0 Mon Sep 17 00:00:00 2001 > +From: Ross Burton > +Date: Wed, 13 Jun 2012 11:07:33 +0100 > +Subject: [PATCH] Inherit the GNOME icon theme > + > +If the GNOME icon theme isn't installed this is a no-op, but if it is then > +you'll get fallback from Sato to GNOME for icons that are not in Sato. > + > +As applications that use the full GNOME icon theme depend on gnome-icon-theme, > +this just works. > + > +Upstream-Status: Backport > +--- > + index.theme | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/index.theme b/index.theme > +index c4b03a7..688fbbf 100644 > +--- a/index.theme > ++++ b/index.theme > +@@ -1,6 +1,7 @@ > + [Icon Theme] > + Name=Sato > + Comment=Sato icon theme > ++Inherits=gnome > + > + Directories=16x16/apps,16x16/status,16x16/stock,16x16/places,16x16/mimetypes,16x16/devices,16x16/actions,22x22/apps,22x22/status,22x22/stock,22x22/places,22x22/mimetypes,22x22/devices,22x22/actions,32x32/apps,32x32/status,32x32/stock,32x32/places,32x32/mimetypes,32x32/devices,32x32/actions,48x48/apps,48x48/status,48x48/stock,48x48/places,48x48/mimetypes,48x48/devices,48x48/actions,64x64/apps,64x64/status,64x64/stock,64x64/places,64x64/mimetypes,64x64/devices,64x64/actions, > + > +-- > +1.7.10 > + > diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb > index 652424a..108f8e8 100644 > --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb > +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb > @@ -2,10 +2,11 @@ require sato-icon-theme.inc > > DEPENDS += "icon-naming-utils-native" > > -PR = "r2" > +PR = "r3" > > SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \ > - file://iconpath-option.patch" > + file://iconpath-option.patch \ > + file://0001-Inherit-the-GNOME-icon-theme.patch" > > SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50" > SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"