summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb2
-rw-r--r--meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb2
-rw-r--r--meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb2
-rw-r--r--meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb2
6 files changed, 6 insertions, 6 deletions
diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
index c5ac6e23fb..ef460f13df 100644
--- a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
+++ b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
@@ -5,7 +5,7 @@ SECTION = "multimedia"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7 7
8PNBLACKLIST[gnome-mplayer] = "rdepends on blacklisted mplayer" 8PNBLACKLIST[gnome-mplayer] ?= "rdepends on blacklisted mplayer"
9PR = "r2" 9PR = "r2"
10 10
11DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver" 11DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver"
diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
index 1a70ac0cf2..e9a837bb95 100644
--- a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
+++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
7 7
8DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt" 8DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt"
9 9
10PNBLACKLIST[gcr] = "CONFLICT: 4 files conflict with gnome-keyring" 10PNBLACKLIST[gcr] ?= "CONFLICT: 4 files conflict with gnome-keyring"
11# e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml 11# e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
12# sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert 12# sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert
13 13
diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
index 38ea5e51a3..611499affc 100644
--- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
5 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" 5 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
6 6
7PNBLACKLIST[gnome-menus3] = "CONFLICT: 24 files are conflicting with gnome-menus" 7PNBLACKLIST[gnome-menus3] ?= "CONFLICT: 24 files are conflicting with gnome-menus"
8# e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory 8# e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory
9 9
10DEPENDS = "python libxml2 gconf popt gtk+3" 10DEPENDS = "python libxml2 gconf popt gtk+3"
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
index f89f3da9c9..972a4d4db0 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
4BPN = "gnome-panel" 4BPN = "gnome-panel"
5PR = "r1" 5PR = "r1"
6 6
7PNBLACKLIST[gnome-panel3] = "CONFLICT: depends on libgweather3 which conflicts with libgweather" 7PNBLACKLIST[gnome-panel3] ?= "CONFLICT: depends on libgweather3 which conflicts with libgweather"
8 8
9# conflicts with gnome-panel, because they provide the same package 9# conflicts with gnome-panel, because they provide the same package
10# http://patches.openembedded.org/patch/43105/ 10# http://patches.openembedded.org/patch/43105/
diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
index 69cdd8f512..6e1997f775 100644
--- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
4SECTION = "x11/gnome/libs" 4SECTION = "x11/gnome/libs"
5DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3" 5DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3"
6 6
7PNBLACKLIST[libgweather3] = "CONFLICT: 876 files are conflicting with libgweather" 7PNBLACKLIST[libgweather3] ?= "CONFLICT: 876 files are conflicting with libgweather"
8# e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd 8# e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd
9# sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml 9# sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml
10 10
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
index 3ea179e7c7..4e01c5c938 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 4
5PR = "r2" 5PR = "r2"
6 6
7PNBLACKLIST[zenity] = "BROKEN: doesn't build with B!=S" 7PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S"
8 8
9DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" 9DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils"
10 10