From b420d28cd0a7018c594d62f2d411747e319f7f00 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Fri, 18 Jun 2010 01:21:16 +0200 Subject: Fixes install error in xfwm4-themes_4.6.0 File 'maximize-inactive.xpm' was listed twice in Makefile.am Signed-off-by: Andreas Mueller Signed-off-by: Koen Kooi --- recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch | 10 ++++++++++ recipes/xfce-base/xfwm4-themes_4.6.0.bb | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch (limited to 'recipes') 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 index 0000000000..14dbe4d835 --- /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 d71042b595..93f8e92c4c 100644 --- 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 = "r4" +PR = "r5" DEPENDS = "xfwm4 libglade libxml2" RDEPENDS_${PN} = "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 () { -- cgit 1.2.3-korg