[PATCH 0/2] avoid nautilus build by default

[PATCH 0/2] avoid nautilus build by default

[Andreas Müller]

There is no reason why we need to build nautilus when using evince and/or
gnome-disk-utility.

Andreas Müller (2):
  evince: make nautilus extension a PACKAGECONFIG and disable by default
  gnome-disk-utility: change PACKAGECONFIG default: remove nautilus

 meta-gnome/recipes-gnome/evince/evince_2.32.0.bb                    | 6 ++++--
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

-- 
1.8.3.1

[PATCH 1/2] evince: make nautilus extension a PACKAGECONFIG and disable by default

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-gnome/recipes-gnome/evince/evince_2.32.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 263765f..5aa485e 100644
--- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
@@ -2,7 +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 nautilus tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
+DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
 
 PR = "r5"
 
@@ -17,7 +17,6 @@ SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319"
 SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"
 
 EXTRA_OECONF = " --enable-thumbnailer \
-                 --enable-nautilus \
                  --disable-scrollkeeper \
                  --enable-pixbuf \
                  --disable-help \
@@ -28,6 +27,9 @@ do_install_append() {
     install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/
 }
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
+
 RDEPENDS_${PN} += "glib-2.0-utils"
 
 PACKAGES =+ "${PN}-nautilus-extension"
-- 
1.8.3.1

[PATCH 2/2] gnome-disk-utility: change PACKAGECONFIG default: remove nautilus

[Andreas Müller]

gnome-doc-utils had to be added when not depending on nautilus

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 6bfbfaf..bf836cc 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 @@ SUMMARY = "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"
+DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart gnome-doc-utils"
 
 PR = "r4"
 
@@ -20,7 +20,7 @@ SRC_URI += "\
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
-PACKAGECONFIG ??= "nautilus"
+PACKAGECONFIG ??= ""
 PACKAGECONFIG[nautilus] = "--enable-nautilus-extension,--disable-nautilus-extension,nautilus"
 
 do_configure_prepend() {
-- 
1.8.3.1

Re: [PATCH 0/2] avoid nautilus build by default

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 882 bytes --]

On Wed, Apr 16, 2014 at 09:32:28AM +0200, Andreas Müller wrote:
> There is no reason why we need to build nautilus when using evince and/or
> gnome-disk-utility.

Both merged, thanks!

> 
> Andreas Müller (2):
>   evince: make nautilus extension a PACKAGECONFIG and disable by default
>   gnome-disk-utility: change PACKAGECONFIG default: remove nautilus
> 
>  meta-gnome/recipes-gnome/evince/evince_2.32.0.bb                    | 6 ++++--
>  .../recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb   | 4 ++--
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> -- 
> 1.8.3.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]