diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2010-12-01 08:42:45 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-06 22:02:25 +0000 |
| commit | b8b13dcbb76fdc3c9a2866bb35945dcf949c4b20 (patch) | |
| tree | d03275cf5a3c74eac4b64f4f8583c2e03c418ae9 /meta/recipes-gnome | |
| parent | b651203e7f7fced740b680f53fb3d5cc636cdd0b (diff) | |
| download | poky-b8b13dcbb76fdc3c9a2866bb35945dcf949c4b20.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-gnome')
4 files changed, 5 insertions, 14 deletions
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 @@ | |||
| 1 | DESCRIPTION = "GNOME library for reading .desktop files" | 1 | DESCRIPTION = "GNOME library for reading .desktop files" |
| 2 | SECTION = "x11/gnome" | 2 | SECTION = "x11/gnome" |
| 3 | LICENSE = "GPL" | 3 | LICENSE = "GPLv2 & LGPLv2" |
| 4 | DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" | 4 | DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" |
| 5 | 5 | ||
| 6 | EXTRA_OECONF = "--disable-scrollkeeper" | 6 | 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 @@ | |||
| 1 | --- Makefile.am~ 2007-05-22 16:50:35.000000000 +0200 | ||
| 2 | +++ Makefile.am 2007-05-22 16:50:35.000000000 +0200 | ||
| 3 | @@ -3,7 +3,6 @@ | ||
| 4 | libgnome-desktop \ | ||
| 5 | gnome-about \ | ||
| 6 | pixmaps \ | ||
| 7 | - desktop-docs \ | ||
| 8 | docs \ | ||
| 9 | man | ||
| 10 | |||
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 @@ | |||
| 1 | require gnome-desktop.inc | ||
| 2 | |||
| 3 | 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 @@ | |||
| 1 | require gnome-desktop.inc | ||
| 2 | |||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
| 4 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||