summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-10-14 11:41:51 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2011-10-15 12:55:51 +0200
commita03ebacf68af3d1c95b8b4f4dd473761055c717a (patch)
tree083b8308bfcfc610a1909943d6358df4662e3059
parentb7d2870311fe4f7473aa812f2bd66bd1a72d10fd (diff)
downloadmeta-openembedded-a03ebacf68af3d1c95b8b4f4dd473761055c717a.tar.gz
xfwm4: update to 4.8.2
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Acked-by: Andreas Müller <schnitzeltony@gmx.de>
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch5
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb (renamed from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb)8
2 files changed, 8 insertions, 5 deletions
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
7 7
8Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de> 8Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
9--- 9---
10
11Upstream-Status: accepted
12
13http://git.xfce.org/xfce/xfwm4/commit/?h=xfce-4.8&id=08b6d60056d7ca9884a46d6b92e77c9fc68ce8c5
14
10 doc/manual/Makefile.am | 2 +- 15 doc/manual/Makefile.am | 2 +-
11 1 files changed, 1 insertions(+), 1 deletions(-) 16 1 files changed, 1 insertions(+), 1 deletions(-)
12 17
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb
index e31471d69a..c1ad221d5f 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.1.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb
@@ -3,9 +3,6 @@ SECTION = "x11/wm"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855"
5DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification" 5DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification"
6RDEPENDS_${PN} = "xfwm4-theme-default"
7
8PR = "r0"
9 6
10inherit xfce update-alternatives 7inherit xfce update-alternatives
11 8
@@ -13,6 +10,8 @@ inherit xfce update-alternatives
13SRC_URI += " \ 10SRC_URI += " \
14 file://relative-symlinks-docs.patch \ 11 file://relative-symlinks-docs.patch \
15" 12"
13SRC_URI[md5sum] = "41b730d5abf39a69fc3b221728ddaa75"
14SRC_URI[sha256sum] = "6db2a6148d63d45699dbf6403fb227f8cbd529dcec7ee0827342940c442b0747"
16 15
17EXTRA_OECONF += " --enable-startup-notification" 16EXTRA_OECONF += " --enable-startup-notification"
18 17
@@ -28,10 +27,9 @@ ALTERNATIVE_LINK = "${bindir}/x-window-manager"
28ALTERNATIVE_PATH = "${bindir}/xfce4-session" 27ALTERNATIVE_PATH = "${bindir}/xfce4-session"
29ALTERNATIVE_PRIORITY = "30" 28ALTERNATIVE_PRIORITY = "30"
30 29
30RDEPENDS_${PN} = "xfwm4-theme-default"
31FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ 31FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \
32 ${datadir}/xfwm4/defaults \ 32 ${datadir}/xfwm4/defaults \
33 " 33 "
34FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" 34FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*"
35 35
36SRC_URI[md5sum] = "447433dca613180ebd6cfed4beb1c1c9"
37SRC_URI[sha256sum] = "6a3cbf6c92a0cc3bcaf7cf2565c35beae6354768ec26b4d616a3c2544a8f8499"