summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <ml@vdm-design.de>2010-03-25 11:14:49 +0100
committerThomas Zimmermann <ml@vdm-design.de>2010-03-25 11:14:49 +0100
commit61d8a97f3402d7088cc84409d84ae1dd6d71e92b (patch)
tree3ca30fa71c55e0659abc262009aa01c218247f51
parent281b9802a378571a58cc727f8c9cd9538b6986f0 (diff)
matchbox-keyboard-inputmethod: Fix build with newer libtool
* Newer libtool fails to install libs because of an additional / Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>
-rw-r--r--recipes/matchbox-keyboard/files/7-Newer-autotools.patch10
-rw-r--r--recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb3
2 files changed, 12 insertions, 1 deletions
diff --git a/recipes/matchbox-keyboard/files/7-Newer-autotools.patch b/recipes/matchbox-keyboard/files/7-Newer-autotools.patch
new file mode 100644
index 0000000000..272a6cb641
--- /dev/null
+++ b/recipes/matchbox-keyboard/files/7-Newer-autotools.patch
@@ -0,0 +1,10 @@
+--- matchbox-keyboard/gtk-im/Makefile.am 2010-03-25 11:04:40.000000000 +0100
++++ matchbox-keyboard/gtk-im/Makefile.am 2010-03-25 11:04:40.000000000 +0100
+@@ -1,6 +1,6 @@
+ AM_CFLAGS = -Wall
+
+-imdir = @libdir@/gtk-2.0/@GTK_VERSION@/immodules/
++imdir = @libdir@/gtk-2.0/@GTK_VERSION@/immodules
+ im_LTLIBRARIES = libmb-im-invoker.la
+ # TODO: remove lib prefix
+
diff --git a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index 37300cbcd9..5e749ae1e0 100644
--- a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -5,7 +5,7 @@ RCONFLICTS_${PN} = "matchbox-keyboard"
RPROVIDES_${PN} = "matchbox-keyboard"
SECTION = "x11"
PV = "0.0+svnr${SRCPV}"
-PR = "r10"
+PR = "r11"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
file://smallscreen-fontsize.patch;patch=1 \
@@ -14,6 +14,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;pr
file://4-Add-rendering-debug-logging.patch;patch=1 \
file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
+ file://7-Newer-autotools.patch;patch=1 \
file://80matchboxkeyboard"
SRC_URI_append_om-gta01 = " file://fic-gta01-font-size.patch;patch=1"