Skip to contentSkip to conversation

gnome-disk-utility: use PACKAGECONFIG for nautilus extension

PATCH In review Christopher Larson 3 participants 3 messages Jun 7, 2013 – Jun 11, 2013

lore
Share & tools
lore

Christopher Larson

author
#0 lore raw

PATCH 1/1 gnome-disk-utility: use PACKAGECONFIG for nautilus extension

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +4 -1
index a0fd9bd..1bdae34 100644
@@ -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
 }
Signature · 1 line
1.8.3
#1 lore raw
Quoted 12 lines · Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +0 -0
index a0fd9bd..1bdae34 100644

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb DESCRIPTION = "GNOME disk utility" · line 8

Quoted 7 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +1 -1
@@ -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 <[email protected]>
Date:   Fri May 3 12:31:05 2013 +0000

gnome-disk-utility: backport property DeviceAutomountHint

but resolved and now in queue for jenkins

Quoted 17 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +3 -0
@@ -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
 }
Signature · 6 lines
1.8.3

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 34 lines · Martin Jansa
Quoted 5 lines · Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>

---
.../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb |

5 ++++-

Review

Quoted 3 lines
 1 file changed, 4 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

gnome-disk-utility_2.32.0.bbb/meta-gnome/recipes-gnome/gnome-disk-utility/ gnome-disk-utility_2.32.0.bb

Quoted 2 lines

index a0fd9bd..1bdae34 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/

gnome-disk-utility_2.32.0.bb

Quoted 1 line

+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/

gnome-disk-utility_2.32.0.bb

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb DESCRIPTION = "GNOME disk utility" · line 6

Quoted 5 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +0 -1
@@ -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"

Review DESCRIPTION = "GNOME disk utility" · line 6

Quoted 1 line
(quoted diff) +1 -0
+DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui

virtual/libx11 libatasmart"

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb DESCRIPTION = "GNOME disk utility" · line 8

Quoted 2 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +0 -0
 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).

Quoted 8 lines

PR is r4 since:
commit 4791fb851eb96d5785616b1793d4e6367aa52ad9

Author: Andreas M<C3><BC>ller <[email protected]>
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 :)