diff options
4 files changed, 16 insertions, 9 deletions
diff --git a/meta-gnome/packages/gnome/gnome-desktop.inc b/meta-gnome/packages/gnome/gnome-desktop.inc index aeabf4f41e..be00145a13 100644 --- a/meta-gnome/packages/gnome/gnome-desktop.inc +++ b/meta-gnome/packages/gnome/gnome-desktop.inc | |||
| @@ -1,7 +1,7 @@ | |||
| 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 = "GPL" |
| 4 | DEPENDS = "gnome-common libgnomeui" | 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" |
| 7 | 7 | ||
| @@ -14,3 +14,5 @@ do_stage () { | |||
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | FILES_${PN} += "${datadir}/gnome-about" | 16 | FILES_${PN} += "${datadir}/gnome-about" |
| 17 | |||
| 18 | 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 index 0000000000..c132341728 --- /dev/null +++ b/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch | |||
| @@ -0,0 +1,10 @@ | |||
| 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-gnome/packages/gnome/gnome-desktop_2.26.0.bb b/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb deleted file mode 100644 index 52c0e6d3e6..0000000000 --- a/meta-gnome/packages/gnome/gnome-desktop_2.26.0.bb +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | require gnome-desktop.inc | ||
| 2 | |||
| 3 | inherit gnome pkgconfig | ||
| 4 | |||
| 5 | DEPENDS += "gnome-doc-utils gnome-vfs libxrandr" | ||
| 6 | |||
| 7 | SRC_URI += " \ | ||
| 8 | 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 index 0000000000..f4184a4d65 --- /dev/null +++ b/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | require gnome-desktop.inc | ||
| 2 | |||
| 3 | SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0" | ||
