diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:39:46 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:39:46 +0000 |
| commit | a5ab4c1e92a80b977b53072b349e05ab0f097dd1 (patch) | |
| tree | c93cf04d86827b31ee317cdf0a2796be2db80175 /packages/matchbox-keyboard | |
| parent | 9030208546561970a18f0eb4be401b4d837aa310 (diff) | |
| parent | 20e5fbe217c05900868741ec16b09092eaf0830a (diff) | |
propagate from branch 'org.openembedded.dev' (head d8bfa63aa913e7227790ba2d02253cfbecce61ab)
to branch 'org.openembedded.dev.avr32' (head bb1b18fc3fa0562c4c7bd85bb0d9617c62261f2e)
Diffstat (limited to 'packages/matchbox-keyboard')
| -rw-r--r-- | packages/matchbox-keyboard/files/fic-gta01-font-size.patch | 8 | ||||
| -rw-r--r-- | packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 17 |
2 files changed, 15 insertions, 10 deletions
diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch index 3a09ac5bc2..c25aa74ca4 100644 --- a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch +++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch @@ -1,12 +1,12 @@ Index: matchbox-keyboard/src/matchbox-keyboard.c =================================================================== ---- matchbox-keyboard.orig/src/matchbox-keyboard.c 2007-08-19 17:26:59.000000000 +0200 -+++ matchbox-keyboard/src/matchbox-keyboard.c 2007-08-19 17:27:06.000000000 +0200 -@@ -52,7 +52,7 @@ +--- matchbox-keyboard.orig/src/matchbox-keyboard.c ++++ matchbox-keyboard/src/matchbox-keyboard.c +@@ -54,7 +54,7 @@ kb->row_spacing = 5; kb->font_family = strdup("sans"); -- kb->font_pt_size = 5; +- kb->font_pt_size = 6; + kb->font_pt_size = 3; kb->font_variant = strdup("bold"); diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 5b6ea4edfa..4384b6db7d 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -1,18 +1,23 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" -RCONFLICTS = matchbox-keyboard -RPROVIDES_${PN} = matchbox-keyboard -#DEFAULT_PREFERENCE = "-1" +RCONFLICTS_${PN} = "matchbox-keyboard" +RPROVIDES_${PN} = "matchbox-keyboard" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r7" +PR = "r10" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ - file://smallscreen-fontsize.patch;patch=1 \ - file://80matchboxkeyboard" + file://smallscreen-fontsize.patch;patch=1 \ + file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ + file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ + 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://80matchboxkeyboard" SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://fic-gta01-font-size.patch;patch=1" S = "${WORKDIR}/matchbox-keyboard" |