summaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmx.de>2011-12-26 02:01:58 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-01-05 10:14:23 +0100
commit15c2388f33d3297ff33314023d1b01a50e7dcc97 (patch)
tree123e9956a29bf076fa12fc78be2f09f96d07e2e4 /meta-xfce
parentd787186059ad47787089e7ee6940175173f351fa (diff)
downloadmeta-openembedded-15c2388f33d3297ff33314023d1b01a50e7dcc97.tar.gz
xfwm4: update to 4.8.1
* build tested incremental & from empty build dir * run tested on overo Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch33
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb (renamed from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb)8
2 files changed, 2 insertions, 39 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
deleted file mode 100644
index 67433ee20..000000000
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4/relative-symlinks-docs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 09d0d36450e25554785bf7f730e4ba0e31982be6 Mon Sep 17 00:00:00 2001
2From: Andreas Mueller <schnitzeltony@gmx.de>
3Date: Thu, 21 Jul 2011 19:52:28 +0200
4Subject: [PATCH] docs: On installation create relative paths in symlinks to
5 images
6
7
8Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
9---
10
11Upstream-Status: accepted
12
13http://git.xfce.org/xfce/xfwm4/commit/?h=xfce-4.8&id=08b6d60056d7ca9884a46d6b92e77c9fc68ce8c5
14
15 doc/manual/Makefile.am | 2 +-
16 1 files changed, 1 insertions(+), 1 deletions(-)
17
18diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
19index b21962f..88e234b 100644
20--- a/doc/manual/Makefile.am
21+++ b/doc/manual/Makefile.am
22@@ -20,7 +20,7 @@ install-data-local:
23 done; \
24 if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
25 echo "--- Creating symlink to C images for $$lang"; \
26- ln -sf $(docdir)/html/C/images $(DESTDIR)$(docdir)/html/$$lang/images; \
27+ ln -sf ../C/images $(DESTDIR)$(docdir)/html/$$lang/images; \
28 fi \
29 fi \
30 done;
31--
321.7.4.4
33
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb
index c1ad221d5..e2dc4abf9 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.2.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb
@@ -6,12 +6,8 @@ DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbu
6 6
7inherit xfce update-alternatives 7inherit xfce update-alternatives
8 8
9# SRC_URI must follow inherited one 9SRC_URI[md5sum] = "66cb65797cea8a62563f69b833c7888b"
10SRC_URI += " \ 10SRC_URI[sha256sum] = "0b0e8bea0b257958ad416ab5678cf0cdd7e909943d4d5ab32afc35295a78227e"
11 file://relative-symlinks-docs.patch \
12"
13SRC_URI[md5sum] = "41b730d5abf39a69fc3b221728ddaa75"
14SRC_URI[sha256sum] = "6db2a6148d63d45699dbf6403fb227f8cbd529dcec7ee0827342940c442b0747"
15 11
16EXTRA_OECONF += " --enable-startup-notification" 12EXTRA_OECONF += " --enable-startup-notification"
17 13