Patchwork [meta-gnome] gnome-disk-utility: use PACKAGECONFIG for nautilus extension

login
register
mail settings
Submitter Christopher Larson
Date June 7, 2013, 11:29 p.m.
Message ID <1370647783-7693-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/51381/
State Accepted, archived
Headers show

Comments

Christopher Larson - June 7, 2013, 11:29 p.m.
From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Martin Jansa - June 11, 2013, 3:33 p.m.
On Fri, Jun 07, 2013 at 04:29:43PM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
> 
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
>  .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb    | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
> index a0fd9bd..1bdae34 100644
> --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
> +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
> @@ -3,7 +3,7 @@ DESCRIPTION = "GNOME disk utility"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
>  
> -DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus"
> +DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart"
>  
>  PR = "r3"

Was this patch created from dylan branch?
patching file
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
Hunk #1 succeeded at 3 with fuzz 2.
Hunk #2 succeeded at 20 (offset 1 line).

PR is r4 since:
commit 4791fb851eb96d5785616b1793d4e6367aa52ad9
Author: Andreas M<C3><BC>ller <schnitzeltony@googlemail.com>
Date:   Fri May 3 12:31:05 2013 +0000

    gnome-disk-utility: backport property DeviceAutomountHint

but resolved and now in queue for jenkins

> @@ -19,6 +19,9 @@ SRC_URI += "\
>  
>  EXTRA_OECONF += "--disable-scrollkeeper"
>  
> +PACKAGECONFIG ??= "nautilus"
> +PACKAGECONFIG[nautilus] = "--enable-nautilus-extension,--disable-nautilus-extension,nautilus"
> +
>  do_configure_prepend() {
>      sed -i -e "s: help : :g" ${S}/Makefile.am
>  }
> -- 
> 1.8.3
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Christopher Larson - June 11, 2013, 3:36 p.m.
On Tue, Jun 11, 2013 at 8:33 AM, Martin Jansa <martin.jansa@gmail.com>wrote:

> On Fri, Jun 07, 2013 at 04:29:43PM -0700, Christopher Larson wrote:
> > From: Christopher Larson <chris_larson@mentor.com>
> >
> > Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> > ---
> >  .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb    |
> 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/
> gnome-disk-utility_2.32.0.bbb/meta-gnome/recipes-gnome/gnome-disk-utility/
> gnome-disk-utility_2.32.0.bb
> > index a0fd9bd..1bdae34 100644
> > --- a/meta-gnome/recipes-gnome/gnome-disk-utility/
> gnome-disk-utility_2.32.0.bb
> > +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/
> gnome-disk-utility_2.32.0.bb
> > @@ -3,7 +3,7 @@ DESCRIPTION = "GNOME disk utility"
> >  LICENSE = "GPLv2+"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
> >
> > -DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui
> virtual/libx11 libatasmart nautilus"
> > +DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui
> virtual/libx11 libatasmart"
> >
> >  PR = "r3"
>
> Was this patch created from dylan branch?
> patching file
> meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
> Hunk #1 succeeded at 3 with fuzz 2.
> Hunk #2 succeeded at 20 (offset 1 line).
>
> PR is r4 since:
> commit 4791fb851eb96d5785616b1793d4e6367aa52ad9
> Author: Andreas M<C3><BC>ller <schnitzeltony@googlemail.com>
> Date:   Fri May 3 12:31:05 2013 +0000
>
>     gnome-disk-utility: backport property DeviceAutomountHint
>
> but resolved and now in queue for jenkins


Hmm, I didn't think so, but perhaps my juggling of 4+ topic branches failed
somewhere :)

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
index a0fd9bd..1bdae34 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
@@ -3,7 +3,7 @@  DESCRIPTION = "GNOME disk utility"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
 
-DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart nautilus"
+DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart"
 
 PR = "r3"
 
@@ -19,6 +19,9 @@  SRC_URI += "\
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
+PACKAGECONFIG ??= "nautilus"
+PACKAGECONFIG[nautilus] = "--enable-nautilus-extension,--disable-nautilus-extension,nautilus"
+
 do_configure_prepend() {
     sed -i -e "s: help : :g" ${S}/Makefile.am
 }