diff options
27 files changed, 648 insertions, 69 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 325c0f8b0e..9b6e0b8059 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -132,6 +132,11 @@ Recipes: linux, hostap*, orinoco*, wpa-supplicant*, wireless-tools, keymaps Recipes: linux-rp, gammu Recipes: ttf-fonts/* +Person: Matthias 'CoreDump' Hentges +Website: http://www.hentges.net +Machines: collie, spitz +Recipes: altboot, webcam-server + Person: Michael 'Mickey' Lauer Mail: mlauer@vanille-media.de Distros: Ångström, generic diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index 15e945d518..db006b8c77 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -11,4 +11,5 @@ def python_dir(d): PYTHON_DIR = "${@python_dir(d)}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug" diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd index 289896fb47..2cf26c5f3a 100755 --- a/packages/gpsd/files/gpsd +++ b/packages/gpsd/files/gpsd @@ -16,6 +16,8 @@ GPS_DEV="/dev/ttyS3" RETVAL=0 prog="gpsd" +test -f /etc/default/$prog && . /etc/default/$prog + start() { # Start daemons. echo -n "Starting $prog: " diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index f7c1de2362..7fa05d4716 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -10,6 +10,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --disable-python " SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ + file://gpsd-default \ file://gpsd" inherit autotools update-rc.d @@ -40,6 +41,8 @@ do_install_append() { install -d ${D}/${sysconfdir}/init.d install -d ${D}/dev install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/default + install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd } PACKAGES =+ "libgps" diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb index 1a5e608aa8..12ef7f47a3 100644 --- a/packages/gpsd/gpsd_2.28.bb +++ b/packages/gpsd/gpsd_2.28.bb @@ -1,2 +1,2 @@ require gpsd.inc -PR = "r1" +PR = "r2" diff --git a/packages/gpsd/gpsd_2.32.bb b/packages/gpsd/gpsd_2.32.bb index 4d07974d6e..1a5e608aa8 100644 --- a/packages/gpsd/gpsd_2.32.bb +++ b/packages/gpsd/gpsd_2.32.bb @@ -1,2 +1,2 @@ require gpsd.inc -PR = "r0" +PR = "r1" diff --git a/packages/gpsd/gpsd_2.33.bb b/packages/gpsd/gpsd_2.33.bb index f61c613eb8..02aef515da 100644 --- a/packages/gpsd/gpsd_2.33.bb +++ b/packages/gpsd/gpsd_2.33.bb @@ -2,4 +2,4 @@ require gpsd.inc DEPENDS = "ncurses" -PR = "r0" +PR = "r1" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 58e9ebeee2..885a41dbda 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,3 +1,3 @@ require gpsd.inc -PR = "r0" +PR = "r1" diff --git a/packages/gspcav1/gspcav1-20070110/.mtn2git_empty b/packages/gspcav1/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gspcav1/gspcav1-20070110/.mtn2git_empty +++ b/packages/gspcav1/files/.mtn2git_empty diff --git a/packages/gspcav1/gspcav1-20070110/MS.patch b/packages/gspcav1/files/MS.patch index 588a4bc3da..588a4bc3da 100644 --- a/packages/gspcav1/gspcav1-20070110/MS.patch +++ b/packages/gspcav1/files/MS.patch diff --git a/packages/gspcav1/gspcav1-20070110/Makefile.patch b/packages/gspcav1/files/Makefile.patch index 87262686cb..87262686cb 100644 --- a/packages/gspcav1/gspcav1-20070110/Makefile.patch +++ b/packages/gspcav1/files/Makefile.patch diff --git a/packages/gspcav1/gspcav1_20070508.bb b/packages/gspcav1/gspcav1_20070508.bb index e1fc443d36..14c98e3e3a 100644 --- a/packages/gspcav1/gspcav1_20070508.bb +++ b/packages/gspcav1/gspcav1_20070508.bb @@ -4,6 +4,8 @@ PRIORITY = "optional" SECTION = "kernel/modules" LICENSE = "GPL" +DEFAULT_PREFERENCE = "-1" + PR = "r1" SRC_URI = "http://mxhaard.free.fr/spca50x/Download/oldrelease/${PN}-${PV}.tar.gz \ diff --git a/packages/lua/lua.inc b/packages/lua/lua.inc index a03bf8ff22..b713825f00 100644 --- a/packages/lua/lua.inc +++ b/packages/lua/lua.inc @@ -3,10 +3,16 @@ for extending applications." LICENSE = "MIT" HOMEPAGE = "http://www.lua.org/" -PACKAGES = "${PN} liblua ${PN}-doc liblua-dev \ - liblualib liblualib-dev" -FILES_${PN} = "${bindir}/lua ${bindir}/luac" -FILES_${PN}-doc = "${mandir}/man1/lua.1 ${mandir}/man1/luac.1" +PACKAGES = "liblua-dbg liblualib-dbg ${PN}-dbg \ +liblua-dev liblua liblualib-dev liblualib ${PN}-doc ${PN}" + +FILES_${PN}-dbg = "${bindir}/.debug" +FILES_liblua-dbg = "${libdir}/.debug/liblua.so.*" +FILES_liblualib-dbg = "${libdir}/.debug/liblualib.so.*" + +FILES_${PN} = "${bindir}" +FILES_${PN}-doc = "${mandir}" + FILES_liblua = "${libdir}/liblua.so.*" FILES_liblua-dev = "${libdir}/liblua.so ${libdir}/liblua.a \ ${includedir}/lua.h" diff --git a/packages/lua/lua_5.0.2.bb b/packages/lua/lua_5.0.2.bb index 6dbb656166..bb989c04d9 100644 --- a/packages/lua/lua_5.0.2.bb +++ b/packages/lua/lua_5.0.2.bb @@ -1,7 +1,7 @@ require lua.inc DEPENDS += "readline" -PR = "r3" +PR = "r4" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ file://debian.patch;patch=1 \ file://make.patch;patch=1 \ diff --git a/packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch b/packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch new file mode 100644 index 0000000000..2d05e5d652 --- /dev/null +++ b/packages/matchbox-keyboard/files/2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch @@ -0,0 +1,91 @@ +# HG changeset patch +# User pfalcon@localhost +# Date 1176076569 0 +# Node ID ff9cf1fd8177dded04b9fc81ba630203848fc3ca +# Parent 96305d94eb31f06f5618c99310192c47c68a1f21 +Add new modifier: layout. Used to cycle thru all available layouts. + +diff -r 96305d94eb31 -r ff9cf1fd8177 src/config-parser.c +--- a/src/config-parser.c Sun Apr 08 23:28:43 2007 +0000 ++++ b/src/config-parser.c Sun Apr 08 23:56:09 2007 +0000 +@@ -113,7 +113,8 @@ ModLookup[] = + { "mod1", MBKeyboardKeyModMod1 }, + { "mod2", MBKeyboardKeyModMod2 }, + { "mod3", MBKeyboardKeyModMod3 }, +- { "caps", MBKeyboardKeyModCaps } ++ { "caps", MBKeyboardKeyModCaps }, ++ { "layout", MBKeyboardKeyModLayout }, + }; + + typedef struct MBKeyboardConfigState +diff -r 96305d94eb31 -r ff9cf1fd8177 src/matchbox-keyboard-key.c +--- a/src/matchbox-keyboard-key.c Sun Apr 08 23:28:43 2007 +0000 ++++ b/src/matchbox-keyboard-key.c Sun Apr 08 23:56:09 2007 +0000 +@@ -493,6 +493,16 @@ mb_kbd_key_press(MBKeyboardKey *key) + case MBKeyboardKeyModAlt: + mb_kbd_toggle_state(key->kbd, MBKeyboardStateAlt); + break; ++ case MBKeyboardKeyModLayout: ++ key->kbd->selected_layout_no++; ++ if (key->kbd->selected_layout_no >= util_list_length(key->kbd->layouts)) ++ key->kbd->selected_layout_no = 0; ++ key->kbd->selected_layout = ++ (MBKeyboardLayout *)util_list_get_nth_data(key->kbd->layouts, ++ key->kbd->selected_layout_no); ++ mb_kbd_ui_recalc_ui_layout(key->kbd->ui); ++ queue_full_kbd_redraw = True; ++ break; + default: + DBG("unknown modifier action"); + break; +diff -r 96305d94eb31 -r ff9cf1fd8177 src/matchbox-keyboard-ui.c +--- a/src/matchbox-keyboard-ui.c Sun Apr 08 23:28:43 2007 +0000 ++++ b/src/matchbox-keyboard-ui.c Sun Apr 08 23:56:09 2007 +0000 +@@ -505,6 +505,15 @@ mb_kbd_ui_allocate_ui_layout(MBKeyboardU + } + + *width = max_row_width; ++} ++ ++void ++mb_kbd_ui_recalc_ui_layout(MBKeyboardUI *ui) ++{ ++ mb_kbd_ui_allocate_ui_layout(ui, ++ &ui->base_alloc_width, &ui->base_alloc_height); ++ ++ mb_kbd_ui_resize(ui, ui->xwin_width, ui->xwin_height); + } + + void +diff -r 96305d94eb31 -r ff9cf1fd8177 src/matchbox-keyboard.c +--- a/src/matchbox-keyboard.c Sun Apr 08 23:28:43 2007 +0000 ++++ b/src/matchbox-keyboard.c Sun Apr 08 23:56:09 2007 +0000 +@@ -85,6 +85,7 @@ mb_kbd_new (int argc, char **argv) + + kb->selected_layout + = (MBKeyboardLayout *)util_list_get_nth_data(kb->layouts, 0); ++ kb->selected_layout_no = 0; + + if (want_embedding) + mb_kbd_ui_set_embeded( kb->ui, True ); +diff -r 96305d94eb31 -r ff9cf1fd8177 src/matchbox-keyboard.h +--- a/src/matchbox-keyboard.h Sun Apr 08 23:28:43 2007 +0000 ++++ b/src/matchbox-keyboard.h Sun Apr 08 23:56:09 2007 +0000 +@@ -148,6 +148,7 @@ struct MBKeyboard + + List *layouts; + MBKeyboardLayout *selected_layout; ++ int selected_layout_no; + + int key_border, key_pad, key_margin; + int row_spacing, col_spacing; +@@ -177,6 +178,9 @@ int + int + mb_kbd_ui_init(MBKeyboard *kbd); + ++void ++mb_kbd_ui_recalc_ui_layout(MBKeyboardUI *ui); ++ + int + mb_kbd_ui_realize(MBKeyboardUI *ui); + diff --git a/packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch b/packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch new file mode 100644 index 0000000000..8513b6ed86 --- /dev/null +++ b/packages/matchbox-keyboard/files/3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch @@ -0,0 +1,94 @@ +# HG changeset patch +# User pfalcon@localhost +# Date 1176077194 0 +# Node ID b010d54a6c5020a68855e60e5a423ee3c18ed700 +# Parent ff9cf1fd8177dded04b9fc81ba630203848fc3ca +Changes to improve layout rendering, especially after adding support for +multiple layouts: +1. Add --hfactor option which presets keyboard to the specified percentage +of screen height. This is required for multiple layouts, as otherwise +height is calculated on specific layout, but in such a way that it is +affected by previous layout, which leads to rendering artifacts. +2. Also st default font height to 6, after all. + +diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard-ui.c +--- a/src/matchbox-keyboard-ui.c Sun Apr 08 23:56:09 2007 +0000 ++++ b/src/matchbox-keyboard-ui.c Mon Apr 09 00:06:34 2007 +0000 +@@ -744,9 +744,15 @@ mb_kbd_ui_resources_create(MBKeyboardUI + */ + if (desk_width > ui->xwin_width) + { ++ int win_height; ++ if (ui->kbd->hfactor != 0) ++ win_height = desk_height * ui->kbd->hfactor / 100; ++ else ++ win_height = ( desk_width * ui->xwin_height ) / ui->xwin_width; ++ + mb_kbd_ui_resize(ui, + desk_width, +- ( desk_width * ui->xwin_height ) / ui->xwin_width); ++ win_height); + } + + wm_struct_vals[2] = desk_y + desk_height - ui->xwin_height; +@@ -818,8 +824,11 @@ mb_kbd_ui_resize(MBKeyboardUI *ui, int w + width_diff = width - ui->base_alloc_width; + height_diff = height - ui->base_alloc_height; + ++/* It's better to have some "clipped" keys, than busted layout. */ ++#if 0 + if (width_diff < 0 || height_diff < 0) + return; /* dont go smaller than our int request - get clipped */ ++#endif + + layout = mb_kbd_get_selected_layout(ui->kbd); + row_item = mb_kbd_layout_rows(layout); +diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard.c +--- a/src/matchbox-keyboard.c Sun Apr 08 23:56:09 2007 +0000 ++++ b/src/matchbox-keyboard.c Mon Apr 09 00:06:34 2007 +0000 +@@ -23,8 +23,9 @@ mb_kbd_usage (char *progname) + mb_kbd_usage (char *progname) + { + fprintf(stderr, "Usage:\n %s [Options ] [ Layout Variant ]\n", progname); +- fprintf(stderr, "\nOptions are;\n" +- " -xid,--xid Print window ID to stdout ( for embedding )\n"); ++ fprintf(stderr, "\nOptions are:\n" ++ " -xid,--xid Print window ID to stdout ( for embedding )\n" ++ " --hfactor <percent> Fix keyboard window size in percentage of desktop height\n"); + fprintf(stderr, "\nmatchbox-keyboard %s \nCopyright (C) 2005 Matthew Allum, OpenedHand Ltd.\n", VERSION); + + exit(-1); +@@ -58,6 +59,13 @@ mb_kbd_new (int argc, char **argv) + want_embedding = True; + continue; + } ++ if (streq ("-hfactor", argv[i]) || streq ("--hfactor", argv[i])) ++ { ++ if (i + 1 < argc) { ++ kb->hfactor = atoi(argv[i + 1]); ++ } ++ continue; ++ } + + if (i == (argc-1) && argv[i][0] != '-') + variant = argv[i]; +@@ -77,7 +85,7 @@ mb_kbd_new (int argc, char **argv) + kb->key_pad = 0; + kb->col_spacing = 0; + kb->row_spacing = 0; +- kb->font_pt_size = 5; ++ kb->font_pt_size = 6; + } + + if (!mb_kbd_config_load(kb, variant)) +diff -r ff9cf1fd8177 -r b010d54a6c50 src/matchbox-keyboard.h +--- a/src/matchbox-keyboard.h Sun Apr 08 23:56:09 2007 +0000 ++++ b/src/matchbox-keyboard.h Mon Apr 09 00:06:34 2007 +0000 +@@ -143,6 +143,7 @@ struct MBKeyboard + char *font_family; + int font_pt_size; + char *font_variant; ++ int hfactor; + + char *config_file; + diff --git a/packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch b/packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch new file mode 100644 index 0000000000..7ce61e469c --- /dev/null +++ b/packages/matchbox-keyboard/files/4-Add-rendering-debug-logging.patch @@ -0,0 +1,65 @@ +# HG changeset patch +# User pfalcon@localhost +# Date 1176077287 0 +# Node ID 38c3459f2e1a1c8dc7aacb486f201bdda638c7f2 +# Parent b010d54a6c5020a68855e60e5a423ee3c18ed700 +Add rendering debug logging. + +diff -r b010d54a6c50 -r 38c3459f2e1a src/matchbox-keyboard-ui.c +--- a/src/matchbox-keyboard-ui.c Mon Apr 09 00:06:34 2007 +0000 ++++ b/src/matchbox-keyboard-ui.c Mon Apr 09 00:08:07 2007 +0000 +@@ -357,6 +357,8 @@ mb_kbd_ui_allocate_ui_layout(MBKeyboardU + /* Do an initial run to figure out a 'base' size for single glyph keys */ + mb_kdb_ui_unit_key_size(ui, &ui->key_uwidth, &ui->key_uheight); + ++ DBG("unit_key_size: %dx%d", ui->key_uwidth, ui->key_uheight); ++ + row_item = mb_kbd_layout_rows(layout); + + row_y = mb_kbd_row_spacing(ui->kbd); +@@ -415,6 +417,8 @@ mb_kbd_ui_allocate_ui_layout(MBKeyboardU + + if (key_x > max_row_width) /* key_x now represents row width */ + max_row_width = key_x; ++ ++ DBG("Row width: %d", key_x); + + mb_kbd_row_set_y(row, row_y); + +@@ -617,6 +621,8 @@ mb_kbd_ui_resources_create(MBKeyboardUI + boolean have_matchbox_wm = False; + boolean have_ewmh_wm = False; + ++ DBG("mb_kbd_ui_resources_create: %dx%d", ui->xwin_width, ui->xwin_height); ++ + /* + atom_wm_protocols = { + XInternAtom(ui->xdpy, "WM_DELETE_WINDOW",False), +@@ -821,6 +827,8 @@ mb_kbd_ui_resize(MBKeyboardUI *ui, int w + + MARK(); + ++ DBG("mb_kbd_ui_resize: resize to %dx%d, base %dx%d", width, height, ui->base_alloc_width, ui->base_alloc_height); ++ + width_diff = width - ui->base_alloc_width; + height_diff = height - ui->base_alloc_height; + +@@ -1125,6 +1133,7 @@ mb_kbd_ui_event_loop(MBKeyboardUI *ui) + } + break; + case ConfigureNotify: ++ DBG("ConfigureNotify %i,%i", xev.xconfigure.width, xev.xconfigure.height); + if (xev.xconfigure.width != ui->xwin_width + || xev.xconfigure.height != ui->xwin_height) + mb_kbd_ui_handle_configure(ui, +diff -r b010d54a6c50 -r 38c3459f2e1a src/matchbox-keyboard.h +--- a/src/matchbox-keyboard.h Mon Apr 09 00:06:34 2007 +0000 ++++ b/src/matchbox-keyboard.h Mon Apr 09 00:08:07 2007 +0000 +@@ -48,6 +48,7 @@ + #include "config.h" + #endif + ++#define WANT_DEBUG 1 + #if (WANT_DEBUG) + #define DBG(x, a...) \ + fprintf (stderr, __FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a) diff --git a/packages/matchbox-keyboard/files/5-Add-support-for-loading-multiple-independent-layouts.patch b/packages/matchbox-keyboard/files/5-Add-support-for-loading-multiple-independent-layouts.patch new file mode 100644 index 0000000000..1480591930 --- /dev/null +++ b/packages/matchbox-keyboard/files/5-Add-support-for-loading-multiple-independent-layouts.patch @@ -0,0 +1,197 @@ +# HG changeset patch +# User pfalcon@localhost +# Date 1181567228 0 +# Node ID 869314ae90f46a8c2d34080005d4079cb0d0fcf4 +# Parent 38c3459f2e1a1c8dc7aacb486f201bdda638c7f2 +Add support for loading multiple independent layouts. +All layouts found in ~/.matchbox/keyboard.d/ are loaded, realistically +these will be symlinks to system-wide store. This directory has the highest +priority of all other layout selection mechanism (except for +$MB_KBD_CONFIG). + +diff -r 38c3459f2e1a -r 869314ae90f4 src/config-parser.c +--- a/src/config-parser.c Mon Apr 09 00:08:07 2007 +0000 ++++ b/src/config-parser.c Mon Jun 11 13:07:08 2007 +0000 +@@ -17,6 +17,7 @@ + * + */ + ++#include <dirent.h> + #include "matchbox-keyboard.h" + + /* +@@ -57,6 +58,9 @@ + + </keyboard> + */ ++ ++int mb_kbd_config_parse_file(MBKeyboard *kbd, char *path); ++static int mb_kbd_config_parse_data(MBKeyboard *kbd, char *data); + + struct _keysymlookup + { +@@ -170,12 +174,9 @@ config_str_to_modtype(const char* str) + } + + +-static char* +-config_load_file(MBKeyboard *kbd, char *variant_in) +-{ +- struct stat stat_info; +- FILE* fp; +- char *result; ++int ++mb_kbd_config_load(MBKeyboard *kbd, char *variant_in) ++{ + char *country = NULL; + char *variant = NULL; + char *lang = NULL; +@@ -195,7 +196,44 @@ config_load_file(MBKeyboard *kbd, char * + if (util_file_readable(path)) + goto load; + +- return NULL; ++ return 0; ++ } ++ ++ if (getenv("HOME")) ++ { ++ snprintf(path, 1024, "%s/.matchbox/keyboard.d", getenv("HOME")); ++ ++ DBG("checking %s\n", path); ++ ++ if (util_file_readable(path)) ++ { ++ DIR *dir = opendir(path); ++ struct dirent *dirent; ++ if (!dir) ++ { ++ perror("matchbox-keyboard"); ++ util_fatal_error("Cannot read keyboard.d.\n"); ++ } ++ errno = 0; ++ while ((dirent = readdir(dir))) ++ { ++ if (dirent->d_name[0] == '.') ++ continue; ++ snprintf(path, 1024, "%s/.matchbox/keyboard.d/%s", getenv("HOME"), dirent->d_name); ++ if (!mb_kbd_config_parse_file(kbd, path)) ++ { ++ util_fatal_error("Cannot read file in keyboard.d.\n"); ++ } ++ ++ } ++ if (errno) ++ { ++ perror("matchbox-keyboard"); ++ util_fatal_error("Error reading keyboard.d.\n"); ++ } ++ closedir(dir); ++ return 1; ++ } + } + + lang = getenv("MB_KBD_LANG"); +@@ -268,29 +306,11 @@ config_load_file(MBKeyboard *kbd, char * + DBG("checking %s\n", path); + + if (!util_file_readable(path)) +- return NULL; ++ return 0; + + load: + +- if (stat(path, &stat_info)) +- return NULL; +- +- if ((fp = fopen(path, "rb")) == NULL) +- return NULL; +- +- DBG("loading %s\n", path); +- +- kbd->config_file = strdup(path); +- +- result = malloc(stat_info.st_size + 1); +- +- n = fread(result, 1, stat_info.st_size, fp); +- +- if (n >= 0) result[n] = '\0'; +- +- fclose(fp); +- +- return result; ++ return mb_kbd_config_parse_file(kbd, path); + } + + static const char * +@@ -567,25 +587,48 @@ config_xml_start_cb(void *data, const ch + + + int +-mb_kbd_config_load(MBKeyboard *kbd, char *variant) +-{ +- char *data; ++mb_kbd_config_parse_file(MBKeyboard *kbd, char *path) ++{ ++ char *buffer; ++ struct stat stat_info; ++ FILE* fp; ++ int n; ++ ++ if (stat(path, &stat_info)) ++ return 0; ++ ++ if ((fp = fopen(path, "rb")) == NULL) ++ return 0; ++ ++ DBG("loading %s\n", path); ++ ++ kbd->config_file = strdup(path); ++ ++ buffer = malloc(stat_info.st_size + 1); ++ ++ n = fread(buffer, 1, stat_info.st_size, fp); ++ ++ if (n >= 0) buffer[n] = '\0'; ++ ++ fclose(fp); ++ ++ mb_kbd_config_parse_data(kbd, buffer); ++ ++ free(buffer); ++ ++ return 1; ++} ++ ++static int ++mb_kbd_config_parse_data(MBKeyboard *kbd, char *data) ++{ + XML_Parser p; + MBKeyboardConfigState *state; + +- if ((data = config_load_file(kbd, variant)) == NULL) +- util_fatal_error("Couldn't find a keyboard config file\n"); +- + p = XML_ParserCreate(NULL); + + if (!p) + util_fatal_error("Couldn't allocate memory for XML parser\n"); +- +- if (variant && !strstr(kbd->config_file, variant)) +- fprintf(stderr, +- "matchbox-keyboard: *Warning* Unable to locate variant: %s\n" +- " falling back to %s\n", +- variant, kbd->config_file); + + state = util_malloc0(sizeof(MBKeyboardConfigState)); + +@@ -607,6 +650,9 @@ mb_kbd_config_load(MBKeyboard *kbd, char + util_fatal_error("XML Parse failed.\n"); + } + ++ free(state); ++ XML_ParserFree(p); ++ + return 1; + } + diff --git a/packages/matchbox-keyboard/files/6-Add-layout-switch-key-to-all-layouts.patch b/packages/matchbox-keyboard/files/6-Add-layout-switch-key-to-all-layouts.patch new file mode 100644 index 0000000000..c2cf4d62dd --- /dev/null +++ b/packages/matchbox-keyboard/files/6-Add-layout-switch-key-to-all-layouts.patch @@ -0,0 +1,111 @@ +# HG changeset patch +# User pfalcon@localhost +# Date 1181568553 0 +# Node ID edc3fd8303a394bccadde2f427ab25ebda4fcbc8 +# Parent 869314ae90f46a8c2d34080005d4079cb0d0fcf4 +Add layout switch key to all layouts. + +diff -r 869314ae90f4 -r edc3fd8303a3 layouts/keyboard-dvorak.xml +--- a/layouts/keyboard-dvorak.xml Mon Jun 11 13:07:08 2007 +0000 ++++ b/layouts/keyboard-dvorak.xml Mon Jun 11 13:29:13 2007 +0000 +@@ -271,6 +271,10 @@ Contributed by Leon Matthews http://www. + <!-- Bottom Row --> + <row> + <space width="500" extended="true"/> ++ <key> ++ <default display="[->]" action="modifier:layout"/> ++ </key> ++ + <key> + <default display="äëö" action="modifier:mod1"/> + </key> +diff -r 869314ae90f4 -r edc3fd8303a3 layouts/keyboard-extended.xml +--- a/layouts/keyboard-extended.xml Mon Jun 11 13:07:08 2007 +0000 ++++ b/layouts/keyboard-extended.xml Mon Jun 11 13:29:13 2007 +0000 +@@ -304,6 +304,10 @@ + </row> + <row> + <key> ++ <default display="[->]" action="modifier:layout"/> ++ </key> ++ ++ <key> + <default display="aeo" action="modifier:mod1"/> + </key> + +diff -r 869314ae90f4 -r edc3fd8303a3 layouts/keyboard-fi.xml +--- a/layouts/keyboard-fi.xml Mon Jun 11 13:07:08 2007 +0000 ++++ b/layouts/keyboard-fi.xml Mon Jun 11 13:29:13 2007 +0000 +@@ -329,6 +329,10 @@ + <space width="500" extended="true"/> + + ++ <key> ++ <default display="[->]" action="modifier:layout"/> ++ </key> ++ + <key fill="true"> + <default display="Ctrl" action="modifier:ctrl"/> + </key> +diff -r 869314ae90f4 -r edc3fd8303a3 layouts/keyboard-numpad.xml +--- a/layouts/keyboard-numpad.xml Mon Jun 11 13:07:08 2007 +0000 ++++ b/layouts/keyboard-numpad.xml Mon Jun 11 13:29:13 2007 +0000 +@@ -54,6 +54,13 @@ + </key> + </row> + ++ <row> ++ <key> ++ <default display="[->]" action="modifier:layout"/> ++ </key> ++ </row> ++ ++ + </layout> + + +diff -r 869314ae90f4 -r edc3fd8303a3 layouts/keyboard-ru.xml +--- a/layouts/keyboard-ru.xml Mon Jun 11 13:07:08 2007 +0000 ++++ b/layouts/keyboard-ru.xml Mon Jun 11 13:29:13 2007 +0000 +@@ -302,10 +302,10 @@ + <space width="500" extended="true"/> + + <key> ++ <default display="[->]" action="modifier:layout"/> ++ </key> ++ <key> + <default display="äëö" action="modifier:mod1"/> +- </key> +- <key> +- <default display="EN" action="modifier:mod2"/> + </key> + + <key fill="true"> +diff -r 869314ae90f4 -r edc3fd8303a3 layouts/keyboard-us.xml +--- a/layouts/keyboard-us.xml Mon Jun 11 13:07:08 2007 +0000 ++++ b/layouts/keyboard-us.xml Mon Jun 11 13:29:13 2007 +0000 +@@ -326,6 +326,10 @@ + <space width="500" extended="true"/> + + <key> ++ <default display="[->]" action="modifier:layout"/> ++ </key> ++ ++ <key> + <default display="äëö" action="modifier:mod1"/> + </key> + +diff -r 869314ae90f4 -r edc3fd8303a3 layouts/keyboard.xml +--- a/layouts/keyboard.xml Mon Jun 11 13:07:08 2007 +0000 ++++ b/layouts/keyboard.xml Mon Jun 11 13:29:13 2007 +0000 +@@ -324,6 +324,10 @@ + <space width="500" extended="true"/> + + <key> ++ <default display="[->]" action="modifier:layout"/> ++ </key> ++ ++ <key> + <default display="äëö" action="modifier:mod1"/> + </key> + diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index 8c7584d4f4..57d0b413a9 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -3,10 +3,16 @@ LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" SECTION = "x11" PV = "0.0+svn${SRCDATE}" -PR="r3" +PR="r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ - file://smallscreen-fontsize.patch;patch=1" + 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 \ + " S = "${WORKDIR}/${PN}" diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb new file mode 100644 index 0000000000..717f2009e3 --- /dev/null +++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "matchbox-keyboard layouts control application" +AUTHOR = "Sergey Lapin" +SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git" +LICENSE = "GPL" +PR = "r2" + +S = "${WORKDIR}/git" + +inherit autotools diff --git a/packages/python/python-pysqlite2_2.2.2.bb b/packages/python/python-pysqlite2_2.2.2.bb index 37be3bc0ea..89d4030f5c 100644 --- a/packages/python/python-pysqlite2_2.2.2.bb +++ b/packages/python/python-pysqlite2_2.2.2.bb @@ -4,10 +4,15 @@ PRIORITY = "optional" LICENSE = "PSF" RDEPENDS = "python-core python-re python-lang python-datetime" DEPENDS = "sqlite3" -SRCNAME = "pysqlite" -PR = "ml1" +SRCNAME = "pysqlite2" +PR = "ml2" -SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.2/${PV}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" +SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.2/${PV}/pysqlite-${PV}.tar.gz" +S = "${WORKDIR}/pysqlite-${PV}" inherit distutils + +do_install_append() { + install -d ${D}${docdir}/doc + mv ${D}/${datadir}/pysqlite2-doc ${D}${docdir}/${SRCNAME} +} diff --git a/packages/twisted/twisted_1.2.0.bb b/packages/twisted/twisted_1.2.0.bb index 3424f8c387..40f8218fbb 100644 --- a/packages/twisted/twisted_1.2.0.bb +++ b/packages/twisted/twisted_1.2.0.bb @@ -1,14 +1,19 @@ -DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \ -Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \ -(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more." +DESCRIPTION = "Twisted is an event-driven networking framework written in \ +Python and licensed under the LGPL. \ Twisted supports TCP, UDP, SSL/TLS, \ +multicast, Unix sockets, a large number of protocols (including HTTP, NNTP, \ +IMAP, SSH, IRC, FTP, and others), and much more." HOMEPAGE = "http://www.twistedmatrix.com" SECTION = "console/network" PRIORITY = "optional" LICENSE = "LGPL" RDEPENDS = "python-core" +PR = "r1" SRC_URI = "http://tmrc.mit.edu/mirror/twisted/old/Twisted-${PV}.tar.bz2" S = "${WORKDIR}/Twisted-${PV}" inherit distutils +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/protocols/.debug" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/runner/.debug" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/twisted/spread/.debug" diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb deleted file mode 100644 index 4a478663e6..0000000000 --- a/packages/wireless-tools/wireless-tools_26.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem" -HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" -PR = "r6" - -SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ - file://man.patch;patch=1 \ - file://wireless-tools.if-pre-up" -S = "${WORKDIR}/wireless_tools.${PV}" - -inherit module-base - -do_configure() { - rm -f wireless.h -} - -do_compile() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake KERNEL_SRC=${KERNEL_SOURCE} KERNEL_VERSION=${KERNEL_VERSION} BUILD_SHARED=y -} - -do_install() { - oe_runmake PREFIX=${D} install - install -d ${D}${sysconfdir}/network/if-pre-up.d - install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools -} - -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ - /etc/network" diff --git a/packages/wireless-tools/wireless-tools_28-pre13.bb b/packages/wireless-tools/wireless-tools_28.bb index 170f67deeb..8fc94af761 100644 --- a/packages/wireless-tools/wireless-tools_28-pre13.bb +++ b/packages/wireless-tools/wireless-tools_28.bb @@ -3,9 +3,8 @@ HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" -SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.pre13.tar.gz \ +SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.tar.gz \ file://man.patch;patch=1 \ file://wireless-tools.if-pre-up \ file://zzz-wireless.if-pre-up" diff --git a/packages/wireless-tools/wireless-tools_29-pre10.bb b/packages/wireless-tools/wireless-tools_29-pre10.bb index febe662602..bf55960696 100644 --- a/packages/wireless-tools/wireless-tools_29-pre10.bb +++ b/packages/wireless-tools/wireless-tools_29-pre10.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre10.tar.gz \ file://man.patch;patch=1 \ @@ -36,10 +36,15 @@ do_install() { install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools } -PACKAGES = "libiw libiw-dev libiw-doc ifrename ${PN} ${PN}-doc ${PN}-dbg " +PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \ +libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc" + +FILES_libiw-dbg = "${libdir}/.debug/*.so.*" +FILES_ifrename-dbg = "${sbindir}/.debug/ifrename" FILES_libiw = "${libdir}/*.so.*" FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" FILES_libiw-doc = "${mandir}/man7" FILES_ifrename = "${sbindir}/ifrename" +FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network" -FILES_${PN}-doc = "${mandir}/man8" +FILES_${PN}-doc = "${mandir}" diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_29-pre21.bb index c26e40cf3c..2b0272a67d 100644 --- a/packages/wireless-tools/wireless-tools_27.bb +++ b/packages/wireless-tools/wireless-tools_29-pre21.bb @@ -2,15 +2,13 @@ DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem" HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" SECTION = "base" PRIORITY = "optional" -#DEPENDS = "virtual/kernel" LICENSE = "GPL" -PR = "r1" -SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ - file://man.patch;patch=1 \ - file://fixheaders.patch;patch=1 \ - file://wireless-tools.if-pre-up" -S = "${WORKDIR}/wireless_tools.${PV}" +SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.pre21.tar.gz \ + file://man.patch;patch=1 \ + file://wireless-tools.if-pre-up \ + file://zzz-wireless.if-pre-up" +S = "${WORKDIR}/wireless_tools.29" CFLAGS =+ "-I${S}" EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \ @@ -23,21 +21,30 @@ do_compile() { oe_runmake all libiw.a } -do_stage () { +do_stage() { install -m 0644 wireless.h ${STAGING_INCDIR}/ install -m 0644 iwlib.h ${STAGING_INCDIR}/ oe_libinstall -a -so libiw ${STAGING_LIBDIR}/ } do_install() { - oe_runmake PREFIX=${D} install install-static + oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr + install -d ${D}${sbindir} + install -m 0755 ifrename ${D}${sbindir}/ifrename install -d ${D}${sysconfdir}/network/if-pre-up.d install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools + install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless } -PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc" +PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \ +libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc" + +FILES_libiw-dbg = "${libdir}/.debug/*.so.*" +FILES_ifrename-dbg = "${sbindir}/.debug/ifrename" FILES_libiw = "${libdir}/*.so.*" FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" FILES_libiw-doc = "${mandir}/man7" -FILES_${PN} = "${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${sysconfdir}/network" -FILES_${PN}-doc = "${mandir}/man8" +FILES_ifrename = "${sbindir}/ifrename" +FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" +FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network" +FILES_${PN}-doc = "${mandir}" |