* xfwm4-themes-4.6.0 suggested patch
@ 2010-06-15 13:37 "Andreas Müller"
2010-06-17 23:29 ` [PATCH] Fixes install error in xfwm4-themes_4.6.0 Andreas Mueller
0 siblings, 1 reply; 3+ messages in thread
From: "Andreas Müller" @ 2010-06-15 13:37 UTC (permalink / raw)
To: openembedded-devel
The following patch fixes the typo (maximize-inactive.xpm listed twice) in xfwm4-themes-4.6.0/themes/redmond/Makefile.am. On my machine this bug causes installation of xfwm4-themes to fail. Could someone agree and add this to oe? By the way: What is the correct way to post patches?
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 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 b37ba1b..82771d9 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 = "r3"
+PR = "r4"
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 () {
--
GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT!
Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] Fixes install error in xfwm4-themes_4.6.0
2010-06-15 13:37 xfwm4-themes-4.6.0 suggested patch "Andreas Müller"
@ 2010-06-17 23:29 ` Andreas Mueller
2010-06-18 10:33 ` Koen Kooi
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Mueller @ 2010-06-17 23:29 UTC (permalink / raw)
To: openembedded-devel
From c6fe3e0c5bee620b77871baef0b8cd4680fa2cbd Mon Sep 17 00:00:00 2001
From: Andreas Mueller <schnitzeltony@gmx.de>
Date: Fri, 18 Jun 2010 01:21:16 +0200
Subject: [PATCH] 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>
---
.../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 deletions(-)
create mode 100644 recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch
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 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 d71042b..93f8e92 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 () {
--
1.5.3.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Fixes install error in xfwm4-themes_4.6.0
2010-06-17 23:29 ` [PATCH] Fixes install error in xfwm4-themes_4.6.0 Andreas Mueller
@ 2010-06-18 10:33 ` Koen Kooi
0 siblings, 0 replies; 3+ messages in thread
From: Koen Kooi @ 2010-06-18 10:33 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 18-06-10 01:29, Andreas Mueller wrote:
> From c6fe3e0c5bee620b77871baef0b8cd4680fa2cbd Mon Sep 17 00:00:00 2001
> From: Andreas Mueller <schnitzeltony@gmx.de>
> Date: Fri, 18 Jun 2010 01:21:16 +0200
> Subject: [PATCH] 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>
Acked-by: Koen Kooi <koen@openembedded.org>
> ---
> .../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 deletions(-)
> create mode 100644 recipes/xfce-base/xfwm4-themes-4.6.0/remove-double-files.patch
>
> 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 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 d71042b..93f8e92 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 () {
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMG0uCMkyGM64RGpERAjE0AJ9N8SY/vhWbknHQxI7t1cvAZfHZowCgu0o+
DyAuBvK9ij7CAV3Y0P78Dgw=
=kP4x
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-18 10:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-15 13:37 xfwm4-themes-4.6.0 suggested patch "Andreas Müller"
2010-06-17 23:29 ` [PATCH] Fixes install error in xfwm4-themes_4.6.0 Andreas Mueller
2010-06-18 10:33 ` Koen Kooi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox