[oe-commits] Khem Raj : libxklavier: Update to 5.3 and fix build S != B

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: bd05539b2eb64467f26fc59cdadba92839f5a30d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=bd05539b2eb64467f26fc59cdadba92839f5a30d

Author: Khem Raj <raj.khem at gmail.com>
Date:   Sat Apr 26 13:34:25 2014 -0700

libxklavier: Update to 5.3 and fix build S != B

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../libxklavier/{libxklavier_5.0.bb => libxklavier_5.3.bb}    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
similarity index 55%
rename from meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb
rename to meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
index 4c5be1d..3eff298 100644
--- a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb
+++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
@@ -4,16 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
 
 DEPENDS = "xkbcomp gtk+ iso-codes libxi"
 
-inherit gnome
+GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI[archive.md5sum] = "134c7ea177ff901123b909de77394780"
-SRC_URI[archive.sha256sum] = "dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0"
+inherit gnomebase gettext
+SRC_URI[archive.md5sum] = "290ea2a8abc40f78a3a16bdae6f02808"
+SRC_URI[archive.sha256sum] = "ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404"
 
 EXTRA_OECONF = "--with-xkb-bin-base=${bindir}"
 
 do_configure_append() {
-    find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-    find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+    find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+    find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
 }
 
 do_compile_append() {