xfce-utils: update to 4.8.3

* relative-symlinks-docs.patch was applied mainline [1]
* run tested on overo

[1] http://git.xfce.org/xfce/xfce-utils/commit/?id=6d76b3625dd5ad2206a9c17575e22d99d43c8ecc

(From meta-openembedded rev: eabd5d988e56a50edd591f5b2e598cc57df9dda6)

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch
deleted file mode 100644 (file)
index d0d80fe..0000000
--- a/meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/manual/Makefile.am   2011-06-18 08:05:25.000000000 +0200
-+++ b/doc/manual/Makefile.am   2011-07-13 21:45:17.079143002 +0200
-@@ -21,7 +21,7 @@
-                       done; \
-                       if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
-                               echo "--- Creating symlink to C images for $$lang"; \
--                              ln -sf $(docdir)/html/C/images $$dest/images; \
-+                              ln -sf ../C/images $$dest/images; \
-                       fi \
-               fi \
-       done;

diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb
similarity index 66%
rename from meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb
index 34d87d2..e4b8686 100644 (file)
--- a/meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb
+++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb
@@ -4,15 +4,8 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
 DEPENDS = "gtk+ virtual/libx11 dbus libxfce4util libxfce4ui"
 
-PR = "r1"
-
 inherit xfce
 
-# SRC_URI must follow inherited one
-SRC_URI += " \
-    file://relative-symlinks-docs.patch \
-"
-
 # usually we do not migrate (requires perl on target)
 EXTRA_OECONF += "--disable-xfconf-migration"
 
@@ -23,5 +16,5 @@ FILES_${PN} += " \
 "
 RDEPENDS_${PN} = "xrdb openssh-misc"
 
-SRC_URI[md5sum] = "7f48198f4bee3edf7869064c2922c609"
-SRC_URI[sha256sum] = "a12b708b0cd19ffa07afb2ab2cd1bf9377ff7fbbfbe16d7493a5bb973bcb0aa5"
+SRC_URI[md5sum] = "03b5fba5f63f4f1a31cc7d3728f3c87e"
+SRC_URI[sha256sum] = "035070d7e608b29dbaeeb6ec541d8c2edbd28152d3ef111316c33871ab02b926"