gnome-desktop: 2.26.0 -> 2.26.2

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta-gnome/packages/gnome/gnome-desktop.inc b/meta-gnome/packages/gnome/gnome-desktop.inc
index aeabf4f41e75da8144dc2213c2adca720293d3ad..be00145a13b1e8389de36c3be8dd9c274660002d 100644 (file)
--- a/meta-gnome/packages/gnome/gnome-desktop.inc
+++ b/meta-gnome/packages/gnome/gnome-desktop.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME library for reading .desktop files"
 SECTION = "x11/gnome"
 LICENSE = "GPL"
-DEPENDS = "gnome-common libgnomeui"
+DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
@@ -14,3 +14,5 @@ do_stage () {
 }
 
 FILES_${PN} += "${datadir}/gnome-about"
+
+inherit gnome pkgconfig
\ No newline at end of file

diff --git a/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch b/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch
new file mode 100644 (file)
index 0000000..c132341
--- /dev/null
+++ b/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch
@@ -0,0 +1,10 @@
+--- Makefile.am~       2007-05-22 16:50:35.000000000 +0200
++++ Makefile.am        2007-05-22 16:50:35.000000000 +0200
+@@ -3,7 +3,6 @@
+       libgnome-desktop        \
+       gnome-about             \
+       pixmaps                 \
+-      desktop-docs            \
+       docs                    \
+       man
+ 

diff --git a/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb b/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb
deleted file mode 100644 (file)
index 52c0e6d..0000000
--- a/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require gnome-desktop.inc
-
-inherit gnome pkgconfig
-
-DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
-
-SRC_URI += " \
-            file://no-desktop-docs.patch;patch=1;pnum=0"

diff --git a/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb b/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb
new file mode 100644 (file)
index 0000000..f4184a4
--- /dev/null
+++ b/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb
@@ -0,0 +1,3 @@
+require gnome-desktop.inc
+
+SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"