From eabd5d988e56a50edd591f5b2e598cc57df9dda6 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 24 Oct 2011 20:05:58 +0000 Subject: xfce-utils: update to 4.8.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * relative-symlinks-docs.patch was applied mainline [1] * run tested on overo [1] http://git.xfce.org/xfce/xfce-utils/commit/?id=6d76b3625dd5ad2206a9c17575e22d99d43c8ecc Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- .../xfce-utils/relative-symlinks-docs.patch | 11 --------- .../recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb | 27 ---------------------- .../recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb | 20 ++++++++++++++++ 3 files changed, 20 insertions(+), 38 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce-utils/xfce-utils/relative-symlinks-docs.patch delete mode 100644 meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb create mode 100644 meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb 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 d0d80fed8f..0000000000 --- a/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-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb deleted file mode 100644 index 34d87d2820..0000000000 --- a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Xfce4 Utilities" -SECTION = "x11" -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" - -FILES_${PN} += " \ - ${libdir}/xfce4/xfconf-migration \ - ${datadir}/dbus-1/* \ - ${datadir}/xsessions/xfce.desktop \ -" -RDEPENDS_${PN} = "xrdb openssh-misc" - -SRC_URI[md5sum] = "7f48198f4bee3edf7869064c2922c609" -SRC_URI[sha256sum] = "a12b708b0cd19ffa07afb2ab2cd1bf9377ff7fbbfbe16d7493a5bb973bcb0aa5" diff --git a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb new file mode 100644 index 0000000000..e4b8686252 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb @@ -0,0 +1,20 @@ +DESCRIPTION="Xfce4 Utilities" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +DEPENDS = "gtk+ virtual/libx11 dbus libxfce4util libxfce4ui" + +inherit xfce + +# usually we do not migrate (requires perl on target) +EXTRA_OECONF += "--disable-xfconf-migration" + +FILES_${PN} += " \ + ${libdir}/xfce4/xfconf-migration \ + ${datadir}/dbus-1/* \ + ${datadir}/xsessions/xfce.desktop \ +" +RDEPENDS_${PN} = "xrdb openssh-misc" + +SRC_URI[md5sum] = "03b5fba5f63f4f1a31cc7d3728f3c87e" +SRC_URI[sha256sum] = "035070d7e608b29dbaeeb6ec541d8c2edbd28152d3ef111316c33871ab02b926" -- cgit v1.2.3-54-g00ecf