summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch11
-rw-r--r--meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb (renamed from meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb)11
2 files changed, 2 insertions, 20 deletions
diff --git a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch
deleted file mode 100644
index d0d80fed8..000000000
--- a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- a/doc/manual/Makefile.am 2011-06-18 08:05:25.000000000 +0200
2+++ b/doc/manual/Makefile.am 2011-07-13 21:45:17.079143002 +0200
3@@ -21,7 +21,7 @@
4 done; \
5 if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
6 echo "--- Creating symlink to C images for $$lang"; \
7- ln -sf $(docdir)/html/C/images $$dest/images; \
8+ ln -sf ../C/images $$dest/images; \
9 fi \
10 fi \
11 done;
diff --git a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb
index 34d87d282..e4b868625 100644
--- a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb
+++ b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb
@@ -4,15 +4,8 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" 4LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
5DEPENDS = "gtk+ virtual/libx11 dbus libxfce4util libxfce4ui" 5DEPENDS = "gtk+ virtual/libx11 dbus libxfce4util libxfce4ui"
6 6
7PR = "r1"
8
9inherit xfce 7inherit xfce
10 8
11# SRC_URI must follow inherited one
12SRC_URI += " \
13 file://relative-symlinks-docs.patch \
14"
15
16# usually we do not migrate (requires perl on target) 9# usually we do not migrate (requires perl on target)
17EXTRA_OECONF += "--disable-xfconf-migration" 10EXTRA_OECONF += "--disable-xfconf-migration"
18 11
@@ -23,5 +16,5 @@ FILES_${PN} += " \
23" 16"
24RDEPENDS_${PN} = "xrdb openssh-misc" 17RDEPENDS_${PN} = "xrdb openssh-misc"
25 18
26SRC_URI[md5sum] = "7f48198f4bee3edf7869064c2922c609" 19SRC_URI[md5sum] = "03b5fba5f63f4f1a31cc7d3728f3c87e"
27SRC_URI[sha256sum] = "a12b708b0cd19ffa07afb2ab2cd1bf9377ff7fbbfbe16d7493a5bb973bcb0aa5" 20SRC_URI[sha256sum] = "035070d7e608b29dbaeeb6ec541d8c2edbd28152d3ef111316c33871ab02b926"