Patchwork [04/10] rxvt-unicode: Upgrade to v9.18

login
register
mail settings
Submitter Radu Moisan
Date July 4, 2013, 3:13 p.m.
Message ID <7f29d9fb091f4cdf71626dfdf5bec69579096a67.1372950678.git.radu.moisan@intel.com>
Download mbox | patch
Permalink /patch/53021/
State New
Headers show

Comments

Radu Moisan - July 4, 2013, 3:13 p.m.
do_configure was initially failing because could not stat aclocal.m4,
prepended ${S} so that it could find the file, however I don't know
the reasoning for do_configure_prepend in this recipe, it also builds
fine without it

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
 .../rxvt.desktop                                   |    0
 .../rxvt.png                                       |  Bin 2847 -> 2847 bytes
 .../xwc.patch                                      |    0
 .../{rxvt-unicode_9.17.bb => rxvt-unicode_9.18.bb} |    6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/rxvt.desktop (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/rxvt.png (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.17 => rxvt-unicode-9.18}/xwc.patch (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.17.bb => rxvt-unicode_9.18.bb} (92%)
Ross Burton - July 4, 2013, 4:19 p.m.
On 4 July 2013 16:13, Radu Moisan <radu.moisan@intel.com> wrote:
>  do_configure_prepend () {
> -       cp aclocal.m4 acinclude.m4
> +       cp ${S}/aclocal.m4 ${S}/acinclude.m4
>  }

That's the right fix.  The rationale for this pattern is that
aclocal.m4 is a generated file, created by the aclocal binary, which
contains all of the macros used by rxvt from /usr/share/aclocal (i.e.
the X macros).  Thus, it will be destroyed at configure time.
acinclude.m4 is for local macros and is a source file.

Typically you see this pattern in packages which ship a non-pristine
aclocal.m4, so when we re-generate it macros are lost.  That normally
means that the package won't build though.

Ross

Patch

diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.desktop
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.desktop
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.png b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/rxvt.png
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/rxvt.png
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.17/xwc.patch
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.18/xwc.patch
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb
similarity index 92%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb
index 806e354..9a47617 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.17.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.18.bb
@@ -17,8 +17,8 @@  SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2
 	   file://rxvt.desktop \
 	   file://rxvt.png"
 
-SRC_URI[md5sum] = "1270432bdc7ce17dbb07d41a607081e0"
-SRC_URI[sha256sum] = "de017b2b2a1a7182aeada99f605da33cbee18d450e07a7fdabef48da446521e4"
+SRC_URI[md5sum] = "963ccc748fe5bca925e7b92c0404d68b"
+SRC_URI[sha256sum] = "87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f"
 
 inherit autotools update-alternatives
 
@@ -42,7 +42,7 @@  EXTRA_OECONF = "--enable-menubar --enable-xim \
 		--with-x=${STAGING_DIR_HOST}${prefix}"
 
 do_configure_prepend () {
-	cp aclocal.m4 acinclude.m4
+	cp ${S}/aclocal.m4 ${S}/acinclude.m4
 }
 
 do_compile_prepend () {