diff options
43 files changed, 1271 insertions, 966 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index d983af3f9f..08c1058edf 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -59,8 +59,10 @@ def package_qa_get_machine_dict(): "powerpc": ( 20, 0, 0, False, True), "mipsel": ( 8, 0, 0, True, True), "avr32": (6317, 0, 0, False, True), - "bfin": ( 0, 0, 0, True, True), }, + "uclinux-uclibc" : { + "bfin": ( 0, 0, 0, True, True), + }, "linux-gnueabi" : { "arm" : (40, 0, 0, True, True), "armeb" : (40, 0, 0, False, True), diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index db1dbf19b4..4191f4edc1 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -31,7 +31,7 @@ def get_siteinfo_list(d): "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\ "avr32-linux": "endian-big bit-32 common-glibc avr32-common",\ "avr32-linux-uclibc": "endian-big bit-32 common-uclibc avr32-common",\ - "bfin-linux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ + "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ "i386-linux": "endian-little bit-32 common-glibc ix86-common",\ "i486-linux": "endian-little bit-32 common-glibc ix86-common",\ "i586-linux": "endian-little bit-32 common-glibc ix86-common",\ diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 059a1ad4bf..66cb1df12f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -191,13 +191,16 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" +PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21" #Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_uclibc ?= "0.9.29" +PREFERRED_VERSION_uclibc-initial ?= "0.9.29" #there's is no avr32 patch for 0.9.29 PREFERRED_VERSION_uclibc_avr32 = "0.9.28" +PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.5" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index c4678e66f9..0f20e9c29d 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -7,7 +7,8 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}" +TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}" +TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index 6990c98000..fc3a77502d 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -220,7 +220,7 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20060404" +PREFERRED_VERSION_konqueror-embedded = "20070212" SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}" diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.55.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.55.bb new file mode 100644 index 0000000000..e6ff0d6624 --- /dev/null +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.55.bb @@ -0,0 +1,4 @@ +require gpe-bluetooth.inc + +PR = "r0" + diff --git a/packages/gpe-calendar/gpe-calendar_0.90.bb b/packages/gpe-calendar/gpe-calendar_0.90.bb new file mode 100644 index 0000000000..5b7c321fa9 --- /dev/null +++ b/packages/gpe-calendar/gpe-calendar_0.90.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite." +SECTION = "gpe" +LICENSE = "GPL" + +DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" +RDEPENDS = "gpe-icons" + +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools gpe + +do_configure () { + autotools_do_configure +} + + diff --git a/packages/gpe-contacts/gpe-contacts_0.47.bb b/packages/gpe-contacts/gpe-contacts_0.47.bb new file mode 100644 index 0000000000..dadb085f06 --- /dev/null +++ b/packages/gpe-contacts/gpe-contacts_0.47.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "GPE contacts manager" +LICENSE = "GPL" +SECTION = "gpe" + +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib" +RDEPENDS = "gpe-icons" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools + +FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" + diff --git a/packages/uclibc/uclibc-0.9.29/adsp-bf537-stamp/.mtn2git_empty b/packages/gpe-login/gpe-login-0.90/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uclibc/uclibc-0.9.29/adsp-bf537-stamp/.mtn2git_empty +++ b/packages/gpe-login/gpe-login-0.90/.mtn2git_empty diff --git a/packages/gpe-login/gpe-login-0.90/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.90/chvt-keylaunch.patch new file mode 100644 index 0000000000..798c059ccc --- /dev/null +++ b/packages/gpe-login/gpe-login-0.90/chvt-keylaunch.patch @@ -0,0 +1,12 @@ +--- /tmp/gpe-login.keylaunchrc 2006-05-29 23:46:42.806081576 +0200 ++++ gpe-login-0.87/gpe-login.keylaunchrc 2006-05-29 23:48:18.476537456 +0200 +@@ -1,3 +1,9 @@ + key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh + key=????XF86PowerDown:-:/usr/bin/apm --suspend + key=????Held XF86PowerDown:-:bl toggle ++ ++# VT changing ++key=...*Left:-:~chvt 1 ++key=...*Right:-:~chvt 3 ++key=...*Escape:-:~/etc/init.d/gpe-dm stop ++ diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb new file mode 100644 index 0000000000..609255e54e --- /dev/null +++ b/packages/gpe-login/gpe-login_0.90.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + + +SRC_URI += "file://removeblue-fontsize8.patch;patch=1" +SRC_URI += " file://chvt-keylaunch.patch;patch=1 " + +SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1" + diff --git a/packages/gpe-timesheet/gpe-timesheet_0.32.bb b/packages/gpe-timesheet/gpe-timesheet_0.32.bb new file mode 100644 index 0000000000..9a3b61106c --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet_0.32.bb @@ -0,0 +1,3 @@ +require gpe-timesheet.inc + +PR = "r0" diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index 7fa05d4716..6e35227f41 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -49,3 +49,4 @@ PACKAGES =+ "libgps" FILES_${PN} += "${sysconfdir}" FILES_libgps = "${libdir}/*.so*" +CONFFILES_${PN} = "${sysconfdir}/default/gpsd" diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb index 12ef7f47a3..d51d088807 100644 --- a/packages/gpsd/gpsd_2.28.bb +++ b/packages/gpsd/gpsd_2.28.bb @@ -1,2 +1,2 @@ require gpsd.inc -PR = "r2" +PR = "r3" diff --git a/packages/gpsd/gpsd_2.32.bb b/packages/gpsd/gpsd_2.32.bb index 1a5e608aa8..12ef7f47a3 100644 --- a/packages/gpsd/gpsd_2.32.bb +++ b/packages/gpsd/gpsd_2.32.bb @@ -1,2 +1,2 @@ require gpsd.inc -PR = "r1" +PR = "r2" diff --git a/packages/gpsd/gpsd_2.33.bb b/packages/gpsd/gpsd_2.33.bb index 02aef515da..a3b5b0bc25 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 = "r1" +PR = "r2" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 885a41dbda..726ba42481 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,3 +1,3 @@ require gpsd.inc -PR = "r1" +PR = "r2" diff --git a/packages/gsm/files/alive-start-if-interpreter-ready.patch b/packages/gsm/files/alive-start-if-interpreter-ready.patch new file mode 100644 index 0000000000..20104d2e3f --- /dev/null +++ b/packages/gsm/files/alive-start-if-interpreter-ready.patch @@ -0,0 +1,39 @@ +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-06-03 13:24:44.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-06-03 13:24:46.000000000 +0200 +@@ -185,6 +185,7 @@ + !strcmp(buf, "AT-Command Interpreter ready")) { + g->interpreter_ready = 1; + gsmd_initsettings(g); ++ gmsd_alive_start(g); + return 0; + } + +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-06-03 13:22:02.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-06-03 13:22:56.000000000 +0200 +@@ -128,7 +128,7 @@ + gsmd_timer_register(tmr); + } + +-static int gmsd_alive_start(struct gsmd *gsmd) ++int gmsd_alive_start(struct gsmd *gsmd) + { + struct timeval tv; + +@@ -478,10 +478,11 @@ + /* select a vendor plugin */ + gsmd_vendor_plugin_find(&g); + +- if (g.interpreter_ready) ++ if (g.interpreter_ready) { + gsmd_initsettings(&g); + +- gmsd_alive_start(&g); ++ gmsd_alive_start(&g); ++ } + + gsmd_opname_init(&g); + diff --git a/packages/gsm/files/extreplychars.patch b/packages/gsm/files/extreplychars.patch new file mode 100644 index 0000000000..8ebc343e27 --- /dev/null +++ b/packages/gsm/files/extreplychars.patch @@ -0,0 +1,70 @@ +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-06-03 10:46:19.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-06-03 15:54:53.000000000 +0200 +@@ -208,7 +208,7 @@ + * TBD + */ + +- if (buf[0] == '+' || buf[0] == '%') { ++ if (buf[0] == '+' || strchr(g->vendorpl->ext_chars, buf[0])) { + /* an extended response */ + const char *colon = strchr(buf, ':'); + if (!colon) { +@@ -255,7 +255,7 @@ + } + + if (cmd) { +- if (cmd->buf[2] != '+' && cmd->buf[2] != '%') { ++ if (cmd->buf[2] != '+' && strchr(g->vendorpl->ext_chars, cmd->buf[2]) == NULL) { + gsmd_log(GSMD_ERROR, "extd reply to non-extd command?\n"); + return -EINVAL; + } +Index: gsm/src/gsmd/vendor_qc.c +=================================================================== +--- gsm.orig/src/gsmd/vendor_qc.c 2007-06-03 10:46:19.000000000 +0200 ++++ gsm/src/gsmd/vendor_qc.c 2007-06-03 11:45:58.000000000 +0200 +@@ -97,6 +97,7 @@ + + struct gsmd_vendor_plugin gsmd_vendor_plugin = { + .name = "Qualcomm msm6250", ++ .ext_chars = "@", + .num_unsolicit = ARRAY_SIZE(qc_unsolicit), + .unsolicit = qc_unsolicit, + .detect = &qc_detect, +Index: gsm/src/gsmd/vendor_ti.c +=================================================================== +--- gsm.orig/src/gsmd/vendor_ti.c 2007-06-03 10:46:19.000000000 +0200 ++++ gsm/src/gsmd/vendor_ti.c 2007-06-03 11:45:58.000000000 +0200 +@@ -303,6 +303,7 @@ + + struct gsmd_vendor_plugin gsmd_vendor_plugin = { + .name = "TI Calypso", ++ .ext_chars = "%@", + .num_unsolicit = ARRAY_SIZE(ticalypso_unsolicit), + .unsolicit = ticalypso_unsolicit, + .detect = &ticalypso_detect, +Index: gsm/include/gsmd/vendorplugin.h +=================================================================== +--- gsm.orig/include/gsmd/vendorplugin.h 2007-02-16 15:12:40.000000000 +0100 ++++ gsm/include/gsmd/vendorplugin.h 2007-06-03 11:45:58.000000000 +0200 +@@ -12,6 +12,7 @@ + struct gsmd_vendor_plugin { + struct llist_head list; + unsigned char *name; ++ unsigned char *ext_chars; + unsigned int num_unsolicit; + const struct gsmd_unsolicit *unsolicit; + int (*detect)(struct gsmd *g); +Index: gsm/src/gsmd/vendor_tihtc.c +=================================================================== +--- gsm.orig/src/gsmd/vendor_tihtc.c 2007-06-03 15:55:31.000000000 +0200 ++++ gsm/src/gsmd/vendor_tihtc.c 2007-06-03 15:55:43.000000000 +0200 +@@ -298,6 +298,7 @@ + + struct gsmd_vendor_plugin gsmd_vendor_plugin = { + .name = "TI Calypso / HTC firmware", ++ .ext_chars = "%", + .num_unsolicit = ARRAY_SIZE(tihtc_unsolicit), + .unsolicit = tihtc_unsolicit, + .detect = &tihtc_detect, diff --git a/packages/gsm/files/getopt-wait-interpreter-ready.patch b/packages/gsm/files/getopt-wait-interpreter-ready.patch new file mode 100644 index 0000000000..52b0da1183 --- /dev/null +++ b/packages/gsm/files/getopt-wait-interpreter-ready.patch @@ -0,0 +1,57 @@ +Index: gsm/src/gsmd/gsmd.c +=================================================================== +--- gsm.orig/src/gsmd/gsmd.c 2007-06-03 11:57:43.000000000 +0200 ++++ gsm/src/gsmd/gsmd.c 2007-06-03 11:57:45.000000000 +0200 +@@ -311,6 +311,7 @@ + { "leak-report", 0, NULL, 'L' }, + { "vendor", 1, NULL, 'v' }, + { "machine", 1, NULL, 'm' }, ++ { "wait", 1, NULL, 'w' }, + { 0, 0, 0, 0 } + }; + +@@ -333,6 +334,7 @@ + "\t-l file\t--logfile file\tSpecify a logfile to log to\n" + "\t-v\t--vendor v\tSpecify GSM modem vendor plugin\n" + "\t-m\t--machine m\tSpecify GSM modem machine plugin\n" ++ "\t-w\t--wait m\tWait for the AT Interpreter Ready message\n" + ); + } + +@@ -362,6 +364,7 @@ + char *logfile = "syslog"; + char *vendor_name = NULL; + char *machine_name = NULL; ++ int wait = -1; + + signal(SIGTERM, sig_handler); + signal(SIGINT, sig_handler); +@@ -374,7 +377,7 @@ + print_header(); + + /*FIXME: parse commandline, set daemonize, device, ... */ +- while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:v:m:", opts, NULL)) != -1) { ++ while ((argch = getopt_long(argc, argv, "FVLdhp:s:l:v:m:w:", opts, NULL)) != -1) { + switch (argch) { + case 'V': + /* FIXME */ +@@ -411,6 +414,9 @@ + case 'm': + machine_name = optarg; + break; ++ case 'w': ++ wait = atoi(optarg); ++ break; + } + } + +@@ -455,6 +461,9 @@ + exit(1); + } + ++ if (wait >= 0) ++ g.interpreter_ready = !wait; ++ + if (atcmd_init(&g, fd) < 0) { + fprintf(stderr, "can't initialize UART device\n"); + exit(1); diff --git a/packages/gsm/files/plugin.patch b/packages/gsm/files/plugin.patch deleted file mode 100644 index 7f455ce718..0000000000 --- a/packages/gsm/files/plugin.patch +++ /dev/null @@ -1,935 +0,0 @@ -Index: gsm/include/gsmd/gsmd.h -=================================================================== ---- gsm.orig/include/gsmd/gsmd.h 2007-04-02 09:58:55.000000000 +0200 -+++ gsm/include/gsmd/gsmd.h 2007-04-02 11:03:41.000000000 +0200 -@@ -7,6 +7,7 @@ - - #include <common/linux_list.h> - -+#include <gsmd/machineplugin.h> - #include <gsmd/vendorplugin.h> - #include <gsmd/select.h> - #include <gsmd/state.h> -@@ -58,12 +59,14 @@ - - struct gsmd { - unsigned int flags; -+ int interpreter_ready; - struct gsmd_fd gfd_uart; - struct gsmd_fd gfd_sock; - struct llparser llp; - struct llist_head users; - struct llist_head pending_atcmds; /* our busy gsmd_atcmds */ - struct llist_head busy_atcmds; /* our busy gsmd_atcmds */ -+ struct gsmd_machine_plugin *machinepl; - struct gsmd_vendor_plugin *vendorpl; - struct gsmd_device_state dev_state; - -Index: gsm/include/gsmd/machineplugin.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gsm/include/gsmd/machineplugin.h 2007-04-02 11:03:41.000000000 +0200 -@@ -0,0 +1,24 @@ -+#ifndef _GSMD_MACHINEPLUG_H -+#define _GSMD_MACHINEPLUG_H -+ -+#ifdef __GSMD__ -+ -+#include <common/linux_list.h> -+#include <gsmd/gsmd.h> -+ -+struct gsmd; -+ -+struct gsmd_machine_plugin { -+ struct llist_head list; -+ unsigned char *name; -+ int (*detect)(struct gsmd *g); -+ int (*init)(struct gsmd *g, int fd); -+}; -+ -+extern int gsmd_machine_plugin_register(struct gsmd_machine_plugin *pl); -+extern void gsmd_machine_plugin_unregister(struct gsmd_machine_plugin *pl); -+extern int gsmd_machine_plugin_find(struct gsmd *g); -+ -+#endif /* __GSMD__ */ -+ -+#endif -Index: gsm/src/gsmd/machine_tihtc.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gsm/src/gsmd/machine_tihtc.c 2007-04-02 11:03:41.000000000 +0200 -@@ -0,0 +1,71 @@ -+/* TI [Calypso] with HTC firmware machine plugin -+ * -+ * Written by Philipp Zabel <philipp.zabel@gmail.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+#include <stdio.h> -+#include <errno.h> -+#include <sys/ioctl.h> -+ -+#include "gsmd.h" -+ -+#include <gsmd/gsmd.h> -+#include <gsmd/usock.h> -+#include <gsmd/event.h> -+#include <gsmd/talloc.h> -+#include <gsmd/extrsp.h> -+#include <gsmd/machineplugin.h> -+ -+#define N_TIHTC 17 -+ -+static int tihtc_detect(struct gsmd *g) -+{ -+ /* FIXME: do actual detection of machine if we have multiple machines */ -+ return 1; -+} -+ -+static int tihtc_init(struct gsmd *g, int fd) -+{ -+ int ldisc = N_TIHTC; -+ int rc; -+ -+ /* -+ * Himalaya, Blueangel, Alpine and Magican -+ * power up their GSM chipsets when the -+ * tty is opened. Wait for the "AT-Command -+ * Interpreter ready" message before trying -+ * to send commands. -+ */ -+ g->interpreter_ready = 0; -+ -+ /* Set the line discipline to N_TIHTC */ -+ rc = ioctl(fd, TIOCSETD, &ldisc); -+ if (rc < 0) -+ fprintf(stderr, "can't set line discipline\n"); -+ -+ return rc; -+} -+ -+struct gsmd_machine_plugin gsmd_machine_plugin = { -+ .name = "TI Calypso / HTC firmware", -+ .detect = &tihtc_detect, -+ .init = &tihtc_init, -+}; -Index: gsm/src/gsmd/machine_generic.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gsm/src/gsmd/machine_generic.c 2007-04-02 11:03:41.000000000 +0200 -@@ -0,0 +1,61 @@ -+/* generic machine plugin -+ * -+ * Written by Philipp Zabel <philipp.zabel@gmail.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+#include <stdio.h> -+#include <errno.h> -+ -+#include "gsmd.h" -+ -+#include <gsmd/gsmd.h> -+#include <gsmd/usock.h> -+#include <gsmd/event.h> -+#include <gsmd/talloc.h> -+#include <gsmd/extrsp.h> -+#include <gsmd/machineplugin.h> -+ -+static int generic_detect(struct gsmd *g) -+{ -+ /* FIXME: do actual detection of machine if we have multiple machines */ -+ return 1; -+} -+ -+static int generic_init(struct gsmd *g, int fd) -+{ -+ int rc; -+ -+ /* -+ * We assume that the GSM chipset can take -+ * input immediately, so we don't have to -+ * wait for the "AT-Command Interpreter ready" -+ * message before trying to send commands. -+ */ -+ g->interpreter_ready = 1; -+ -+ return 0; -+} -+ -+struct gsmd_machine_plugin gsmd_machine_plugin = { -+ .name = "generic", -+ .detect = &generic_detect, -+ .init = &generic_init, -+}; -Index: gsm/src/gsmd/machine.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gsm/src/gsmd/machine.c 2007-04-02 13:43:04.000000000 +0200 -@@ -0,0 +1,140 @@ -+/* gsmd machine plugin core -+ * -+ * Written by Philipp Zabel <philipp.zabel@gmail.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include <dlfcn.h> -+#include <errno.h> -+#include <stdio.h> -+#include <string.h> -+ -+#include <common/linux_list.h> -+ -+#include "gsmd.h" -+ -+#include <gsmd/gsmd.h> -+#include <gsmd/machineplugin.h> -+ -+static LLIST_HEAD(machinepl_list); -+ -+int gsmd_machine_plugin_register(struct gsmd_machine_plugin *pl) -+{ -+ llist_add(&pl->list, &machinepl_list); -+ -+ return 0; -+} -+ -+void gsmd_machine_plugin_unregister(struct gsmd_machine_plugin *pl) -+{ -+ llist_del(&pl->list); -+} -+ -+int gsmd_machine_plugin_find(struct gsmd *g) -+{ -+ struct gsmd_machine_plugin *pl; -+ -+ if (g->machinepl) -+ return -EEXIST; -+ -+ llist_for_each_entry(pl, &machinepl_list, list) { -+ if (pl->detect(g) == 1) { -+ DEBUGP("selecting machine plugin \"%s\"\n", pl->name); -+ g->machinepl = pl; -+ return 1; -+ } -+ } -+ -+ return 0; -+} -+ -+int gsmd_machine_plugin_load(char *name) -+{ -+ int rc = -1; -+ void *plugin; -+ struct gsmd_machine_plugin *pl; -+ char buf[128]; -+ -+ DEBUGP("loading machine plugin \"%s\"\n", name); -+ -+ snprintf(buf, sizeof(buf), PLUGINDIR"/libgsmd-machine_%s.so", name); -+ -+ plugin = dlopen(buf, RTLD_LAZY); -+ if (!plugin) { -+ fprintf(stderr, "gsmd_machine_plugin_load: %s\n", dlerror()); -+ return -1; -+ } -+ -+ pl = dlsym(plugin, "gsmd_machine_plugin"); -+ if (pl) -+ rc = gsmd_machine_plugin_register(pl); -+ else -+ dlclose(plugin); -+ -+ return rc; -+} -+ -+/* maybe /etc/gsmd/cpuinfo */ -+struct machines { -+ char *cpuinfo; -+ char *machine; -+ char *vendor; -+} machines[] = { -+ { "GTA01", "generic", "ti" }, -+ { "HTC Blueangel", "tihtc", "tihtc" }, -+ { "HTC Himalaya", "tihtc", "tihtc" }, -+ { "HTC Magician", "tihtc", "tihtc" }, -+ { "HTC Universal", "generic", "qc" }, -+ { NULL, NULL, NULL }, -+}; -+ -+int gsmd_machine_plugin_init(struct gsmd *g, int fd) -+{ -+ FILE *cpuinfo; -+ char buf[1024]; -+ char *line, *machine = NULL; -+ int i, rc; -+ -+ cpuinfo = fopen("/proc/cpuinfo", "r"); -+ fread(buf, sizeof(buf), 1, cpuinfo); -+ fclose(cpuinfo); -+ -+ line = strtok(buf, "\n"); -+ while (line = strtok(NULL, "\n")) { -+ if (strncmp(line, "Hardware\t: ", 11) == 0) { -+ machine = line+11; -+ break; -+ } -+ } -+ /* FIXME: do this dynamically */ -+ if (machine) { -+ for (i = 0; machines[i].cpuinfo; i++) { -+ if (strcmp(machine, machines[i].cpuinfo) == 0) { -+ DEBUGP("detected %s\n", machine); -+ rc = gsmd_machine_plugin_load(machines[i].machine); -+ rc |= gsmd_vendor_plugin_load(machines[i].vendor); -+ return rc; -+ } -+ } -+ } -+ /* load generic machine and all vendor plugins */ -+ rc = gsmd_machine_plugin_load("generic"); -+ gsmd_vendor_plugin_load("ti"); -+ gsmd_vendor_plugin_load("tihtc"); -+ gsmd_vendor_plugin_load("qc"); -+ return rc; -+} -Index: gsm/src/gsmd/vendor_qc.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gsm/src/gsmd/vendor_qc.c 2007-04-02 11:03:41.000000000 +0200 -@@ -0,0 +1,104 @@ -+/* Qualcomm [msm6250] gsmd plugin -+ * -+ * Written by Philipp Zabel <philipp.zabel@gmail.com> -+ * based on vendor_ti.c -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+#include <stdio.h> -+#include <errno.h> -+ -+#include "gsmd.h" -+ -+#include <gsmd/gsmd.h> -+#include <gsmd/usock.h> -+#include <gsmd/event.h> -+#include <gsmd/talloc.h> -+#include <gsmd/extrsp.h> -+#include <gsmd/atcmd.h> -+#include <gsmd/vendorplugin.h> -+#include <gsmd/unsolicited.h> -+ -+static int htccsq_parse(char *buf, int len, const char *param, -+ struct gsmd *gsmd) -+{ -+ char *tok; -+ struct gsmd_evt_auxdata *aux; -+ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, -+ sizeof(*aux)); -+ static int rssi_table[] = { 0,5,10,15,20,25,99 }; /* FIXME */ -+ unsigned int i; -+ -+ DEBUGP("entering htccsq_parse param=`%s'\n", param); -+ if (!ucmd) -+ return -EINVAL; -+ -+ -+ aux = (struct gsmd_evt_auxdata *) ucmd->buf; -+ -+ i = atoi(buf); -+ if (i > 6) -+ i = 6; -+ aux->u.signal.sigq.rssi = rssi_table[atoi(buf)]; -+ aux->u.signal.sigq.ber = 99; -+ -+ DEBUGP("sending EVT_SIGNAL\n"); -+ usock_evt_send(gsmd, ucmd, GSMD_EVT_SIGNAL); -+ -+ return 0; -+ -+out_free_io: -+ free(ucmd); -+ return -EIO; -+} -+ -+static const struct gsmd_unsolicit qc_unsolicit[] = { -+ { "@HTCCSQ", &htccsq_parse }, /* Signal Quality */ -+ -+ /* FIXME: parse the below and generate the respective events */ -+ -+ /* %CGREG: reports extended information about GPRS registration state */ -+}; -+ -+static int qc_detect(struct gsmd *g) -+{ -+ /* FIXME: do actual detection of vendor if we have multiple vendors */ -+ /* open /proc/cpuinfo and check for HTC Universal? */ -+ return 1; -+} -+ -+static int qc_initsettings(struct gsmd *g) -+{ -+ int rc; -+ struct gsmd_atcmd *cmd; -+ -+ /* enable @HTCCSQ: signal quality reports */ -+ rc |= gsmd_simplecmd(g, "AT@HTCCSQ=1"); -+ -+ return rc; -+} -+ -+struct gsmd_vendor_plugin gsmd_vendor_plugin = { -+ .name = "Qualcomm msm6250", -+ .num_unsolicit = ARRAY_SIZE(qc_unsolicit), -+ .unsolicit = qc_unsolicit, -+ .detect = &qc_detect, -+ .initsettings = &qc_initsettings, -+}; -Index: gsm/src/gsmd/Makefile.am -=================================================================== ---- gsm.orig/src/gsmd/Makefile.am 2007-04-02 09:58:55.000000000 +0200 -+++ gsm/src/gsmd/Makefile.am 2007-04-02 13:33:11.000000000 +0200 -@@ -1,11 +1,26 @@ - INCLUDES = $(all_includes) -I$(top_srcdir)/include - AM_CFLAGS = -std=gnu99 -+plugindir = $(libdir)/gsmd - - sbin_PROGRAMS = gsmd - --gsmd_SOURCES = gsmd.c atcmd.c select.c vendor.c usock.c unsolicited.c log.c \ -- vendor_ti.c talloc.c operator_cache.c ext_response.c --#gsmd_LDADD = ../libgsmd/libgsmd.la --#gsmd_LDFLAGS = -dynamic -+gsmd_CFLAGS = -D PLUGINDIR=\"$(plugindir)\" -+gsmd_SOURCES = gsmd.c atcmd.c select.c machine.c vendor.c unsolicited.c log.c \ -+ usock.c talloc.c operator_cache.c ext_response.c -+gsmd_LDADD = -ldl -+gsmd_LDFLAGS = -Wl,--export-dynamic -+ -+plugin_LTLIBRARIES = libgsmd-machine_generic.la \ -+ libgsmd-machine_tihtc.la \ -+ libgsmd-vendor_ti.la \ -+ libgsmd-vendor_tihtc.la \ -+ libgsmd-vendor_qc.la -+ -+libgsmd_machine_generic_la_SOURCES = machine_generic.c -+libgsmd_machine_tihtc_la_SOURCES = machine_tihtc.c -+ -+libgsmd_vendor_ti_la_SOURCES = vendor_ti.c -+libgsmd_vendor_tihtc_la_SOURCES = vendor_tihtc.c -+libgsmd_vendor_qc_la_SOURCES = vendor_qc.c - - noinst_HEADERS = gsmd.h -Index: gsm/src/gsmd/atcmd.c -=================================================================== ---- gsm.orig/src/gsmd/atcmd.c 2007-04-02 11:03:40.000000000 +0200 -+++ gsm/src/gsmd/atcmd.c 2007-04-02 11:03:41.000000000 +0200 -@@ -183,6 +183,7 @@ - * an empty string or that 'ready' string, we need to init the modem */ - if (strlen(buf) == 0 || - !strcmp(buf, "AT-Command Interpreter ready")) { -+ g->interpreter_ready = 1; - gsmd_initsettings(g); - return 0; - } -@@ -370,7 +371,7 @@ - } - - /* write pending commands to UART */ -- if (what & GSMD_FD_WRITE) { -+ if ((what & GSMD_FD_WRITE) && g->interpreter_ready) { - struct gsmd_atcmd *pos, *pos2; - llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) { - len = strlen(pos->buf); -Index: gsm/src/gsmd/vendor_tihtc.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gsm/src/gsmd/vendor_tihtc.c 2007-04-02 13:16:45.000000000 +0200 -@@ -0,0 +1,305 @@ -+/* TI [Calypso] with HTC firmware gsmd plugin -+ * -+ * Written by Philipp Zabel <philipp.zabel@gmail.com> -+ * based on vendor_ti.c -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ */ -+ -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+#include <stdio.h> -+#include <errno.h> -+ -+#include "gsmd.h" -+ -+#include <gsmd/gsmd.h> -+#include <gsmd/usock.h> -+#include <gsmd/event.h> -+#include <gsmd/talloc.h> -+#include <gsmd/extrsp.h> -+#include <gsmd/atcmd.h> -+#include <gsmd/vendorplugin.h> -+#include <gsmd/unsolicited.h> -+ -+static int gsmd_test_atcb(struct gsmd_atcmd *cmd, void *ctx, char *resp) -+{ -+ printf("`%s' returned `%s'\n", cmd->buf, resp); -+ return 0; -+} -+ -+int gsmd_simplecmd(struct gsmd *gsmd, char *cmdtxt) -+{ -+ struct gsmd_atcmd *cmd; -+ cmd = atcmd_fill(cmdtxt, strlen(cmdtxt)+1, &gsmd_test_atcb, NULL, 0); -+ if (!cmd) -+ return -ENOMEM; -+ -+ return atcmd_submit(gsmd, cmd); -+} -+ -+ -+#if 0 -+#include "vendorplugin.h" -+ -+static int -+ti_getopt(struct gsmd *gh, int optname, void *optval, int *optlen) -+{ -+ switch (optname) { -+ case GSMD_OPT_CIPHER_IND: -+ /* FIXME: send AT%CPRI=? */ -+ break; -+ default: -+ return -EINVAL; -+ } -+} -+ -+static int -+ti_setopt(struct gsmd *gh, int optname, const void *optval, int optlen) -+{ -+ switch (optname) { -+ case GSMD_OPT_CIPHER_IND: -+ /* FIXME: send AT%CPRI= */ -+ break; -+ default: -+ return -EINVAL; -+ } -+} -+ -+#endif -+ -+ -+static int htccsq_parse(char *buf, int len, const char *param, -+ struct gsmd *gsmd) -+{ -+ char *tok; -+ struct gsmd_evt_auxdata *aux; -+ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, -+ sizeof(*aux)); -+ -+ DEBUGP("entering htccsq_parse param=`%s'\n", param); -+ if (!ucmd) -+ return -EINVAL; -+ -+ -+ aux = (struct gsmd_evt_auxdata *) ucmd->buf; -+ -+ /* FIXME: contains values 1-5, should be mapped to 0-31 somehow? */ -+ /* 2 --> 11 */ -+ aux->u.signal.sigq.rssi = atoi(buf); -+ aux->u.signal.sigq.ber = 99; -+ -+ DEBUGP("sending EVT_SIGNAL\n"); -+ usock_evt_send(gsmd, ucmd, GSMD_EVT_SIGNAL); -+ -+ return 0; -+ -+out_free_io: -+ free(ucmd); -+ return -EIO; -+} -+ -+static int cpri_parse(char *buf, int len, const char *param, struct gsmd *gsmd) -+{ -+ char *tok1, *tok2; -+ -+ tok1 = strtok(buf, ","); -+ if (!tok1) -+ return -EIO; -+ -+ tok2 = strtok(NULL, ","); -+ if (!tok2) { -+ switch (atoi(tok1)) { -+ case 0: -+ gsmd->dev_state.ciph_ind.flags &= ~GSMD_CIPHIND_ACTIVE; -+ break; -+ case 1: -+ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_ACTIVE; -+ break; -+ case 2: -+ gsmd->dev_state.ciph_ind.flags |= GSMD_CIPHIND_DISABLED_SIM; -+ break; -+ } -+ } else { -+ struct gsmd_evt_auxdata *aux; -+ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, -+ GSMD_EVT_CIPHER, -+ sizeof(*aux)); -+ if (!ucmd) -+ return -ENOMEM; -+ -+ aux = (struct gsmd_evt_auxdata *) ucmd->buf; -+ -+ aux->u.cipher.net_state_gsm = atoi(tok1); -+ aux->u.cipher.net_state_gsm = atoi(tok2); -+ -+ usock_evt_send(gsmd, ucmd, GSMD_EVT_CIPHER); -+ } -+ -+ return 0; -+} -+ -+/* Call Progress Information */ -+static int cpi_parse(char *buf, int len, const char *param, struct gsmd *gsmd) -+{ -+ char *tok; -+ struct gsmd_evt_auxdata *aux; -+ struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, -+ GSMD_EVT_OUT_STATUS, -+ sizeof(*aux)); -+ -+ DEBUGP("entering cpi_parse param=`%s'\n", param); -+ if (!ucmd) -+ return -EINVAL; -+ -+ aux = (struct gsmd_evt_auxdata *) ucmd->buf; -+ -+ /* Format: cId, msgType, ibt, tch, dir,[mode],[number],[type],[alpha],[cause],line */ -+ -+ /* call ID */ -+ tok = strtok(buf, ","); -+ if (!tok) -+ goto out_free_io; -+ -+ /* message type (layer 3) */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_free_io; -+ aux->u.call_status.prog = atoi(tok); -+ -+ /* in-band tones */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_free_io; -+ -+ if (*tok == '1') -+ aux->u.call_status.ibt = 1; -+ else -+ aux->u.call_status.ibt = 0; -+ -+ /* TCH allocated */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_free_io; -+ -+ if (*tok == '1') -+ aux->u.call_status.tch = 1; -+ else -+ aux->u.call_status.tch = 0; -+ -+ /* direction */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_send; -+ -+ switch (*tok) { -+ case '0': -+ case '1': -+ case '2': -+ case '3': -+ aux->u.call_status.dir = (*tok - '0'); -+ break; -+ default: -+ break; -+ } -+ -+ /* mode */ -+ tok = strtok(NULL, ","); -+ if (!tok) -+ goto out_send; -+ -+out_send: -+ usock_evt_send(gsmd, ucmd, GSMD_EVT_OUT_STATUS); -+ -+ return 0; -+ -+out_free_io: -+ talloc_free(ucmd); -+ return -EIO; -+} -+ -+static const struct gsmd_unsolicit tihtc_unsolicit[] = { -+ { "%HTCCSQ", &htccsq_parse }, /* Signal Quality */ -+ { "%CPRI", &cpri_parse }, /* Ciphering Indication */ -+ { "%CPI", &cpi_parse }, /* Call Progress Information */ -+ -+ /* FIXME: parse the below and generate the respective events */ -+ -+ /* %CGREG: reports extended information about GPRS registration state */ -+}; -+ -+static int cpi_detect_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) -+{ -+ struct gsmd *g = ctx; -+ struct gsm_extrsp *er; -+ -+ if (strncmp(resp, "%CPI: ", 6)) -+ return -EINVAL; -+ resp += 6; -+ -+ er = extrsp_parse(cmd, resp); -+ if (!er) -+ return -EINVAL; -+ -+ if (extrsp_supports(er, 0, 3)) -+ return gsmd_simplecmd(g, "AT%CPI=3"); -+ else if (extrsp_supports(er, 0, 2)) -+ return gsmd_simplecmd(g, "AT%CPI=2"); -+ else -+ DEBUGP("Call Progress Indication mode 2 or 3 not supported!!\n"); -+ -+ talloc_free(er); -+ return 0; -+} -+ -+static int tihtc_detect(struct gsmd *g) -+{ -+ /* FIXME: do actual detection of vendor if we have multiple vendors */ -+ /* open /proc/cpuinfo and check for HTC Magician or HTC Blueangel? */ -+ /* check for N_TIHTC ldisc? or set it ourselves? */ -+ return 1; -+} -+ -+static int tihtc_initsettings(struct gsmd *g) -+{ -+ int rc; -+ struct gsmd_atcmd *cmd; -+ -+ /* use %CGREG */ -+ //rc |= gsmd_simplecmd(g, "AT%CGREG=3"); -+ /* enable %CPRI: ciphering indications */ -+ rc |= gsmd_simplecmd(g, "AT%CPRI=1"); -+ /* enable %HTCCSQ: signal quality reports */ -+ rc |= gsmd_simplecmd(g, "AT%HTCCSQ=1"); -+ /* send unsolicited commands at any time */ -+ rc |= gsmd_simplecmd(g, "AT%CUNS=0"); -+ -+ /* enable %CPI: call progress indication */ -+ cmd = atcmd_fill("AT%CPI=?", 9, &cpi_detect_cb, g, 0); -+ if (cmd) -+ atcmd_submit(g, cmd); -+ -+ return rc; -+} -+ -+struct gsmd_vendor_plugin gsmd_vendor_plugin = { -+ .name = "TI Calypso / HTC firmware", -+ .num_unsolicit = ARRAY_SIZE(tihtc_unsolicit), -+ .unsolicit = tihtc_unsolicit, -+ .detect = &tihtc_detect, -+ .initsettings = &tihtc_initsettings, -+}; -Index: gsm/src/gsmd/vendor_ti.c -=================================================================== ---- gsm.orig/src/gsmd/vendor_ti.c 2007-04-02 09:58:55.000000000 +0200 -+++ gsm/src/gsmd/vendor_ti.c 2007-04-02 11:03:41.000000000 +0200 -@@ -301,16 +301,10 @@ - return rc; - } - --static struct gsmd_vendor_plugin plugin_ticalypso = { -+struct gsmd_vendor_plugin gsmd_vendor_plugin = { - .name = "TI Calypso", - .num_unsolicit = ARRAY_SIZE(ticalypso_unsolicit), - .unsolicit = ticalypso_unsolicit, - .detect = &ticalypso_detect, - .initsettings = &ticalypso_initsettings, - }; -- --/* FIXME: this will be _init() when we make this a plugin */ --int ticalypso_init(void) --{ -- return gsmd_vendor_plugin_register(&plugin_ticalypso); --} -Index: gsm/src/gsmd/gsmd.c -=================================================================== ---- gsm.orig/src/gsmd/gsmd.c 2007-04-02 09:58:55.000000000 +0200 -+++ gsm/src/gsmd/gsmd.c 2007-04-02 13:39:40.000000000 +0200 -@@ -254,6 +254,21 @@ - exit(1); - } - -+ if (gsmd_machine_plugin_init(&g) < 0) { -+ fprintf(stderr, "no machine plugins found\n"); -+ exit(1); -+ } -+ -+ /* select a machine plugin and load possible vendor plugins */ -+ gsmd_machine_plugin_find(&g); -+ -+ /* initialize the machine plugin */ -+ if (g.machinepl->init) -+ if (g.machinepl->init(&g, fd) < 0) { -+ fprintf(stderr, "couldn't initialize machine plugin\n"); -+ exit(1); -+ } -+ - if (atcmd_init(&g, fd) < 0) { - fprintf(stderr, "can't initialize UART device\n"); - exit(1); -@@ -275,12 +290,11 @@ - setsid(); - } - -- /* FIXME: do this dynamically */ -- ticalypso_init(); -- -+ /* select a vendor plugin */ - gsmd_vendor_plugin_find(&g); - -- gsmd_initsettings(&g); -+ if (g.interpreter_ready) -+ gsmd_initsettings(&g); - - gsmd_opname_init(&g); - -Index: gsm/src/gsmd/vendor.c -=================================================================== ---- gsm.orig/src/gsmd/vendor.c 2007-04-02 09:58:55.000000000 +0200 -+++ gsm/src/gsmd/vendor.c 2007-04-02 13:38:38.000000000 +0200 -@@ -20,7 +20,10 @@ - * - */ - -+#include <dlfcn.h> - #include <errno.h> -+#include <stdio.h> -+#include <string.h> - - #include <common/linux_list.h> - -@@ -52,6 +55,7 @@ - - llist_for_each_entry(pl, &vendorpl_list, list) { - if (pl->detect(g) == 1) { -+ DEBUGP("selecting vendor plugin \"%s\"\n", pl->name); - g->vendorpl = pl; - return 1; - } -@@ -59,3 +63,29 @@ - - return 0; - } -+ -+int gsmd_vendor_plugin_load(char *name) -+{ -+ int rc = -1; -+ void *lib; -+ struct gsmd_vendor_plugin *pl; -+ char buf[128]; -+ -+ DEBUGP("loading vendor plugin \"%s\"\n", name); -+ -+ snprintf(buf, sizeof(buf), PLUGINDIR"/libgsmd-vendor_%s.so", name); -+ -+ lib = dlopen(buf, RTLD_LAZY); -+ if (!lib) { -+ fprintf(stderr, "gsmd_vendor_plugin_load: %s\n", dlerror()); -+ return -1; -+ } -+ -+ pl = dlsym(lib, "gsmd_vendor_plugin"); -+ if (pl) -+ rc = gsmd_vendor_plugin_register(pl); -+ else -+ dlclose(lib); -+ -+ return rc; -+} diff --git a/packages/gsm/files/qualcomm-extreply.patch b/packages/gsm/files/qualcomm-extreply.patch deleted file mode 100644 index 010a8c9f31..0000000000 --- a/packages/gsm/files/qualcomm-extreply.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gsm/src/gsmd/atcmd.c -=================================================================== ---- gsm.orig/src/gsmd/atcmd.c 2007-04-02 09:59:16.000000000 +0200 -+++ gsm/src/gsmd/atcmd.c 2007-04-02 10:10:54.000000000 +0200 -@@ -207,7 +207,7 @@ - * TBD - */ - -- if (buf[0] == '+' || buf[0] == '%') { -+ if (buf[0] == '+' || buf[0] == '%' || buf[0] == '@') { - /* an extended response */ - const char *colon = strchr(buf, ':'); - if (!colon) { diff --git a/packages/gsm/files/tihtc-csq-fix.patch b/packages/gsm/files/tihtc-csq-fix.patch new file mode 100644 index 0000000000..3346d85809 --- /dev/null +++ b/packages/gsm/files/tihtc-csq-fix.patch @@ -0,0 +1,27 @@ +Index: gsm/src/gsmd/vendor_tihtc.c +=================================================================== +--- gsm.orig/src/gsmd/vendor_tihtc.c 2007-06-03 16:26:39.000000000 +0200 ++++ gsm/src/gsmd/vendor_tihtc.c 2007-06-03 16:26:41.000000000 +0200 +@@ -90,6 +90,8 @@ + struct gsmd_evt_auxdata *aux; + struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_SIGNAL, + sizeof(*aux)); ++ static int rssi_table[] = { 0,5,10,15,20,25,99 }; ++ unsigned int i; + + DEBUGP("entering htccsq_parse param=`%s'\n", param); + if (!ucmd) +@@ -98,9 +100,10 @@ + + aux = (struct gsmd_evt_auxdata *) ucmd->buf; + +- /* FIXME: contains values 1-5, should be mapped to 0-31 somehow? */ +- /* 2 --> 11 */ +- aux->u.signal.sigq.rssi = atoi(buf); ++ i = atoi(buf); ++ if (i > 6) ++ i = 6; ++ aux->u.signal.sigq.rssi = rssi_table[atoi(buf)]; + aux->u.signal.sigq.ber = 99; + + DEBUGP("sending EVT_SIGNAL\n"); diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 0215bb92b9..230d4d6fe5 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,16 +4,17 @@ LICENSE = "GPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.0+svn${SRCDATE}" -PR = "r10" +PR = "r13" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ - file://default" -S = "${WORKDIR}/gsm" + file://default \ + file://extreplychars.patch;patch=1 \ + file://getopt-wait-interpreter-ready.patch;patch=1 \ + file://alive-start-if-interpreter-ready.patch;patch=1 \ + file://tihtc-csq-fix.patch;patch=1" -SRC_URI_append_magician = " file://plugin.patch;patch=1" -SRC_URI_append_htcuniversal = " file://plugin.patch;patch=1 \ - file://qualcomm-extreply.patch;patch=1" +S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d diff --git a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch b/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch new file mode 100644 index 0000000000..6feb0060c5 --- /dev/null +++ b/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch @@ -0,0 +1,12 @@ +diff -Naur kdenox-orig/konq-embed/dropin/kapplication.h kdenox/konq-embed/dropin/kapplication.h +--- kdenox-orig/konq-embed/dropin/kapplication.h 2007-02-12 10:25:57.000000000 +0100 ++++ kdenox/konq-embed/dropin/kapplication.h 2007-03-15 06:07:32.000000000 +0100 +@@ -122,7 +122,7 @@ + // required since kdelibs 3.4 + void updateUserTimestamp(unsigned long = 0) {} + +- static int KApplication::startDragDistance(); ++ static int startDragDistance(); + + signals: + // required by KHTMLView diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch b/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch new file mode 100644 index 0000000000..1079d23fbf --- /dev/null +++ b/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch @@ -0,0 +1,756 @@ +diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m4 +--- kdenox/acinclude.m4 2007-02-12 22:26:21.000000000 +1300 ++++ kdenox_new/acinclude.m4 2007-02-25 22:00:27.000000000 +1300 +@@ -880,7 +880,7 @@ + ) + + AC_ARG_ENABLE( +- embedded, ++ rtti-embedded, + AC_HELP_STRING([--enable-rtti-embedded],[enable rtti support for Qt-embedded]), + kde_use_qt_emb_rtti=$enableval, + kde_use_qt_emb_rtti=no +diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.in +--- kdenox/configure.in 2007-02-12 22:26:21.000000000 +1300 ++++ kdenox_new/configure.in 2007-02-25 17:49:59.000000000 +1300 +@@ -60,10 +60,10 @@ + + + if test "x$want_qpe" = "xyes"; then +- AC_PATH_QTOPIA(2.1.1) ++ AC_PATH_QTOPIA(1.0.0) + dnl hack + CXXFLAGS="$CXXFLAGS -D_QT_QPE_" +- LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2" ++ dnl LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2" + fi + + dnl Checks for header files. +diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configure.in.in +--- kdenox/configure.in.in 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/configure.in.in 2007-02-25 17:49:27.000000000 +1300 +@@ -56,10 +56,10 @@ + + + if test "x$want_qpe" = "xyes"; then +- AC_PATH_QTOPIA(2.1.1) ++ AC_PATH_QTOPIA(1.0.0) + dnl hack + CXXFLAGS="$CXXFLAGS -D_QT_QPE_" +- LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2" ++ dnl LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2" + fi + + dnl Checks for header files. +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox_new/konq-embed/dropin/kfiledialog.cpp +--- kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-12 22:25:57.000000000 +1300 ++++ kdenox_new/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300 +@@ -23,6 +23,7 @@ + + + #include "kfiledialog.h" ++#include "kdebug.h" + + #include <qlayout.h> + #include <qconfig.h> +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp +--- kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300 +@@ -23,7 +23,9 @@ + */ + + #include "kprotocolmanager.h" ++#include <kdebug.h> + #include <kglobal.h> ++#include <klocale.h> + #include <kconfig.h> + #include <ioslave_defaults.h> + #include <kdeversion.h> +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox_new/konq-embed/dropin/kio/progressbase.cpp +--- kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-12 22:25:56.000000000 +1300 ++++ kdenox_new/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300 +@@ -18,6 +18,7 @@ + + #include "jobclasses.h" + #include "progressbase.h" ++#include <kdebug.h> + + //namespace KIO { + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/konq-embed/ipkg/preinst +--- kdenox/konq-embed/ipkg/preinst 1970-01-01 12:00:00.000000000 +1200 ++++ kdenox_new/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300 +@@ -0,0 +1,15 @@ ++#!/bin/sh ++ ++prefix=/usr/kde/3.5 ++prunefiles="lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4.0.0" ++prunefiles="$prunefiles lib/libkhtml.so.4" ++prunefiles="$prunefiles lib/kjs_html.la lib/kjs_html.so" ++ ++for _file in $prunefiles; do ++ file=$PKG_ROOT/$prefix/$_file; ++ if [ -f $file ]; then ++ echo "found old file $_file from b0rked konqueror ipkg. removing." ++ rm -f $file ++ fi ++done ++ +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h +--- kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-12 21:31:39.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.000000000 +1300 +@@ -26,6 +26,8 @@ + #include <qvaluelist.h> + #include "kdelibs_export.h" + ++#define QPtrList QList ++ + class KMultipleDragPrivate; + /** + * This class makes it easy for applications to provide a drag object +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am +--- kdenox/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-25 16:36:23.000000000 +1300 +@@ -39,7 +39,7 @@ + INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ + -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \ + -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \ +- -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes) ++ -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes) + + cssdir = $(kde_datadir)/khtml/css + css_DATA = html4.css quirks.css +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am +--- kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-25 16:35:07.000000000 +1300 +@@ -47,7 +47,7 @@ + # css_extensions.h + + INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ +- -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes) ++ -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes) + + SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am +--- kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-25 17:24:35.000000000 +1300 +@@ -16,7 +16,7 @@ + # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + # Boston, MA 02110-1301, USA. + +-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes) ++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes) + + KDE_CXXFLAGS = $(USE_EXCEPTIONS) + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp +--- kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-25 17:27:39.000000000 +1300 +@@ -38,6 +38,10 @@ + #include <qobject.h> + #include <kdebug.h> + ++#if (QT_VERSION < 0x030000) ++#include "qt3regexp.h" ++#endif ++ + #ifdef APPLE_CHANGES + #include "KWQLoader.h" + #else +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am +--- kdenox/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-25 16:39:50.000000000 +1300 +@@ -43,7 +43,7 @@ + -I$(top_srcdir)/kio/kssl \ + -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \ + -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \ +- -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes) ++ -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes) + + # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf + doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp +--- kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-25 17:22:46.000000000 +1300 +@@ -3221,14 +3221,14 @@ + { + khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent()); + s = parent->text(); +- s = s.replace(0xa0, ' '); ++ s = s.replace(QRegExp(QString(QChar(0xa0))), ' '); + tmpTextArea = parent; + } + else if ( renderLineText ) + { + khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj); + s = parentLine->widget()->text(); +- s = s.replace(0xa0, ' '); ++ s = s.replace(QRegExp(QString(QChar(0xa0))), ' '); + } + else if ( obj->isText() ) + { +@@ -3256,7 +3256,7 @@ + if ( isLink && obj->parent()!=tmpTextArea ) + { + s = static_cast<khtml::RenderText *>(obj)->data().string(); +- s = s.replace(0xa0, ' '); ++ s = s.replace(QRegExp(QString(QChar(0xa0))), ' '); + } + } + else if ( obj->isBR() ) +@@ -6785,9 +6785,9 @@ + // get selected text and paste to the clipboard + #ifndef QT_NO_CLIPBOARD + QString text = selectedText(); +- text.replace(QChar(0xa0), ' '); ++ text.replace(QRegExp(QString(QChar(0xa0))), " "); + disconnect( kapp->clipboard(), SIGNAL( selectionChanged()), this, SLOT( slotClearSelection())); +- kapp->clipboard()->setText(text,QClipboard::Selection); ++ kapp->clipboard()->setText(text); + connect( kapp->clipboard(), SIGNAL( selectionChanged()), SLOT( slotClearSelection())); + #endif + //kdDebug( 6000 ) << "selectedText = " << text << endl; +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am +--- kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-25 16:33:47.000000000 +1300 +@@ -32,7 +32,7 @@ + stringit.h htmlhashes.h helper.h shared.h arena.h + + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \ +- -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes) ++ -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes) + + SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am +--- kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-25 16:40:50.000000000 +1300 +@@ -42,7 +42,7 @@ + render_generated.h enumerate.h + + INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ +- -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes) ++ -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes) + + SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h +--- kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-12 21:31:42.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-25 16:56:00.000000000 +1300 +@@ -46,12 +46,14 @@ + + #include <qcolor.h> + #include <qrect.h> ++#include <qtextstream.h> + #include <assert.h> + + #include "render_object.h" + + class QScrollBar; +-template <class T> class QPtrVector; ++template <class T> class QVector; ++#define QPtrVector QVector + + namespace khtml { + class RenderStyle; +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp +--- kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-25 16:44:58.000000000 +1300 +@@ -46,6 +46,7 @@ + #include <kdebug.h> + #include <kglobal.h> + #include <qpainter.h> ++#include <qtextstream.h> + #include "khtmlview.h" + #include <khtml_part.h> + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h +--- kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-25 16:56:49.000000000 +1300 +@@ -30,6 +30,7 @@ + #include <qcolor.h> + #include <qptrvector.h> + #include <qmemarray.h> ++#include <qtextstream.h> + + #include "rendering/render_box.h" + #include "rendering/render_block.h" +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h +--- kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-25 16:46:39.000000000 +1300 +@@ -31,6 +31,7 @@ + #include "rendering/render_line.h" + + #include <qptrvector.h> ++#include <qtextstream.h> + #include <assert.h> + + class QPainter; +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am +--- kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-25 16:38:27.000000000 +1300 +@@ -37,7 +37,7 @@ + + INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ + -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_srcdir)/kwallet/client \ +- -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes) ++ -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes) + + SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp +--- kdenox/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-25 18:22:33.000000000 +1300 +@@ -1,4 +1,9 @@ +-#ifndef KONQ_EMBEDDED ++#include <config.h> ++ ++#ifdef KONQ_EMBEDDED ++#include "stdlib.h" ++extern "C" double kjs_strtod(const char *s00, char **se) { return strtod(s00,se); } ++#else + /**************************************************************** + * + * The author of this software is David M. Gay. +@@ -175,8 +180,6 @@ + #undef CONST + #endif + +-#include <config.h> +- + #include "stdlib.h" + + #ifdef WORDS_BIGENDIAN +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox_new/konq-embed/kdesrc/kjs/dtoa.h +--- kdenox/konq-embed/kdesrc/kjs/dtoa.h 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.h 2007-02-25 18:20:51.000000000 +1300 +@@ -23,14 +23,11 @@ + #ifndef _KJS_DTOA_H_ + #define _KJS_DTOA_H_ + +-#ifndef KONQ_EMBEDDED + extern "C" double kjs_strtod(const char *s00, char **se); ++#ifndef KONQ_EMBEDDED + extern "C" char *kjs_dtoa(double d, int mode, int ndigits, + int *decpt, int *sign, char **rve); + extern "C" void kjs_freedtoa(char *s); +-#else +-#include "stdlib.h" +-extern "C" double kjs_strtod(const char *s00, char **se) { return strtod(s00,se); } + #endif +- ++ + #endif /* _KJS_DTOA_H */ +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp +--- kdenox/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300 +@@ -20,6 +20,8 @@ + * + */ + ++#include <config.h> ++ + #include "value.h" + #include "object.h" + #include "types.h" +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp +--- kdenox/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-12 22:26:20.000000000 +1300 ++++ kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-25 18:10:22.000000000 +1300 +@@ -21,9 +21,7 @@ + * + */ + +-#ifdef HAVE_CONFIG_H + #include <config.h> +-#endif + + #include <stdlib.h> + #include <stdio.h> +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox_new/konq-embed/src/actions/konqe.rc +--- kdenox/konq-embed/src/actions/konqe.rc 1970-01-01 12:00:00.000000000 +1200 ++++ kdenox_new/konq-embed/src/actions/konqe.rc 2007-02-25 21:20:10.000000000 +1300 +@@ -0,0 +1,107 @@ ++<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> ++<kpartgui name="konqe" version="1"> ++<Create> ++ <Action name="file_new" stdAction="true" icon="filenew.png"/> ++ <Action name="file_open" stdAction="true" icon="fileopen.png"/> ++ <Action name="file_save" stdAction="true" icon="filesave.png"/> ++ <Action name="file_save_as" stdAction="true" icon="filesaveas.png"/> ++ <Action name="file_print" stdAction="true" icon="fileprint.png"/> ++ <Action name="go_home" stdAction="true" icon="gohome.png"/> ++ <Action name="go_back" stdAction="true" icon="back.png"/> ++ <Action name="go_forward" stdAction="true" icon="forward.png"/> ++ <Action name="edit_undo" stdAction="true" icon="undo.png"/> ++ <Action name="edit_redo" stdAction="true" icon="redo.png"/> ++ <Action name="edit_cut" stdAction="true" icon="editcut.png"/> ++ <Action name="edit_copy" stdAction="true" icon="editcopy.png"/> ++ <Action name="edit_paste" stdAction="true" icon="editpaste.png"/> ++ <Action name="edit_find" stdAction="true" icon="find.png"/> ++ <Action name="view_redisplay" stdAction="true" icon="reload.png"/> ++ <Action name="view_zoom" stdAction="true" popupMenu="true" icon="viewmag.png"/> ++ <Action name="bookmark_add" stdAction="true" icon="bookmark_add.png"/> ++ <Action name="bookmark_edit" stdAction="true" accel="" icon="bookmark.png"/> ++ <Action name="options_configure" stdAction="true" icon="configure.png"/> ++</Create> ++<Create> ++ <Action name="windows" popupMenu="true" icon="window_list.png"> ++ <text>Windows List</text> ++ </Action> ++ <Action name="view_close" accel="Ctrl+W" icon="fileclose.png"> ++ <text>Close View</text> ++ </Action> ++ <Action name="view_next" accel="Ctrl+Tab" icon="2rightarrow.png"> ++ <text>Next View</text> ++ </Action> ++ <Action name="view_autoload_images" toggle="true"> ++ <text>Autoload Images</text> ++ </Action> ++ <Action name="go_stop" icon="stop.png"> ++ <text>Stop Loading</text> ++ </Action> ++ <Action name="info_security" icon="lock.png"> ++ <text>Show Security Information</text> ++ </Action> ++ <Action name="options_show_location" accel="F11" toggle="true"> ++ <text>Show Location Bar</text> ++ </Action> ++ <Action name="options_show_sidebar" accel="F12" toggle="true"> ++ <text>Show Side Bar</text> ++ </Action> ++ <Action name="options_show_statusbar" stdAction="true" accel="F10"/> ++ <Action name="main_menu" popupMenu="true" icon="gear.png"> ++ <text>Main Menu</text> ++ </Action> ++ <Action name="view_load_images" icon="images_display.png"> ++ <text>Load Images</text> ++ </Action> ++</Create> ++<Menu name="main_menu"> ++ <Action name="file_new"/> ++ <Separator/> ++ <Action name="view_autoload_images"/> ++ <Action name="options_show_statusbar"/> ++ <Action name="options_show_location"/> ++ <Action name="options_show_sidebar"/> ++ <Separator/> ++ <Action name="edit_find"/> ++ <Separator/> ++ <Action name="options_configure"/> ++ <Separator/> ++ <Action name="bookmark_add"/> ++ <Action name="bookmark_edit"/> ++ <Action name="bookmarks"/> ++ <Separator/> ++ <Action name="view_next"/> ++ <Action name="view_close"/> ++</Menu> ++<ToolBar name="main_bar"> ++ <Action name="main_menu"/> ++ <ToolBar name="browser_bar"/> ++ <ToolBar name="edit_bar"/> ++ <Spacer/> ++ <Action name="windows"/> ++</ToolBar> ++<ToolBar name="browser_bar" newline="true"> ++ <Action name="file_print"/> ++ <Action name="go_back"/> ++ <Action name="go_forward"/> ++ <Action name="go_home"/> ++ <Action name="view_redisplay"/> ++ <Action name="go_stop"/> ++ <Separator/> ++ <Action name="info_security"/> ++ <Action name="view_zoom"/> ++ <Action name="view_load_images"/> ++</ToolBar> ++<ToolBar name="edit_bar" newline="true"> ++ <Action name="file_open"/> ++ <Action name="file_save"/> ++ <Action name="file_save_as"/> ++ <Action name="file_print"/> ++ <Separator/> ++ <Action name="edit_undo"/> ++ <Action name="edit_redo"/> ++ <Action name="edit_cut"/> ++ <Action name="edit_copy"/> ++ <Action name="edit_paste"/> ++</ToolBar> ++</kpartgui> +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox_new/konq-embed/src/bookmarkeditimpl.cc +--- kdenox/konq-embed/src/bookmarkeditimpl.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/bookmarkeditimpl.cc 2007-02-25 19:17:29.000000000 +1300 +@@ -24,6 +24,8 @@ + + #include "bookmarkeditimpl.h" + ++#include <config.h> ++ + #if defined(ENABLE_BOOKMARKS) + + #include "mainwindowbase.h" +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox_new/konq-embed/src/bookmarkeditor.cc +--- kdenox/konq-embed/src/bookmarkeditor.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/bookmarkeditor.cc 2007-02-25 17:40:34.000000000 +1300 +@@ -16,6 +16,8 @@ + #include <qimage.h> + #include <qpixmap.h> + ++#include <kstandarddirs.h> ++ + namespace + { + QPixmap getPngPixmap( const QString &name ) +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc +--- kdenox/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-25 20:46:27.000000000 +1300 +@@ -22,11 +22,20 @@ + + */ + ++#include <config.h> ++ + #if defined(ENABLE_BOOKMARKS) + ++#include <xmltree.h> ++#include <qtoolbutton.h> ++#include <qlineedit.h> ++#include <qlabel.h> ++ + #include "bookmarkeditorhierarchical.h" + #include <assert.h> + #include "bookmarks.h" ++#include "bookmarkeditimpl.h" ++ + + //////// HELPER FUNCTIONS ///////////////////////////////// + namespace { +@@ -204,7 +213,7 @@ + void BookmarkEditorHierarchical::newFolder() + { + BookmarkEdit *edit = new BookmarkEdit( this ); +- edit->setCaption( i18n( "New Folder" ) ); ++ edit->setCaption( tr( "New Folder" ) ); + edit->location->setEnabled(false); + edit->location->hide(); + edit->TextLabel2->hide(); +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h +--- kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-25 18:27:17.000000000 +1300 +@@ -22,9 +22,10 @@ + #ifndef __bookmarkeditorhierarchical_h__ + #define __bookmarkeditorhierarchical_h__ + ++#include <config.h> ++ + #if defined(ENABLE_BOOKMARKS) + +-#include <config.h> + #include "bookmarkeditorimpl.h" + + class XMLElement; +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox_new/konq-embed/src/bookmarkeditorimpl.cc +--- kdenox/konq-embed/src/bookmarkeditorimpl.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/bookmarkeditorimpl.cc 2007-02-25 19:16:40.000000000 +1300 +@@ -23,12 +23,12 @@ + + #include "bookmarkeditorimpl.h" + ++#include <config.h> ++ + #if defined(ENABLE_BOOKMARKS) + + #include "bookmarkeditimpl.h" + +-#include <config.h> +- + #include "bookmarks.h" + #include "xmltree.h" + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_new/konq-embed/src/bookmarks.cc +--- kdenox/konq-embed/src/bookmarks.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300 +@@ -24,6 +24,8 @@ + + #if defined(ENABLE_BOOKMARKS) + ++#warning BOOKMARKS ARE ENABLED ++ + #include "bookmarks.h" + #include "xmltree.h" + #include "mainwindowbase.h" +@@ -39,6 +41,7 @@ + #include <qstring.h> + #include <qwidget.h> + #include <qfile.h> ++#include <qtimer.h> + + #include <klocale.h> + #include <kstandarddirs.h> +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_new/konq-embed/src/bookmarks.h +--- kdenox/konq-embed/src/bookmarks.h 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/bookmarks.h 2007-02-25 18:26:32.000000000 +1300 +@@ -34,6 +34,8 @@ + + #include <kurl.h> + ++#define QPtrList QList ++ + class QPopupMenu; + class XMLElement; + class ActionMenu; +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox_new/konq-embed/src/mainwindow_qpe.cc +--- kdenox/konq-embed/src/mainwindow_qpe.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/mainwindow_qpe.cc 2007-02-25 17:46:32.000000000 +1300 +@@ -90,7 +90,7 @@ + return iconSet; + } + +-void MainWindowBase::statusJustText( const QString &_msg, bool ) ++void MainWindowQPE::statusJustText( const QString &_msg, bool ) + { + QString msg = _msg; + msg.replace( QRegExp( "</?qt>" ), QString::null ); +@@ -99,7 +99,7 @@ + Global::statusMessage( msg ); + } + +-void MainWindowBase::statusMessage( const QString &_msg, bool visible ) ++void MainWindowQPE::statusMessage( const QString &_msg, bool visible ) + { + statusJustText( _msg, visible ); + } +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox_new/konq-embed/src/mainwindow_qpe.h +--- kdenox/konq-embed/src/mainwindow_qpe.h 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300 +@@ -39,6 +39,10 @@ + + protected: + virtual QIconSet loadPixmap( const char * const xpm[] ); ++ ++protected slots: ++ virtual void statusJustText( const QString &msg, bool visible ); ++ virtual void statusMessage( const QString &msg, bool visible ); + }; + + #endif +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox_new/konq-embed/src/mainwindow_road.cc +--- kdenox/konq-embed/src/mainwindow_road.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/mainwindow_road.cc 2007-02-25 20:32:12.000000000 +1300 +@@ -20,10 +20,11 @@ + + #ifdef KONQ_GUI_ROAD + ++#include <config.h> ++ + #include "mainwindow_road.h" + #include "popupaction.h" + +- + #include <qpopupmenu.h> + #include <qtoolbar.h> + #include <qaction.h> +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox_new/konq-embed/src/mainwindow_x11.cc +--- kdenox/konq-embed/src/mainwindow_x11.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/mainwindow_x11.cc 2007-02-25 20:33:10.000000000 +1300 +@@ -21,6 +21,8 @@ + + // Implementation of the X11 GUI + ++#include <config.h> ++ + #include "mainwindow_x11.h" + #include "popupaction.h" + +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox_new/konq-embed/src/roadtabbar.cc +--- kdenox/konq-embed/src/roadtabbar.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/roadtabbar.cc 2007-02-25 17:44:19.000000000 +1300 +@@ -18,6 +18,9 @@ + Boston, MA 02110-1301, USA. + */ + ++#include <qaction.h> ++#include <kconfig.h> ++ + #include "roadtabbar.h" + + RoadTabParams::RoadTabParams( const QIconSet &defaultIS, const QIconSet &loadingIS, +@@ -114,12 +117,12 @@ + + void RoadTabBar::initContextMenu() + { +- QAction *qa = new QAction( QString::null, i18n( "&Close Tab" ), 0, this, "contextTabClose" ); ++ QAction *qa = new QAction( QString::null, tr( "&Close Tab" ), 0, this, "contextTabClose" ); + connect( qa, SIGNAL( activated() ), this, SLOT( contextClose() ) ); + qa->addTo( &m_contextMenu ); + m_contextMenuCloseId = m_contextMenu.idAt( 0 ); + +- qa = new QAction( QString::null, i18n( "&New tab" ), 0, this, "contextTabNew" ); ++ qa = new QAction( QString::null, tr( "&New tab" ), 0, this, "contextTabNew" ); + connect( qa, SIGNAL( activated() ), this, SIGNAL( requestNewView() ) ); + qa->addTo( &m_contextMenu ); + } +@@ -184,7 +187,7 @@ + { + QString caption( text ); + if ( caption.isEmpty() ) +- caption = i18n( "Blank" ); ++ caption = tr( "Blank" ); + // the caption may not exceed a given width, so shorten it if necessary + // the following is inefficient, but clear, correct, and unlikely to be a bottleneck + if ( m_params.fontMetrics.width( caption ) > m_params.maxWidth ) +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_new/konq-embed/src/roadtabbar.h +--- kdenox/konq-embed/src/roadtabbar.h 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300 +@@ -22,6 +22,9 @@ + #define __roadtabbar_h__ + + #include <qtabbar.h> ++#include <qpopupmenu.h> ++ ++#include "view.h" + + struct RoadTabParams + { +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/konq-embed/src/run.cc +--- kdenox/konq-embed/src/run.cc 2007-02-12 22:25:55.000000000 +1300 ++++ kdenox_new/konq-embed/src/run.cc 2007-02-25 17:34:35.000000000 +1300 +@@ -24,6 +24,7 @@ + #include "view.h" + + #include <khtml_part.h> ++#include <khtml_ext.h> + + Run::Run( View *view, const KURL &url, const KParts::URLArgs &args ) + : KHTMLRun( static_cast<KHTMLPart *>(view->part()), 0, +@@ -48,7 +49,7 @@ + // if ( isTextExecutable(mimeType) ) + // mimeType = QString::fromLatin1("text/plain"); // view, don't execute + QString suggestedFilename = m_strURL.filename(); +- KHTMLPopupGUIClient::saveURL( part()->widget(), i18n( "Save As" ), m_strURL, urlArgs().metaData(), QString::null, 0, suggestedFilename, type ); ++ KHTMLPopupGUIClient::saveURL( part()->widget(), QObject::tr( "Save As" ), m_strURL, urlArgs().metaData(), QString::null, 0, suggestedFilename, type ); + + m_bFinished = true; + emit error(); +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp +--- kdenox/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-12 22:25:56.000000000 +1300 ++++ kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-24 03:38:24.000000000 +1300 +@@ -115,7 +115,8 @@ + const QString &filter, long cacheId, + const QString & suggestedFilename, const QString& mimeType ) + { +- QString name = QString::fromLatin1( "index.html" ); ++/* ++QString name = QString::fromLatin1( "index.html" ); + if ( !suggestedFilename.isEmpty() ) + name = suggestedFilename; + else if ( !url.fileName().isEmpty() ) +@@ -166,6 +167,7 @@ + + if ( destURL.isValid() ) + saveURL(url, destURL, metadata, cacheId, f); ++*/ + } + + void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop b/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop new file mode 100644 index 0000000000..1f473117e9 --- /dev/null +++ b/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Exec=konqueror +Icon=konqueror/konqueror +Type=Application +Name=konqueror +Comment=Konqueror browser diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.png b/packages/konqueror/konqueror-embedded-20070212/konqueror.png Binary files differnew file mode 100644 index 0000000000..879d470bbf --- /dev/null +++ b/packages/konqueror/konqueror-embedded-20070212/konqueror.png diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb new file mode 100644 index 0000000000..31eebaa860 --- /dev/null +++ b/packages/konqueror/konqueror-embedded_20070212.bb @@ -0,0 +1,94 @@ +DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" +SECTION = "opie/applications" +PRIORITY = "optional" +HOMEPAGE = "http://www.konqueror.org/" +DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native" +LICENSE = "LGPL/GPL" +PR = "r4" + +# this Konqueror needs the KDEDIR set and the font helvetica installed on the target + +inherit autotools + +SRC_URI = "http://www.basyskom.de/uploads/175/35/kdenox_snapshot_Qt2_2007.02.12.tar.bz2 \ + file://konqe_new_opie.patch;patch=1 \ + file://konqe-kapplication.patch;patch=1" +S = "${WORKDIR}/kdenox" + +export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" +export MOC = "${STAGING_BINDIR_NATIVE}/moc" +export UIC = "${STAGING_BINDIR_NATIVE}/uic" +export exec_prefix = "${palmtopdir}" +#export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" +export CXXFLAGS = "-fexceptions -fno-rtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS" +export PCRE_CONFIG = "invalid" +# uncomment this for a static build +# EXTRAFLAGS = "-lts" +# EXTRAFLAGS_c7x0 = "-lts -laticore" +export EXTRA_OEMAKE = "EXTRA_LDFLAGS='${EXTRAFLAGS}'" + +EXTRA_OECONF = '--prefix=${palmtopdir} \ + --exec-prefix=${palmtopdir} \ +# --includedir=${STAGING_INCDIR} \ + --includedir=/usr/include \ + --with-extra-includes=${STAGING_INCDIR} \ + --with-extra-libs=${STAGING_LIBDIR} \ + --with-qtopia-dir=${OPIEDIR} \ + --with-ssl-version=0.9.7e \ + --with-ssl-dir=${STAGING_LIBDIR}/.. \ + --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ + --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --with-qt-dir=${QTDIR} \ + --enable-fontsubs \ + --with-konq-tmp-prefix=/tmp/kde-cache \ +# --enable-static \ + --disable-static \ + --enable-shared \ + --disable-debug \ + --with-gui=qpe \ + --with-ipv6-lookup=no \ + --without-xinerama \ +# --disable-scrollbars \ + --disable-selection \ + --disable-bookmarks \ + --with-javascript=static \ + --enable-debug=yes \ + --disable-printing \ +# --enable-pcre \ + --disable-pcre \ + --without-arts \ + --enable-jshostext \ + --disable-selection \ + --enable-final \ + --enable-qt-embedded \ +# --enable-rtti-embedded \ + --enable-mt \ + --enable-qpe \ + --enable-qt-mt \ + --enable-fwnewepg=yes \ + --enable-embedded ' + +do_configure_prepend() { + cd ${S} + if ! test -L admin + then + ln -s ../kdelibs/admin admin + fi +} + +do_compile_prepend() { + perl admin/am_edit +} + +do_install_append() { + install -d ${D}${palmtopdir}/apps/Applications + install -m 0644 ${FILESDIR}/konqueror.desktop ${D}${palmtopdir}/apps/Applications/ + install -d ${D}${palmtopdir}/pics/konqueror + install -m 0644 ${FILESDIR}/konqueror.png ${D}${palmtopdir}/pics/konqueror/ + mv ${D}${palmtopdir}/bin/konqueror ${D}${palmtopdir}/bin/konqueror.bin + { echo '#!/bin/sh' ; echo "KDEDIR=/usr exec ${palmtopdir}/bin/konqueror.bin" ; } > ${D}${palmtopdir}/bin/konqueror + chmod 0755 ${D}${palmtopdir}/bin/konqueror +} + +FILES_${PN} = "${palmtopdir} ${datadir}" + diff --git a/packages/libeventdb/libeventdb_0.90.bb b/packages/libeventdb/libeventdb_0.90.bb new file mode 100644 index 0000000000..2372db528b --- /dev/null +++ b/packages/libeventdb/libeventdb_0.90.bb @@ -0,0 +1,14 @@ +LICENSE = "LGPL" +DESCRIPTION = "Database access library for GPE calendar" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "libgpewidget libgpepimc sqlite" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit pkgconfig gpe autotools + + +do_stage () { + autotools_stage_all +} diff --git a/packages/libeventdb/libeventdb_svn.bb b/packages/libeventdb/libeventdb_svn.bb index c18d28d273..4361df2ea4 100644 --- a/packages/libeventdb/libeventdb_svn.bb +++ b/packages/libeventdb/libeventdb_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" DEPENDS = "libgpewidget libgpepimc sqlite" -PV = "0.30+svn${SRCDATE}" +PV = "0.90+svn${SRCDATE}" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libgpepimc/libgpepimc_0.9.bb b/packages/libgpepimc/libgpepimc_0.9.bb new file mode 100644 index 0000000000..57b7b22191 --- /dev/null +++ b/packages/libgpepimc/libgpepimc_0.9.bb @@ -0,0 +1 @@ +require libgpepimc.inc diff --git a/packages/libgpevtype/libgpevtype_0.50.bb b/packages/libgpevtype/libgpevtype_0.50.bb new file mode 100644 index 0000000000..b9d0c19378 --- /dev/null +++ b/packages/libgpevtype/libgpevtype_0.50.bb @@ -0,0 +1,17 @@ +LICENSE = "LGPL" +DESCRIPTION = "Data interchange library for GPE" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "libmimedir libeventdb" +PR = "r0" + +inherit pkgconfig gpe autotools + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + + +do_stage () { + autotools_stage_all +} + + diff --git a/packages/libhandoff/libhandoff_0.1.bb b/packages/libhandoff/libhandoff_0.1.bb new file mode 100644 index 0000000000..bafbb9ec10 --- /dev/null +++ b/packages/libhandoff/libhandoff_0.1.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +DESCRIPTION = "handoff library for GPE calendar" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0" + +inherit pkgconfig gpe autotools + +GPE_TARBALL_SUFFIX = "bz2" + +do_stage () { + autotools_stage_all +} diff --git a/packages/libschedule/libschedule_0.17.bb b/packages/libschedule/libschedule_0.17.bb new file mode 100644 index 0000000000..ad8cb72712 --- /dev/null +++ b/packages/libschedule/libschedule_0.17.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "RTC alarm handling library for GPE" +SECTION = "gpe/libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "glib-2.0 sqlite libgpewidget" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools pkgconfig gpe + +do_stage () { + autotools_stage_all +} diff --git a/packages/libsoundgen/libsoundgen_0.5.bb b/packages/libsoundgen/libsoundgen_0.5.bb new file mode 100644 index 0000000000..5c65141ab5 --- /dev/null +++ b/packages/libsoundgen/libsoundgen_0.5.bb @@ -0,0 +1,13 @@ +SECTION = "x11/libs" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig +LICENSE = "LGPL" +DEPENDS = "esound" + + +do_stage() { + autotools_stage_all +} + diff --git a/packages/libtododb/libtododb_0.11.bb b/packages/libtododb/libtododb_0.11.bb new file mode 100644 index 0000000000..7d0bb146e9 --- /dev/null +++ b/packages/libtododb/libtododb_0.11.bb @@ -0,0 +1,18 @@ +LICENSE = "LGPL" +DESCRIPTION = "Database access for GPE to-do list" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "libgpewidget libgpepimc sqlite" + +GPE_TARBALL_SUFFIX = "bz2" +inherit pkgconfig gpe autotools + + +do_stage () { + autotools_stage_all +} + +do_install () { + gpe_do_install +# oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel +} diff --git a/packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3 b/packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3 new file mode 100755 index 0000000000..49a88c0e06 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs/mkfs.ext3 @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Fix obscure problem - redirect stdout iff mkfs.ext3 +# is being invoked by the Linksys GUI format utility. +# +u=`/bin/pidof utility.cgi` +if [ ! -f "/tmp/Preparing" -o "x${u}" = "x" -o \ + "y${1}" != "y-m" -o "z${2}" != "z1" ] +then + /usr/bin/mke2fs -j $@ +else + /usr/bin/mke2fs -j $@ >/tmp/mkfs.$$.log +fi diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index dab61db94e..23b240debc 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,7 +1,7 @@ SECTION = "base" COMPATIBLE_MACHINE = "nslu2" -PR = "r18" +PR = "r19" DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" @@ -55,6 +55,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ file://upgrade.htm \ file://telnet.htm \ file://rc.bootbin \ + file://mkfs.ext3 \ " S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" @@ -163,6 +164,10 @@ do_compile () { rm -f ${S}/bin/busybox ln -s slingbox ${S}/bin/busybox + # Add in the kludge to fix the strange Linksys GUI format problem. + rm -f ${S}/usr/bin/mkfs.ext3 + install -m 755 ${WORKDIR}/mkfs.ext3 ${S}/usr/bin/mkfs.ext3 + # No reason not to have a home directory for root... mkdir -p ${S}/root chmod 755 ${S}/root diff --git a/packages/uboot/u-boot.inc b/packages/uboot/u-boot.inc index 9a0199496c..9f7356d5d7 100644 --- a/packages/uboot/u-boot.inc +++ b/packages/uboot/u-boot.inc @@ -5,6 +5,8 @@ PRIORITY = "optional" LICENSE = "GPL" PROVIDES = "virtual/bootloader" +PARALLEL_MAKE="" + EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" UBOOT_MACHINE ?= "${MACHINE}_config" diff --git a/packages/uclibc/uclibc-0.9.29/bfin/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/bfin/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/bfin/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/adsp-bf537-stamp/uClibc.machine b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine index ed5e1bf047..5243119d2e 100644 --- a/packages/uclibc/uclibc-0.9.29/adsp-bf537-stamp/uClibc.machine +++ b/packages/uclibc/uclibc-0.9.29/bfin/uClibc.machine @@ -33,10 +33,11 @@ TARGET_ARCH="bfin" FORCE_OPTIONS_FOR_ARCH=y TARGET_SUBARCH="" # UCLIBC_FORMAT_ELF is not set -UCLIBC_FORMAT_FDPIC_ELF=y +# UCLIBC_FORMAT_FDPIC_ELF is not set # UCLIBC_FORMAT_FLAT is not set # UCLIBC_FORMAT_FLAT_SEP_DATA is not set -# UCLIBC_FORMAT_SHARED_FLAT is not set +UCLIBC_FORMAT_SHARED_FLAT=y +UCLIBC_SHARED_FLAT_ID=1 ARCH_LITTLE_ENDIAN=y # |
