Fixes install error in xfwm4-themes_4.6.0

File 'maximize-inactive.xpm' was listed twice in Makefile.am

Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
Signed-off-by: Koen Kooi <koen@openembedded.org>
Conflicts:

	recipes/xfce-base/xfwm4-themes_4.6.0.bb

diff --git a/recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch b/recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch
new file mode 100644 (file)
index 0000000..14dbe4d
--- /dev/null
+++ b/recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch
@@ -0,0 +1,10 @@
+--- xfwm4-themes-4.6.0/themes/redmond/Makefile.am      2009-02-26 00:54:06.000000000 +0100
++++ xfwm4-themes-4.6.0/themes/redmond/Makefile.am~     2010-06-14 11:10:00.000000000 +0200
+@@ -16,7 +16,6 @@
+       left-inactive.xpm \
+       maximize-active.xpm \
+       maximize-toggled-active.xpm \
+-      maximize-inactive.xpm \
+       maximize-toggled-inactive.xpm \
+       maximize-inactive.xpm \
+       maximize-pressed.xpm \

diff --git a/recipes/xfce-base/xfwm4-themes_4.6.0.bb b/recipes/xfce-base/xfwm4-themes_4.6.0.bb
index 92f1a1a..375f8c7 100644 (file)
--- a/recipes/xfce-base/xfwm4-themes_4.6.0.bb
+++ b/recipes/xfce-base/xfwm4-themes_4.6.0.bb
@@ -1,7 +1,7 @@
 # xfwm4-themes OE build file
 
 SECTION = "x11/wm"
-PR = "r3"
+PR = "r5"
 
 DEPENDS = "xfwm4 libglade libxml2"
 RDEPENDS = "xfwm4 libglade libxml2"
@@ -10,6 +10,10 @@ inherit xfce46
 
 SRC_URI = "http://mocha.xfce.org/archive/src/art/xfwm4-themes/4.6/xfwm4-themes-${PV}.tar.bz2"
 
+SRC_URI += " \
+    file://remove-double-files.patch \
+"
+
 PACKAGES_DYNAMIC = "xfwm4-theme-*"
 
 python populate_packages_prepend () {