From b8b13dcbb76fdc3c9a2866bb35945dcf949c4b20 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Wed, 1 Dec 2010 08:42:45 +0800 Subject: gnome-desktop: Update to 2.32.1 Removed no-desktop-docs.patch, as it is already in upstream. Signed-off-by: Zhai Edwin --- meta/recipes-gnome/gnome/gnome-desktop.inc | 2 +- meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch | 10 ---------- meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb | 3 --- meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb | 4 ++++ 4 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch delete mode 100644 meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb create mode 100644 meta/recipes-gnome/gnome/gnome-desktop_2.32.1.bb diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc index de3f751efa..fb330a5156 100644 --- 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 index c132341728..0000000000 --- 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 index f4184a4d65..0000000000 --- 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 index 0000000000..fa3ffb2065 --- /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" -- cgit v1.2.3-54-g00ecf