diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-05-19 01:40:31 +0200 |
|---|---|---|
| committer | Andreas Müller <schnitzeltony@googlemail.com> | 2012-09-18 15:54:01 +0200 |
| commit | 1b34cf3d932e843b85a1e43e9f38fd306f3748e0 (patch) | |
| tree | 56180910593348c0fa45862bc057da6450b0a369 | |
| parent | f7170dc6c40f8b109014876014be1addbef2abf2 (diff) | |
| download | meta-openembedded-1b34cf3d932e843b85a1e43e9f38fd306f3748e0.tar.gz | |
xfdesktop update to 4.10.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
3 files changed, 12 insertions, 50 deletions
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch deleted file mode 100644 index 751d7a6381..0000000000 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 5039e7834fff94f8393963ea8dbad81fa95ef810 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de> | ||
| 3 | Date: Fri, 16 Sep 2011 21:09:05 +0200 | ||
| 4 | Subject: [PATCH] docs: On installation create relative paths in symlinks to | ||
| 5 | images | ||
| 6 | MIME-Version: 1.0 | ||
| 7 | Content-Type: text/plain; charset=UTF-8 | ||
| 8 | Content-Transfer-Encoding: 8bit | ||
| 9 | |||
| 10 | |||
| 11 | Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> | ||
| 12 | --- | ||
| 13 | doc/manual/Makefile.am | 2 +- | ||
| 14 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am | ||
| 17 | index 646821d..cbf79e1 100644 | ||
| 18 | --- a/doc/manual/Makefile.am | ||
| 19 | +++ b/doc/manual/Makefile.am | ||
| 20 | @@ -20,7 +20,7 @@ install-data-local: | ||
| 21 | done; \ | ||
| 22 | if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \ | ||
| 23 | echo "--- Creating symlink to C images for $$lang"; \ | ||
| 24 | - ln -sf $(docdir)/html/C/images $(DESTDIR)$(docdir)/html/$$lang/images; \ | ||
| 25 | + ln -sf ../C/images $(DESTDIR)$(docdir)/html/$$lang/images; \ | ||
| 26 | fi \ | ||
| 27 | fi \ | ||
| 28 | done; | ||
| 29 | -- | ||
| 30 | 1.7.4.4 | ||
| 31 | |||
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb new file mode 100644 index 0000000000..c9cd92427d --- /dev/null +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | DESCRIPTION = "Xfce4 Desktop Manager" | ||
| 2 | SECTION = "x11/base" | ||
| 3 | LICENSE = "GPLv2" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
| 5 | DEPENDS = "glib-2.0 gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo" | ||
| 6 | |||
| 7 | inherit xfce | ||
| 8 | |||
| 9 | SRC_URI[md5sum] = "d5f6fb9fdde3ddff5804b2a251892936" | ||
| 10 | SRC_URI[sha256sum] = "897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b" | ||
| 11 | |||
| 12 | FILES_${PN} += "${datadir}/backgrounds" | ||
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb deleted file mode 100644 index 2866280f63..0000000000 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | DESCRIPTION = "Xfce4 Desktop Manager" | ||
| 2 | SECTION = "x11/base" | ||
| 3 | LICENSE = "GPLv2" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
| 5 | DEPENDS = "gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo" | ||
| 6 | |||
| 7 | PR = "r0" | ||
| 8 | |||
| 9 | inherit xfce | ||
| 10 | |||
| 11 | # SRC_URI must follow inherited one | ||
| 12 | SRC_URI += " \ | ||
| 13 | file://relative-symlinks-docs.patch \ | ||
| 14 | " | ||
| 15 | |||
| 16 | FILES_${PN} += "${datadir}/xfce4/backdrops" | ||
| 17 | |||
| 18 | SRC_URI[md5sum] = "617c667c469698e8c974e38412cb484c" | ||
| 19 | SRC_URI[sha256sum] = "e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424" | ||
