summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bradford <rob@openedhand.com>2008-09-23 16:57:48 +0000
committerRobert Bradford <rob@openedhand.com>2008-09-23 16:57:48 +0000
commit57fbca3b65d4352b6dd16b12e36e94279b81327e (patch)
tree62374c53104b906ed1a17c9380081d78061f9528
parente1852a524268611cfa8edadb15740085fd172cf3 (diff)
downloadpoky-57fbca3b65d4352b6dd16b12e36e94279b81327e.tar.gz
libxklavier: add libxklavier 3.7 (XKB wrapper library)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5249 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/libxklavier/libxklavier/remove-include-dir.patch26
-rw-r--r--meta/packages/libxklavier/libxklavier_3.7.bb10
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/packages/libxklavier/libxklavier/remove-include-dir.patch b/meta/packages/libxklavier/libxklavier/remove-include-dir.patch
new file mode 100644
index 0000000000..5a10b7ea0a
--- /dev/null
+++ b/meta/packages/libxklavier/libxklavier/remove-include-dir.patch
@@ -0,0 +1,26 @@
1Index: libxklavier-3.7/libxklavier/Makefile.am
2===================================================================
3--- libxklavier-3.7.orig/libxklavier/Makefile.am 2008-04-21 21:11:58.000000000 +0100
4+++ libxklavier-3.7/libxklavier/Makefile.am 2008-09-23 14:49:10.000000000 +0100
5@@ -26,7 +26,7 @@
6 $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --body > xkl_engine_marshal.c
7
8 AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
9- -I. -I$(includedir) $(X_CFLAGS) -I$(top_srcdir) \
10+ -I. $(X_CFLAGS) -I$(top_srcdir) \
11 $(XML_CFLAGS) $(GLIB_CFLAGS) \
12 $(LIBXKBFILE_PRESENT_CFLAG) \
13 $(ENABLE_XKB_SUPPORT_CFLAG) \
14Index: libxklavier-3.7/tests/Makefile.am
15===================================================================
16--- libxklavier-3.7.orig/tests/Makefile.am 2008-09-23 14:49:38.000000000 +0100
17+++ libxklavier-3.7/tests/Makefile.am 2008-09-23 14:49:49.000000000 +0100
18@@ -4,7 +4,7 @@
19
20 test_monitor_SOURCES=test_monitor.c
21
22-AM_CFLAGS=-Wall -Werror -I$(includedir) $(X_CFLAGS) -I$(top_srcdir) $(GLIB_CFLAGS)
23+AM_CFLAGS=-Wall -Werror $(X_CFLAGS) -I$(top_srcdir) $(GLIB_CFLAGS)
24
25 AM_LDFLAGS=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) -lX11 $(GLIB_LIBS)
26
diff --git a/meta/packages/libxklavier/libxklavier_3.7.bb b/meta/packages/libxklavier/libxklavier_3.7.bb
new file mode 100644
index 0000000000..4ffdb3eabf
--- /dev/null
+++ b/meta/packages/libxklavier/libxklavier_3.7.bb
@@ -0,0 +1,10 @@
1DESCRIPTION = "Utility library to make using XKB easier"
2SECTION = "x11/libs"
3PRIORITY = "optional"
4DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
5LICENSE = "LGPL"
6
7SRC_URI = "http://www.mirrorservice.org/sites/ftp.sourceforge.net/pub/sourceforge/g/gs/gswitchit/libxklavier-${PV}.tar.gz \
8 file://remove-include-dir.patch;patch=1"
9inherit autotools
10