summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-06-10 17:26:14 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-06-10 17:26:14 +0100
commit720909c296c1872a5804d5825b9592baffcd9a40 (patch)
treed9d928d127179d0c8758e7bbdfd7f53ec384732a
parentc4bc453eabb9efc544710f4c1f95ac0eac24530e (diff)
downloadpoky-720909c296c1872a5804d5825b9592baffcd9a40.tar.gz
libxklavier: 3.7 -> 3.9, stage correctly and fix pkgconfig file
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/libxklavier/libxklavier/pkgconfigfix.patch15
-rw-r--r--meta/packages/libxklavier/libxklavier/remove-include-dir.patch26
-rw-r--r--meta/packages/libxklavier/libxklavier_3.7.bb10
-rw-r--r--meta/packages/libxklavier/libxklavier_3.9.bb12
4 files changed, 27 insertions, 36 deletions
diff --git a/meta/packages/libxklavier/libxklavier/pkgconfigfix.patch b/meta/packages/libxklavier/libxklavier/pkgconfigfix.patch
new file mode 100644
index 0000000000..4aaafb2b1e
--- /dev/null
+++ b/meta/packages/libxklavier/libxklavier/pkgconfigfix.patch
@@ -0,0 +1,15 @@
1Index: libxklavier-3.7/libxklavier.pc.in
2===================================================================
3--- libxklavier-3.7.orig/libxklavier.pc.in 2009-06-10 15:58:46.000000000 +0100
4+++ libxklavier-3.7/libxklavier.pc.in 2009-06-10 16:00:45.000000000 +0100
5@@ -5,7 +5,7 @@
6
7 Name: libxklavier
8 Description: libxklavier library
9-Requires: libxml-2.0
10+Requires: libxml-2.0 glib-2.0
11 Version: @VERSION@
12-Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
13-Cflags: -I${includedir} @GLIB_CFLAGS@
14+Libs: -L${libdir} -lxklavier
15+Cflags: -I${includedir}
diff --git a/meta/packages/libxklavier/libxklavier/remove-include-dir.patch b/meta/packages/libxklavier/libxklavier/remove-include-dir.patch
deleted file mode 100644
index 5a10b7ea0a..0000000000
--- a/meta/packages/libxklavier/libxklavier/remove-include-dir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
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
deleted file mode 100644
index 4ffdb3eabf..0000000000
--- a/meta/packages/libxklavier/libxklavier_3.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
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
diff --git a/meta/packages/libxklavier/libxklavier_3.9.bb b/meta/packages/libxklavier/libxklavier_3.9.bb
new file mode 100644
index 0000000000..54d10d6e8d
--- /dev/null
+++ b/meta/packages/libxklavier/libxklavier_3.9.bb
@@ -0,0 +1,12 @@
1DESCRIPTION = "Utility library to make using XKB easier"
2SECTION = "x11/libs"
3PRIORITY = "optional"
4DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
5LICENSE = "LGPL"
6PR = "r2"
7
8SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \
9 file://pkgconfigfix.patch;patch=1"
10
11inherit autotools_stage
12