From a03ebacf68af3d1c95b8b4f4dd473761055c717a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Oct 2011 11:41:51 +0200 Subject: xfwm4: update to 4.8.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Koen Kooi Acked-by: Andreas Müller --- .../xfwm4/xfwm4/relative-symlinks-docs.patch | 5 +++ meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb | 37 ---------------------- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb | 35 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb create mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb (limited to 'meta-xfce') diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch b/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch index 4e855e4f0f..67433ee209 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch @@ -7,6 +7,11 @@ Subject: [PATCH] docs: On installation create relative paths in symlinks to Signed-off-by: Andreas Mueller --- + +Upstream-Status: accepted + +http://git.xfce.org/xfce/xfwm4/commit/?h=xfce-4.8&id=08b6d60056d7ca9884a46d6b92e77c9fc68ce8c5 + doc/manual/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb deleted file mode 100644 index e31471d69a..0000000000 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION="Xfce4 Window Manager" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification" -RDEPENDS_${PN} = "xfwm4-theme-default" - -PR = "r0" - -inherit xfce update-alternatives - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://relative-symlinks-docs.patch \ -" - -EXTRA_OECONF += " --enable-startup-notification" - -python populate_packages_prepend () { - themedir = bb.data.expand('${datadir}/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES_DYNAMIC += "xfwm4-theme-*" - -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/xfce4-session" -ALTERNATIVE_PRIORITY = "30" - -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ - ${datadir}/xfwm4/defaults \ - " -FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" - -SRC_URI[md5sum] = "447433dca613180ebd6cfed4beb1c1c9" -SRC_URI[sha256sum] = "6a3cbf6c92a0cc3bcaf7cf2565c35beae6354768ec26b4d616a3c2544a8f8499" diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb new file mode 100644 index 0000000000..c1ad221d5f --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb @@ -0,0 +1,35 @@ +DESCRIPTION="Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification" + +inherit xfce update-alternatives + +# SRC_URI must follow inherited one +SRC_URI += " \ + file://relative-symlinks-docs.patch \ +" +SRC_URI[md5sum] = "41b730d5abf39a69fc3b221728ddaa75" +SRC_URI[sha256sum] = "6db2a6148d63d45699dbf6403fb227f8cbd529dcec7ee0827342940c442b0747" + +EXTRA_OECONF += " --enable-startup-notification" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "xfwm4-theme-*" + +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ + " +FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" + -- cgit v1.2.3-54-g00ecf