summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session/relative-symlinks-docs.patch11
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.2.bb (renamed from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.1.bb)9
2 files changed, 2 insertions, 18 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/relative-symlinks-docs.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/relative-symlinks-docs.patch
deleted file mode 100644
index fb78c57e54..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/relative-symlinks-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- a/doc/manual/Makefile.am 2010-09-08 18:37:19.000000000 +0200
2+++ b/doc/manual/Makefile.am 2011-07-17 23:17:28.602626999 +0200
3@@ -20,7 +20,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 $(DESTDIR)$(docdir)/html/$$lang/images; \
8+ ln -sf ../C/images $(DESTDIR)$(docdir)/html/$$lang/images; \
9 fi \
10 fi \
11 done;
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.1.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.2.bb
index bedd35fd07..65b1add8da 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.2.bb
@@ -9,11 +9,6 @@ PR = "r0"
9 9
10inherit xfce 10inherit xfce
11 11
12# SRC_URI must follow inherited one
13SRC_URI += " \
14 file://relative-symlinks-docs.patch \
15"
16
17# protect from frightening message that xfce might not work correctly 12# protect from frightening message that xfce might not work correctly
18pkg_postinst_${PN} () { 13pkg_postinst_${PN} () {
19 echo 127.0.0.1 ${MACHINE} >> /etc/hosts 14 echo 127.0.0.1 ${MACHINE} >> /etc/hosts
@@ -28,5 +23,5 @@ FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug"
28 23
29FILES_${PN}-dev += "${libdir}/xfce4/*/*/*.*a" 24FILES_${PN}-dev += "${libdir}/xfce4/*/*/*.*a"
30 25
31SRC_URI[md5sum] = "478080ff666fdd36786a243829663efd" 26SRC_URI[md5sum] = "48780cbcf784ab64debc9312f17765f2"
32SRC_URI[sha256sum] = "1df52a77d87ed4d27b4f40a2f03a0b6334422d64bdc4e31b9aac22e25e68b829" 27SRC_URI[sha256sum] = "31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0"