libxklavier: 3.7 -> 3.9, stage correctly and fix pkgconfig file

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

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 @@
+Index: libxklavier-3.7/libxklavier.pc.in
+===================================================================
+--- libxklavier-3.7.orig/libxklavier.pc.in      2009-06-10 15:58:46.000000000 +0100
++++ libxklavier-3.7/libxklavier.pc.in   2009-06-10 16:00:45.000000000 +0100
+@@ -5,7 +5,7 @@
+ 
+ Name: libxklavier
+ Description: libxklavier library
+-Requires: libxml-2.0
++Requires: libxml-2.0 glib-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
+-Cflags: -I${includedir} @GLIB_CFLAGS@
++Libs: -L${libdir} -lxklavier
++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 @@
-Index: libxklavier-3.7/libxklavier/Makefile.am
-===================================================================
---- libxklavier-3.7.orig/libxklavier/Makefile.am        2008-04-21 21:11:58.000000000 +0100
-+++ libxklavier-3.7/libxklavier/Makefile.am     2008-09-23 14:49:10.000000000 +0100
-@@ -26,7 +26,7 @@
-        $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --body > xkl_engine_marshal.c
- 
- AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--  -I. -I$(includedir) $(X_CFLAGS) -I$(top_srcdir) \
-+  -I. $(X_CFLAGS) -I$(top_srcdir) \
-   $(XML_CFLAGS) $(GLIB_CFLAGS) \
-   $(LIBXKBFILE_PRESENT_CFLAG) \
-   $(ENABLE_XKB_SUPPORT_CFLAG) \
-Index: libxklavier-3.7/tests/Makefile.am
-===================================================================
---- libxklavier-3.7.orig/tests/Makefile.am      2008-09-23 14:49:38.000000000 +0100
-+++ libxklavier-3.7/tests/Makefile.am   2008-09-23 14:49:49.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- test_monitor_SOURCES=test_monitor.c
- 
--AM_CFLAGS=-Wall -Werror -I$(includedir) $(X_CFLAGS) -I$(top_srcdir) $(GLIB_CFLAGS)
-+AM_CFLAGS=-Wall -Werror $(X_CFLAGS) -I$(top_srcdir) $(GLIB_CFLAGS)
- 
- AM_LDFLAGS=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) -lX11 $(GLIB_LIBS)
- 
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 @@
-DESCRIPTION = "Utility library to make using XKB easier"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
-LICENSE = "LGPL"
-
-SRC_URI = "http://www.mirrorservice.org/sites/ftp.sourceforge.net/pub/sourceforge/g/gs/gswitchit/libxklavier-${PV}.tar.gz \
-           file://remove-include-dir.patch;patch=1"
-inherit autotools
-
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 @@
+DESCRIPTION = "Utility library to make using XKB easier"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
+LICENSE = "LGPL"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \
+           file://pkgconfigfix.patch;patch=1"
+
+inherit autotools_stage
+