gnome-desktop: Update to 2.32.1

Removed no-desktop-docs.patch, as it is already in upstream.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>

diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index de3f751..fb330a5 100644 (file)
--- a/meta/recipes-gnome/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNOME library for reading .desktop files"
 SECTION = "x11/gnome"
-LICENSE = "GPL"
+LICENSE = "GPLv2 & LGPLv2"
 DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
 
 EXTRA_OECONF = "--disable-scrollkeeper"

diff --git a/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch b/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
deleted file mode 100644 (file)
index c132341..0000000
--- a/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/recipes-gnome/gnome/gnome-desktop_2.26.2.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
deleted file mode 100644 (file)
index f4184a4..0000000
--- a/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require gnome-desktop.inc
-
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"

diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
new file mode 100644 (file)
index 0000000..fa3ffb2
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb
@@ -0,0 +1,4 @@
+require gnome-desktop.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"