mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
libxklavier: upgrade 5.4
The gnome does not support 5.4 any more, get 5.4 from fedora to upgrade. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From 2343283caf88d2390afee08fe034b4c970b20f2e Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Sat, 16 Apr 2016 06:40:04 -0400
|
||||
Subject: [PATCH] fix do_installe failure
|
||||
|
||||
| 18 /usr/bin/install -c -m 644 ../../libxklavier-5.4/libxklavier/libxklavier.vapi
|
||||
libxklavier.deps 'tmp/work/corei7-64-wrs-linux/libxklavier/5.4-r0/image/
|
||||
usr/share/vala/vapi'
|
||||
| 19 /usr/bin/install: cannot stat '../../libxklavier-5.4/libxklavier/
|
||||
libxklavier.vapi': No such file or directory
|
||||
| 20 Makefile:621: recipe for target 'install-vapiDATA' failed
|
||||
| 21 make[3]: *** [install-vapiDATA] Error 1
|
||||
| 22 make[3]: *** Waiting for unfinished jobs....
|
||||
|
||||
Upstream-Stauts: Pending
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
libxklavier/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
|
||||
index c9c1bbe..f0efa32 100644
|
||||
--- a/libxklavier/Makefile.am
|
||||
+++ b/libxklavier/Makefile.am
|
||||
@@ -131,6 +131,6 @@ libxklavier.deps:
|
||||
done
|
||||
|
||||
vapidir = $(datadir)/vala/vapi
|
||||
-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
|
||||
+vapi_DATA = $(VAPIGEN_VAPIS:.vapi=.deps)
|
||||
endif
|
||||
endif
|
||||
--
|
||||
1.9.1
|
||||
|
||||
+11
-4
@@ -4,11 +4,18 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
|
||||
|
||||
DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2"
|
||||
|
||||
GNOME_COMPRESS_TYPE = "xz"
|
||||
inherit autotools pkgconfig gettext gobject-introspection
|
||||
|
||||
inherit gnomebase gettext gobject-introspection
|
||||
SRC_URI[archive.md5sum] = "290ea2a8abc40f78a3a16bdae6f02808"
|
||||
SRC_URI[archive.sha256sum] = "ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404"
|
||||
RDEPENDS_${PN} += "iso-codes xkbcomp"
|
||||
|
||||
SRC_URI = " \
|
||||
http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/${BPN}-${PV}.tar.bz2 \
|
||||
file://fix-do_installe-failure.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "13af74dcb6011ecedf1e3ed122bd31fa"
|
||||
SRC_URI[sha256sum] = "17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320"
|
||||
|
||||
FILES_${PN} += "${datadir}/*"
|
||||
|
||||
EXTRA_OECONF = "--with-xkb-bin-base=${bindir}"
|
||||
|
||||
Reference in New Issue
Block a user