From b845545c4a7f45e9f3a7772ed948de2f39fc7934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 18 Sep 2011 03:06:05 +0200 Subject: [PATCH] xfce4-session: Bump to version 4.8.2 relative-symlinks-docs.patch is now mainline [1] [1] http://git.xfce.org/xfce/xfce4-session/commit/?id=00159a379b8b192615137e59b66d5317493f57f3 --- .../xfce4-session/relative-symlinks-docs.patch | 11 ----------- ...{xfce4-session_4.8.1.bb => xfce4-session_4.8.2.bb} | 9 ++------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-session/xfce4-session/relative-symlinks-docs.patch rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.8.1.bb => xfce4-session_4.8.2.bb} (77%) 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 @@ ---- a/doc/manual/Makefile.am 2010-09-08 18:37:19.000000000 +0200 -+++ b/doc/manual/Makefile.am 2011-07-17 23:17:28.602626999 +0200 -@@ -20,7 +20,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 $(DESTDIR)$(docdir)/html/$$lang/images; \ -+ ln -sf ../C/images $(DESTDIR)$(docdir)/html/$$lang/images; \ - fi \ - fi \ - 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 similarity index 77% rename from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.1.bb rename to 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" inherit xfce -# SRC_URI must follow inherited one -SRC_URI += " \ - file://relative-symlinks-docs.patch \ -" - # protect from frightening message that xfce might not work correctly pkg_postinst_${PN} () { echo 127.0.0.1 ${MACHINE} >> /etc/hosts @@ -28,5 +23,5 @@ FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" FILES_${PN}-dev += "${libdir}/xfce4/*/*/*.*a" -SRC_URI[md5sum] = "478080ff666fdd36786a243829663efd" -SRC_URI[sha256sum] = "1df52a77d87ed4d27b4f40a2f03a0b6334422d64bdc4e31b9aac22e25e68b829" +SRC_URI[md5sum] = "48780cbcf784ab64debc9312f17765f2" +SRC_URI[sha256sum] = "31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0"