From 00ba7da845b96a15b42550d15a343f7bc36392f8 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 11 Feb 2017 17:40:01 +0100
Subject: recipes: blacklist recipes depending on blacklisted recipes

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb                       | 4 ++++
 meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb                     | 2 ++
 meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb                   | 2 ++
 meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb                 | 3 +++
 meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb                        | 2 ++
 .../gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb             | 4 ++++
 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb                | 2 ++
 meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb                  | 2 ++
 meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb                      | 2 ++
 meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb                  | 2 ++
 meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb                | 2 ++
 meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb                      | 2 ++
 meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb                  | 2 ++
 meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb                     | 2 ++
 meta-gnome/recipes-gnome/pimlico/contacts_git.bb                      | 2 --
 meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb                | 2 ++
 meta-gnome/recipes-support/florence/florence_0.5.4.bb                 | 2 ++
 17 files changed, 37 insertions(+), 2 deletions(-)

(limited to 'meta-gnome')

diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
index 6e0e0aab07..682c6fa26f 100644
--- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
+++ b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb
@@ -20,3 +20,7 @@ EXTRA_OECONF += "--disable-scrollkeeper"
 do_configure_prepend() {
     sed -i -e "s: help : :g" ${S}/Makefile.am
 }
+
+PNBLACKLIST[cheese] ?= "Depends on blacklisted gstreamer"
+
+PNBLACKLIST[cheese] ?= "Depends on blacklisted gnome-desktop"
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
index b08b994152..d02114781a 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
@@ -125,3 +125,5 @@ python populate_packages_prepend () {
 }
 
 FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt"
+
+PNBLACKLIST[abiword] ?= "Depends on blacklisted gtkmathview"
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb
index 8e00eb4d2d..a9014e237f 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb
@@ -7,3 +7,5 @@ SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \
 SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b"
 SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b"
 GNOME_COMPRESS_TYPE="bz2"
+
+PNBLACKLIST[libbonobo] ?= "Depends on blacklisted orbit2"
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
index 627f37ed93..3da60025ef 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
+++ b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
@@ -19,3 +19,6 @@ FILES_${PN}-dev += "${libdir}/libglade/2.0/*.la ${datadir}/gnome-2.0/ui \
 FILES_${PN}-staticdev += "${libdir}/libglade/2.0/*.a"
 FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \
                     ${libdir}/libglade/2.0/.debug"
+
+PNBLACKLIST[libbonoboui] ?= "Depends on blacklisted libgnome"
+PNBLACKLIST[libbonoboui] ?= "Depends on blacklisted libbonobo"
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
index 03d7fa4e58..8151e2fb0f 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
@@ -24,3 +24,5 @@ LDFLAGS += "-lgmodule-2.0 -lICE"
 
 FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
 FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
+
+PNBLACKLIST[gedit] ?= "Depends on blacklisted gtksourceview2"
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
index 393eb256e9..8a7425af89 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
@@ -40,3 +40,7 @@ FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
 FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la"
 FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a"
 
+
+PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted libgnomekbd"
+
+PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted gnome-desktop"
diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 3ec646697f..edf5bfc05c 100644
--- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -56,3 +56,5 @@ python populate_packages_prepend () {
     plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/')
     do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
 }
+
+PNBLACKLIST[gnome-vfs] ?= "Depends on blacklisted gnome-mime-data"
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
index 6bb6816cb7..53cdf69f78 100644
--- a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
@@ -21,3 +21,5 @@ SRC_URI += "\
 SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b"
 SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29"
 GNOME_COMPRESS_TYPE="bz2"
+
+PNBLACKLIST[libgnomecups] ?= "Depends on blacklisted libgnomeui"
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
index 13c027cc8f..94a14c818f 100644
--- a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
+++ b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
@@ -31,3 +31,5 @@ FILES_${PN} += "${libdir}/${BPN}/extensions/*.so \
 FILES_${PN}-dev += "${libdir}/${BPN}/extensions/*.la"
 FILES_${PN}-dbg += "${libdir}/${BPN}/extensions/.debug/"
 
+
+PNBLACKLIST[gthumb] ?= "Depends on blacklisted gstreamer"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
index 0055ba4a3a..9d25b9b447 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
@@ -34,3 +34,5 @@ FILES_gnome-common-schemas = "${datadir}/gnome-background-properties ${datadir}/
 RDEPENDS_${PN} = "gnome-common-schemas"
 
 FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug"
+
+PNBLACKLIST[libgnome] ?= "Depends on blacklisted gnome-vfs"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
index 45219d4d77..4bc11fd241 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
@@ -29,3 +29,5 @@ do_configure_prepend() {
 }
 
 LDFLAGS += "-lm"
+
+PNBLACKLIST[libgnomeui] ?= "Depends on blacklisted libgnome"
diff --git a/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb b/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb
index 86dfcf2f09..6a3ac559fe 100644
--- a/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb
+++ b/meta-gnome/recipes-gnome/libidl/libidl_0.8.14.bb
@@ -11,3 +11,5 @@ inherit autotools pkgconfig binconfig
 
 SRC_URI[md5sum] = "bb8e10a218fac793a52d404d14adedcb"
 SRC_URI[sha256sum] = "c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220"
+
+PNBLACKLIST[libidl] ?= "Depends on blacklisted libidl-native"
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
index d29385eb8a..9a57d2c054 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb
@@ -39,3 +39,5 @@ FILES_${PN} += "${datadir}/icons"
 # Don't make nautils3 drag us in
 PRIVATE_LIBS = "libnautilus-extension.so.1"
 
+
+PNBLACKLIST[nautilus] ?= "Depends on blacklisted gnome-desktop"
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
index f9af2ee644..414bcf15b8 100644
--- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
@@ -39,3 +39,5 @@ inherit autotools pkgconfig gtk-doc
 
 EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 EXTRA_OEMAKE_class-native = " "
+
+PNBLACKLIST[orbit2] ?= "Depends on blacklisted libidl-native"
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb
index 8a4a071664..af7a10ba09 100644
--- a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb
+++ b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb
@@ -15,5 +15,3 @@ SRC_URI =+ "git://git.gnome.org/${BPN} \
         file://make-382.patch"
 
 S = "${WORKDIR}/git"
-
-
diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
index 8c39ad7759..89b63e9c5a 100644
--- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb
@@ -31,3 +31,5 @@ SRC_URI += "file://iconpath-option.patch \
 SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1"
 SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a"
 GNOME_COMPRESS_TYPE="bz2"
+
+PNBLACKLIST[gnome-themes] ?= "Depends on blacklisted gtk-engines"
diff --git a/meta-gnome/recipes-support/florence/florence_0.5.4.bb b/meta-gnome/recipes-support/florence/florence_0.5.4.bb
index dfdb6bdb8c..d7e5b09594 100644
--- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
+++ b/meta-gnome/recipes-support/florence/florence_0.5.4.bb
@@ -18,3 +18,5 @@ SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe5
 inherit gettext autotools gconf pkgconfig
 
 EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
+
+PNBLACKLIST[florence] ?= "Depends on blacklisted gstreamer"
-- 
cgit 1.2.3-korg