summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/a780.conf15
-rw-r--r--conf/machine/e680.conf6
-rw-r--r--packages/ezx/.mtn2git_empty0
-rw-r--r--packages/ezx/ezx-boot-usb-native_svn.bb28
-rw-r--r--packages/keymaps/files/poodle/keymap-2.6.map81
-rw-r--r--packages/libgpewidget/libgpewidget_0.112.bb26
-rw-r--r--packages/libusb/libusb-native_0.1.10a.bb4
-rw-r--r--packages/libusb/libusb_0.1.10a.bb3
-rw-r--r--packages/linux/linux-ezx/defconfig-e6801295
-rw-r--r--packages/linux/linux-ezx/ezx-mmc-ro.patch24
-rw-r--r--packages/linux/linux-ezx/series26
-rw-r--r--packages/linux/linux-ezx_2.6.16.13.bb28
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch66
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb5
-rw-r--r--packages/qpphoto/.mtn2git_empty0
-rw-r--r--packages/qpphoto/files/.mtn2git_empty0
-rw-r--r--packages/qpphoto/files/draw.patch35
-rw-r--r--packages/qpphoto/files/drawview.patch11
-rw-r--r--packages/qpphoto/files/drawwidget.patch2414
-rw-r--r--packages/qpphoto/qpphoto_1.0.2.bb37
-rw-r--r--packages/xlibs/libxi_X11R7.0-1.0.0.bb3
-rw-r--r--packages/xqt2/.mtn2git_empty0
-rw-r--r--packages/xqt2/files/.mtn2git_empty0
-rw-r--r--packages/xqt2/files/KeyMap.patch19
-rw-r--r--packages/xqt2/files/cross.patch62
-rw-r--r--packages/xqt2/files/fephack.patch32
-rw-r--r--packages/xqt2/files/imake-staging.patch38
-rw-r--r--packages/xqt2/files/moc_call.patch11
-rw-r--r--packages/xqt2/files/xchar2b.patch25
-rw-r--r--packages/xqt2/files/xqt-make.patch43
-rw-r--r--packages/xqt2/xqt2_20060509.bb111
31 files changed, 4357 insertions, 91 deletions
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index 9181b36c19..3977f50e2b 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
-#@NAME: Motorola EZX A780 and E680
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones A780 and E680
+#@NAME: Motorola EZX A780
+#@DESCRIPTION: Machine configuration for the Motorola GSM phone A780
include conf/machine/include/motorola-ezx.conf
@@ -9,7 +9,16 @@ IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n --no-idea-yet --CAUTION"
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+#cat /proc/mtd
+#dev: size erasesize name
+#mtd0: 00020000 00008000 "Bootloader"
+#mtd1: 000e0000 00020000 "Kernel"
+#mtd2: 00580000 00020000 "VFM_Filesystem"
+#mtd3: 00020000 00020000 "Logo"
+
+ROOT_FLASH_SIZE = "24"
# EXTRA_IMAGEDEPENDS += "ezx-updater"
diff --git a/conf/machine/e680.conf b/conf/machine/e680.conf
new file mode 100644
index 0000000000..ae8915632e
--- /dev/null
+++ b/conf/machine/e680.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX E680
+#@DESCRIPTION: Machine configuration for the Motorola GSM phone E680
+
+require conf/machine/a780.conf
+
diff --git a/packages/ezx/.mtn2git_empty b/packages/ezx/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ezx/.mtn2git_empty
diff --git a/packages/ezx/ezx-boot-usb-native_svn.bb b/packages/ezx/ezx-boot-usb-native_svn.bb
new file mode 100644
index 0000000000..6bcc80e4ce
--- /dev/null
+++ b/packages/ezx/ezx-boot-usb-native_svn.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+LICENSE = "GPL"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src;module=boot_usb;proto=http"
+S = "${WORKDIR}/boot_usb"
+
+inherit native
+
+do_compile() {
+ ${CC} ${CFLAGS} -lusb -o ezx-boot-usb boot_usb.c
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb
+}
+
+do_stage() {
+ :
+}
+
+do_install() {
+ :
+}
+
+addtask deploy before do_build after do_compile
diff --git a/packages/keymaps/files/poodle/keymap-2.6.map b/packages/keymaps/files/poodle/keymap-2.6.map
index 17485ac4a3..68533bb93c 100644
--- a/packages/keymaps/files/poodle/keymap-2.6.map
+++ b/packages/keymaps/files/poodle/keymap-2.6.map
@@ -1,58 +1,57 @@
keymaps 0-2,4,8,12
# Default Shift AltGr Control Alt Ctrl+Alt
-keycode 59 = Control Control Control Control Control Control
-keycode 60 = Alt Alt Alt Alt Alt Alt
-keycode 62 = Escape
-keycode 63 = Return
+keycode 29 = SControl # Calendar
+keycode 60 = SAlt # Address
+keycode 63 = Return
keycode 68 = F13 # Mail
-keycode 87 = Return
+keycode 87 = Return
keycode 88 = F11 # Menu
keycode 102 = F12 # Home
-keycode 103 = Up
-keycode 105 = Left VoidSymbol Decr_Console
-keycode 106 = Right VoidSymbol Incr_Console
-keycode 108 = Down
+keycode 103 = Up Up Prior
+keycode 105 = Left Left Decr_Console
+keycode 106 = Right Right Incr_Console
+keycode 108 = Down Down Next
+keycode 116 = Escape
-keycode 1 = Escape Escape
keycode 14 = BackSpace BackSpace Delete
keycode 15 = Tab backslash Caps_Lock
-keycode 28 = Return VoidSymbol greater
-keycode 29 = AltGr AltGr AltGr AltGr AltGr AltGr
+keycode 28 = Return Return greater
keycode 40 = apostrophe quotedbl tilde
-keycode 42 = Shift
+keycode 42 = SShift
keycode 51 = comma semicolon parenright
keycode 52 = period colon less
keycode 53 = slash question Num_Lock
-keycode 54 = Shift
-keycode 57 = space space bar
+keycode 54 = SShift
+keycode 57 = space bar bar
+keycode 67 = SAltGr
-keycode 16 = q Q one Control_q Meta_q
-keycode 17 = w W two Control_w Meta_w
-keycode 18 = e E three Control_e Meta_e
-keycode 19 = r R four Control_r Meta_r
-keycode 20 = t T five Control_t Meta_t
-keycode 21 = y Y six Control_y Meta_y
-keycode 22 = u U seven Control_u Meta_u
-keycode 23 = i I eight Control_i Meta_i
-keycode 24 = o O nine Control_o Meta_o
-keycode 25 = p P zero Control_p Meta_p
-keycode 30 = a A exclam Control_a Meta_a
-keycode 31 = s S at Control_s Meta_s
-keycode 32 = d D numbersign Control_d Meta_d
-keycode 33 = f F dollar Control_f Meta_f
-keycode 34 = g G percent Control_g Meta_g
-keycode 35 = h H underscore Control_h Meta_h
-keycode 36 = j J ampersand Control_j Meta_j
-keycode 37 = k K asterisk Control_k Meta_k
-keycode 38 = l L parenleft Control_l Meta_l
-keycode 44 = z Z VoidSymbol Control_z Meta_z
-keycode 45 = x X Control_x Control_x Meta_x
-keycode 46 = c C Control_c Control_c Meta_c
-keycode 47 = v V Control_v Control_v Meta_v
-keycode 48 = b B minus Control_b Meta_b
-keycode 49 = n N plus Control_n Meta_n
-keycode 50 = m M equal Control_m Meta_m
+keycode 16 = +q +Q one Control_q Meta_q
+keycode 17 = +w +W two Control_w Meta_w
+keycode 18 = +e +E three Control_e Meta_e
+keycode 19 = +r +R four Control_r Meta_r
+keycode 20 = +t +T five Control_t Meta_t
+keycode 21 = +y +Y six Control_y Meta_y
+keycode 22 = +u +U seven Control_u Meta_u
+keycode 23 = +i +I eight Control_i Meta_i
+keycode 24 = +o +O nine Control_o Meta_o
+keycode 25 = +p +P zero Control_p Meta_p
+keycode 30 = +a +A exclam Control_a Meta_a
+keycode 31 = +s +S at Control_s Meta_s
+keycode 32 = +d +D numbersign Control_d Meta_d
+keycode 33 = +f +F dollar Control_f Meta_f
+keycode 34 = +g +G percent Control_g Meta_g
+keycode 35 = +h +H underscore Control_h Meta_h
+keycode 36 = +j +J ampersand Control_j Meta_j
+keycode 37 = +k +K asterisk Control_k Meta_k
+keycode 38 = +l +L parenleft Control_l Meta_l
+keycode 44 = +z +Z VoidSymbol Control_z Meta_z
+keycode 45 = +x +X Control_x Control_x Meta_x
+keycode 46 = +c +C Control_c Control_c Meta_c
+keycode 47 = +v +V Control_v Control_v Meta_v
+keycode 48 = +b +B minus Control_b Meta_b
+keycode 49 = +n +N plus Control_n Meta_n
+keycode 50 = +m +M equal Control_m Meta_m
string F1 = "\033[[A"
string F2 = "\033[[B"
diff --git a/packages/libgpewidget/libgpewidget_0.112.bb b/packages/libgpewidget/libgpewidget_0.112.bb
new file mode 100644
index 0000000000..780d1e920b
--- /dev/null
+++ b/packages/libgpewidget/libgpewidget_0.112.bb
@@ -0,0 +1,26 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
+
+SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}"
+
+EXTRA_OECONF = "--enable-cairo"
+
+PARALLEL_MAKE = ""
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+ autotools_stage_all
+}
+
diff --git a/packages/libusb/libusb-native_0.1.10a.bb b/packages/libusb/libusb-native_0.1.10a.bb
new file mode 100644
index 0000000000..a76768c3b6
--- /dev/null
+++ b/packages/libusb/libusb-native_0.1.10a.bb
@@ -0,0 +1,4 @@
+require libusb_${PV}.bb
+inherit native
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libusb-0.1.10a"
diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb
index 298eb5ee7f..b2c3e80979 100644
--- a/packages/libusb/libusb_0.1.10a.bb
+++ b/packages/libusb/libusb_0.1.10a.bb
@@ -5,7 +5,8 @@ LICENSE = "LGPL"
PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
- file://debian-changes.patch;patch=1"
+ file://debian-changes.patch;patch=1"
+S = "${WORKDIR}/libusb-${PV}"
inherit autotools pkgconfig
diff --git a/packages/linux/linux-ezx/defconfig-e680 b/packages/linux/linux-ezx/defconfig-e680
new file mode 100644
index 0000000000..d59985244e
--- /dev/null
+++ b/packages/linux/linux-ezx/defconfig-e680
@@ -0,0 +1,1295 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16.5
+# Thu May 4 17:12:53 2006
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-ezx3"
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+# CONFIG_SHMEM is not set
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+CONFIG_OBSOLETE_INTERMODULE=m
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Block layer
+#
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+
+#
+# System Type
+#
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_L7200 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+CONFIG_PXA_EZX=y
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_PXA_SHARPSL is not set
+CONFIG_PXA_EZX_E680=y
+# CONFIG_PXA_EZX_A780 is not set
+CONFIG_PXA27x=y
+CONFIG_IWMMXT=y
+CONFIG_PXA_SSP=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+CONFIG_XSCALE_PMU=y
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootfstype=ext3 rootdelay=5 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=tty0 console=ttyS2,115200n8"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_APM=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=m
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+CONFIG_NET_KEY=m
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+CONFIG_IP_NF_CONNTRACK_EVENTS=y
+CONFIG_IP_NF_CONNTRACK_NETLINK=m
+CONFIG_IP_NF_CT_PROTO_SCTP=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_NETBIOS_NS=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+CONFIG_IP_NF_PPTP=m
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_POLICY=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+# CONFIG_IP_NF_TARGET_ECN is not set
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AHESP=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_POLICY=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+CONFIG_CONNECTOR=m
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=m
+CONFIG_MTD_DEBUG=y
+CONFIG_MTD_DEBUG_VERBOSE=3
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+# CONFIG_MTD_CFI_I2 is not set
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=m
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=m
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+CONFIG_MTD_XIP=y
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IMPA7 is not set
+# CONFIG_MTD_SHARP_SL is not set
+CONFIG_MTD_PXA27x=m
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+# CONFIG_MTD_DOCPROBE_ADVANCED is not set
+CONFIG_MTD_DOCPROBE_ADDRESS=0
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x0
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH is not set
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM_COUNT=16
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ARCH_EZX_ROFLASH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+# CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_CRYPT=m
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+# CONFIG_PPPOE is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_TSDEV=m
+CONFIG_INPUT_TSDEV_SCREEN_X=240
+CONFIG_INPUT_TSDEV_SCREEN_Y=320
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_PXA=y
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=m
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_LIBPS2 is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+CONFIG_SA1100_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_LINUX_LED is not set
+# CONFIG_BULVERDE_SRAM_DEV is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_PXA=y
+CONFIG_I2C_PXA_SLAVE=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_RTC_X1205_I2C is not set
+# CONFIG_I2C_ADCM2700 is not set
+# CONFIG_I2C_A780_CAMERA is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+CONFIG_SPI=y
+CONFIG_SPI_DEBUG=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_BITBANG=m
+
+#
+# SPI Protocol Masters
+#
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Motorola EZX devices
+#
+# CONFIG_KEYPAD_A780 is not set
+# CONFIG_KEYPAD_E680 is not set
+# CONFIG_KEYLIGHT_A780 is not set
+# CONFIG_FMRADIO_E680 is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_DEVICE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+# CONFIG_USB_STORAGE is not set
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Input Devices
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_ITMTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_LD is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=y
+# CONFIG_USB_PXA27X_DMA is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=y
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_PXA=y
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_SYSFS=y
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+CONFIG_RELAYFS_FS=m
+CONFIG_CONFIGFS_FS=m
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_WAITQ is not set
+CONFIG_DEBUG_ERRORS=y
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_ICEDCC is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+
+#
+# Dynamic Power Management
+#
+# CONFIG_DPM is not set
diff --git a/packages/linux/linux-ezx/ezx-mmc-ro.patch b/packages/linux/linux-ezx/ezx-mmc-ro.patch
new file mode 100644
index 0000000000..7f95c44c62
--- /dev/null
+++ b/packages/linux/linux-ezx/ezx-mmc-ro.patch
@@ -0,0 +1,24 @@
+This patch fixes the mmc/sd read-only detection, which is obviously only
+available on E680 phones, and not on A780, since TransFlash doesn't have any
+hardware write protection.
+
+Index: linux-2.6.16.13-ezx3/arch/arm/mach-pxa/ezx.c
+===================================================================
+--- linux-2.6.16.13-ezx3.orig/arch/arm/mach-pxa/ezx.c 2006-05-12 19:32:03.000000000 +0200
++++ linux-2.6.16.13-ezx3/arch/arm/mach-pxa/ezx.c 2006-05-13 15:22:51.000000000 +0200
+@@ -151,9 +153,13 @@
+ static int ezx_mci_get_ro(struct device *dev)
+ {
+ printk("%s entered\n", __FUNCTION__);
+- return (GPLR3 & 0x800);
+- // return GPIO_is_high(96+4);
++#if defined(CONFIG_PXA_EZX_E680)
+ /* this is only e680, i guess */
++ // return GPIO_is_high(96+4);
++ return (GPLR3 & 0x800);
++#else
++ return 0;
++#endif
+ }
+
+ #if defined(CONFIG_PXA_EZX_A780)
diff --git a/packages/linux/linux-ezx/series b/packages/linux/linux-ezx/series
deleted file mode 100644
index da607fd4f5..0000000000
--- a/packages/linux/linux-ezx/series
+++ /dev/null
@@ -1,26 +0,0 @@
-patch-2.6.16.13
-dpm-core-2.6.16.patch
-dpm-pxa27x-2.6.16.patch
-pxa7xx_udc.patch
-ezx_usb_gadged_serial_pxa27x.patch
-pxa27x_udc-more.patch
-ezx_defconfig.patch
-ezx_core.patch
-ezx_mtd.patch
-ezx_roflash.patch
-ezx_camera.patch
-sa1100_rtc.patch
-pxa_serial_bug_workaround.patch
-ezx_sound.patch
-pxa_serial_dpm.patch
-ezxfb-fix-screensave.patch
-keypad-module.patch
-exz-platformdevices.patch
-pxa_mtd_fix.patch
-ezx_pxa_ssp.patch
-pxamci_debug.patch
-ssp_pcap_nobitbang.patch
-pxamci-4bit.patch
-a780-transflash_power.patch
-ezx-kbd.patch
-laforge_config.patch
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index c91f947545..9ba090b69a 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "2.6 Linux Development Kernel for the Motorola A780."
+DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
SECTION = "kernel"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
LICENSE = "GPL"
-PR = "ezx3"
+PR = "ezx3-r2"
inherit kernel
@@ -35,8 +35,10 @@ file://ssp_pcap_nobitbang.patch;patch=1 \
file://pxamci-4bit.patch;patch=1 \
file://a780-transflash_power.patch;patch=1 \
file://ezx-kbd.patch;patch=1 \
-file://laforge_config.patch;patch=1 \
-file://defconfig-a780"
+file://ezx-mmc-ro.patch;patch=1 \
+\
+file://defconfig-a780 \
+file://defconfig-e680"
S = "${WORKDIR}/linux-2.6.16"
##############################################################
@@ -46,20 +48,14 @@ FILES_kernel-image = ""
ALLOW_EMPTY = 1
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(a780)'
+COMPATIBLE_MACHINE = '(a780|e680)'
-CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
-CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
-CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw"
-CMDLINE_OTHER = "dyntick=enable"
+CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 noinitrd"
+CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
+# CMDLINE_OTHER = "dyntick=enable"
CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
-
-CMDLINE_MEM_collie = "mem=${mem}M"
-CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
-CMDLINE_ROTATE_akita = "fbcon=rotate:1"
-CMDLINE_ROTATE_collie = "fbcon=rotate:1"
-CMDLINE_ROTATE_poodle = "fbcon=rotate:1"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
+CMDLINE_IP = "ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
###############################################################
# module configs specific to this kernel
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
new file mode 100644
index 0000000000..365ee1366e
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
@@ -0,0 +1,66 @@
+--- linux-2.6.16/drivers/input/keyboard/locomokbd.c.orig 2006-05-13 22:53:33.810228656 +0200
++++ linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-13 22:56:56.544408376 +0200
+@@ -45,17 +45,20 @@
+ #define LOCOMOKBD_NUMKEYS 128
+
+
+-#define LOCOMO_KEY_CALENDER KEY_F1
+-#define LOCOMO_KEY_ADDRESS KEY_F2
+-#define LOCOMO_KEY_CANCEL KEY_F4
+-#define LOCOMO_KEY_CENTER KEY_F5
+-#define LOCOMO_KEY_MAIL KEY_F10
+-#define LOCOMO_KEY_OK KEY_F11
++#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL
++#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed SysRQ */
++#define LOCOMO_KEY_HOME KEY_SYSRQ /* Need that for SysRQ */
+ #define LOCOMO_KEY_MENU KEY_F12
++#define LOCOMO_KEY_MAIL KEY_F10
++#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KP_RETURN */
++#define LOCOMO_KEY_CANCEL KEY_POWER
++#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KP_RETURN */
++
++#define LOCOMO_KEY_FN KEY_F9
+
+ static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
+- 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
+- KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */
++ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, LOCOMO_KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
++ 0, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, 0, LOCOMO_KEY_ADDRESS, /* 10 - 19 */
+ 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */
+ 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */
+@@ -65,7 +68,7 @@
+ 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */
+ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */
+ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */
+- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
++ KEY_LEFTSHIFT, KEY_TAB, LOCOMO_KEY_FN, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
+ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */
+ };
+
+@@ -76,7 +79,7 @@
+ #define NR_SCANCODES 128
+
+ #define KB_DELAY 8
+-#define SCAN_INTERVAL (HZ/10)
++#define SCAN_INTERVAL (HZ/20)
+ #define LOCOMOKBD_PRESSED 1
+
+ struct locomokbd {
+@@ -146,6 +149,7 @@
+ locomokbd_charge_all(membase);
+
+ num_pressed = 0;
++
+ for (col = 0; col < KB_COLS; col++) {
+
+ locomokbd_activate_col(membase, col);
+@@ -155,7 +159,7 @@
+ for (row = 0; row < KB_ROWS; row++) {
+ scancode = SCANCODE(col, row);
+ if (rowd & KB_ROWMASK(row)) {
+- /* printk(KERN_ERR "locomokbd: COL [%i] ROW [%i] scancode [%i] keycode [%i]\n",col,row,scancode,locomokbd->keycode[scancode]); */
++ printk(KERN_ERR "locomokbd: ROW [%i] COL [%i] scancode [%i] keycode [%i]\n",row,col,scancode,locomokbd->keycode[scancode]);
+ num_pressed += 1;
+ input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1);
+ } else {
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 2692cac3f5..3ad68d1a69 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r22"
+PR = "r23"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -93,7 +93,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
file://connectplus-remove-ide-HACK.patch;patch=1 \
file://24-hostap_cs_id.diff;patch=1 \
file://hrw-pcmcia-ids-r2.patch;patch=1 \
- file://locomo-kbd-hotkeys.patch;patch=1 \
+ file://locomo-kbd-hotkeys.patch;patch=1 \
+ file://locomo-sysrq+keyrepeat.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa270 \
file://defconfig-collie \
diff --git a/packages/qpphoto/.mtn2git_empty b/packages/qpphoto/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpphoto/.mtn2git_empty
diff --git a/packages/qpphoto/files/.mtn2git_empty b/packages/qpphoto/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpphoto/files/.mtn2git_empty
diff --git a/packages/qpphoto/files/draw.patch b/packages/qpphoto/files/draw.patch
new file mode 100644
index 0000000000..d4f7dd30a4
--- /dev/null
+++ b/packages/qpphoto/files/draw.patch
@@ -0,0 +1,35 @@
+--- qpPhoto_1.0.2/draw.cpp 2002-10-29 22:19:05.000000000 +0100
++++ qpPhoto_1.0.2/draw.cpp.new 2006-05-12 18:42:08.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include <qspinbox.h>
+ #include <qpainter.h>
+ #include <qlabel.h>
++#include <qlayout.h>
+ #include <qdialog.h>
+ #include <qpe/fontdatabase.h>
+ #include <qstringlist.h>
+@@ -781,7 +782,7 @@
+
+
+
+-Draw::Draw( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 )
++Draw::Draw( QWidget* parent, const char* name, WFlags fl )
+ :DrawWidget(parent, name, fl)
+ {
+ /*currentTool = dtNull;
+@@ -799,9 +800,12 @@
+ FontDatabase fdb;
+ availFonts = fdb.families();
+
+-
+- dv = new DrawView(GrFrame, "dv");
+- dv->setGeometry( QRect( 1, 1, 210, 210) );
++ dv = new DrawView(this, "dv");
++ dv->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, dv->sizePolicy().hasHeightForWidth() ) );
++ dv->setMinimumSize( QSize( 210, 210 ) );
++ dv->setFrameShape( QFrame::WinPanel );
++ dv->setFrameShadow( QFrame::Sunken );
++ Layout7->addWidget( dv );
+
+ dv->font.setFamily(availFonts[0]);
+ dv->font.setPointSize(12);
diff --git a/packages/qpphoto/files/drawview.patch b/packages/qpphoto/files/drawview.patch
new file mode 100644
index 0000000000..f64bef32a7
--- /dev/null
+++ b/packages/qpphoto/files/drawview.patch
@@ -0,0 +1,11 @@
+--- qpPhoto_1.0.2/drawview.cpp 2002-11-23 03:34:46.000000000 +0100
++++ qpPhoto_1.0.2/drawview.cpp.new 2006-05-11 22:33:44.000000000 +0200
+@@ -32,7 +32,7 @@
+ static const int zoomfactors[nzoomfactors] = {1,2,3,4,8,16,32}; // 25% 50% 75% 100% 200% 400% 800%
+ #define ZOOMINDEXNORMAL 3
+
+-DrawView::DrawView(QWidget* parent = 0, const char* name = 0, WFlags fl = 0)
++DrawView::DrawView(QWidget* parent, const char* name, WFlags fl)
+ :QScrollView(parent, name, fl)
+ {
+ viewX = 0;
diff --git a/packages/qpphoto/files/drawwidget.patch b/packages/qpphoto/files/drawwidget.patch
new file mode 100644
index 0000000000..95a0a52a63
--- /dev/null
+++ b/packages/qpphoto/files/drawwidget.patch
@@ -0,0 +1,2414 @@
+--- qpPhoto_1.0.2/drawwidget.ui 2002-08-23 00:42:49.000000000 +0200
++++ qpPhoto_1.0.2/drawwidget.ui.new 2006-05-12 18:32:14.000000000 +0200
+@@ -11,1160 +11,1287 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>238</width>
+- <height>262</height>
++ <width>451</width>
++ <height>294</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>caption</name>
+ <string>DrawWidget</string>
+ </property>
+- <widget>
+- <class>QFrame</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>FrStatus</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>2</x>
+- <y>236</y>
+- <width>232</width>
+- <height>18</height>
+- </rect>
+- </property>
++ <property>
++ <name>layoutMargin</name>
++ </property>
++ <property>
++ <name>layoutSpacing</name>
++ </property>
++ <vbox>
+ <property stdset="1">
+- <name>frameShape</name>
+- <enum>StyledPanel</enum>
++ <name>margin</name>
++ <number>2</number>
+ </property>
+ <property stdset="1">
+- <name>frameShadow</name>
+- <enum>Sunken</enum>
++ <name>spacing</name>
++ <number>2</number>
+ </property>
+ <widget>
++ <class>QLayoutWidget</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Layout6</cstring>
++ </property>
++ <hbox>
++ <property stdset="1">
++ <name>margin</name>
++ <number>0</number>
++ </property>
++ <property stdset="1">
++ <name>spacing</name>
++ <number>6</number>
++ </property>
++ <widget>
++ <class>QLabel</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>TypeLabel</cstring>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string>Font</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QComboBox</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Selection</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizeLimit</name>
++ <number>12</number>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>font</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QLabel</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>SizeLabel</cstring>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string>Size</string>
++ </property>
++ <property stdset="1">
++ <name>alignment</name>
++ <set>AlignVCenter|AlignRight</set>
++ </property>
++ <property>
++ <name>hAlign</name>
++ </property>
++ </widget>
++ <widget>
++ <class>QSpinBox</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Size</cstring>
++ </property>
++ <property stdset="1">
++ <name>maxValue</name>
++ <number>24</number>
++ </property>
++ <property stdset="1">
++ <name>minValue</name>
++ <number>6</number>
++ </property>
++ <property stdset="1">
++ <name>value</name>
++ <number>12</number>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>size</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QComboBox</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Operation</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizeLimit</name>
++ <number>16</number>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Bold</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>28</width>
++ <height>28</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image0</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>flat</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>bold</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Italic</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>28</width>
++ <height>28</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image1</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>flat</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>italic</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Underline</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>28</width>
++ <height>28</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image2</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>flat</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>underline</string>
++ </property>
++ </widget>
++ <spacer>
++ <property>
++ <name>name</name>
++ <cstring>Spacer2</cstring>
++ </property>
++ <property stdset="1">
++ <name>orientation</name>
++ <enum>Horizontal</enum>
++ </property>
++ <property stdset="1">
++ <name>sizeType</name>
++ <enum>Expanding</enum>
++ </property>
++ <property>
++ <name>sizeHint</name>
++ <size>
++ <width>1</width>
++ <height>1</height>
++ </size>
++ </property>
++ </spacer>
++ </hbox>
++ </widget>
++ <widget>
++ <class>QLayoutWidget</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Layout7</cstring>
++ </property>
++ <property>
++ <name>layoutSpacing</name>
++ </property>
++ <hbox>
++ <property stdset="1">
++ <name>margin</name>
++ <number>0</number>
++ </property>
++ <property stdset="1">
++ <name>spacing</name>
++ <number>0</number>
++ </property>
++ <widget>
++ <class>QLayoutWidget</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>Layout3</cstring>
++ </property>
++ <property>
++ <name>layoutSpacing</name>
++ </property>
++ <vbox>
++ <property stdset="1">
++ <name>margin</name>
++ <number>0</number>
++ </property>
++ <property stdset="1">
++ <name>spacing</name>
++ <number>0</number>
++ </property>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbCursor</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image3</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>move selection</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbBrush</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image4</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>paint</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbLine</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image5</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>draw lines</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbPolygon</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image6</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>draw shapes</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbSelect</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image7</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>select region</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbText</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>font</name>
++ <font>
++ <family>abisource-courier new</family>
++ <pointsize>14</pointsize>
++ <bold>1</bold>
++ </font>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image8</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>insert text</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbFill</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image9</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>fill</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbPicker</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image10</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>pick color</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>PbErazor</cstring>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>21</width>
++ <height>21</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>pixmap</name>
++ <pixmap>image11</pixmap>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property stdset="1">
++ <name>toggleButton</name>
++ <bool>true</bool>
++ </property>
++ <property>
++ <name>toolTip</name>
++ <string>erease</string>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>FgColor</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>18</width>
++ <height>16</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>palette</name>
++ <palette>
++ <active>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>192</red>
++ <green>192</green>
++ <blue>192</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ </active>
++ <disabled>
++ <color>
++ <red>128</red>
++ <green>128</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>128</red>
++ <green>128</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>192</red>
++ <green>192</green>
++ <blue>192</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ </disabled>
++ <inactive>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>192</red>
++ <green>192</green>
++ <blue>192</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ </inactive>
++ </palette>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>flat</name>
++ <bool>true</bool>
++ </property>
++ </widget>
++ <widget>
++ <class>QPushButton</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>BgColor</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>18</width>
++ <height>16</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>palette</name>
++ <palette>
++ <active>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>127</red>
++ <green>127</green>
++ <blue>127</blue>
++ </color>
++ <color>
++ <red>170</red>
++ <green>170</green>
++ <blue>170</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>192</red>
++ <green>192</green>
++ <blue>192</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ </active>
++ <disabled>
++ <color>
++ <red>128</red>
++ <green>128</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>127</red>
++ <green>127</green>
++ <blue>127</blue>
++ </color>
++ <color>
++ <red>170</red>
++ <green>170</green>
++ <blue>170</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>128</red>
++ <green>128</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>192</red>
++ <green>192</green>
++ <blue>192</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ </disabled>
++ <inactive>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>127</red>
++ <green>127</green>
++ <blue>127</blue>
++ </color>
++ <color>
++ <red>170</red>
++ <green>170</green>
++ <blue>170</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ <color>
++ <red>192</red>
++ <green>192</green>
++ <blue>192</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>0</blue>
++ </color>
++ <color>
++ <red>0</red>
++ <green>0</green>
++ <blue>128</blue>
++ </color>
++ <color>
++ <red>255</red>
++ <green>255</green>
++ <blue>255</blue>
++ </color>
++ </inactive>
++ </palette>
++ </property>
++ <property stdset="1">
++ <name>text</name>
++ <string></string>
++ </property>
++ <property stdset="1">
++ <name>flat</name>
++ <bool>true</bool>
++ </property>
++ </widget>
++ <spacer>
++ <property>
++ <name>name</name>
++ <cstring>Spacer1</cstring>
++ </property>
++ <property stdset="1">
++ <name>orientation</name>
++ <enum>Vertical</enum>
++ </property>
++ <property stdset="1">
++ <name>sizeType</name>
++ <enum>Expanding</enum>
++ </property>
++ <property>
++ <name>sizeHint</name>
++ <size>
++ <width>20</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </vbox>
++ </widget>
++ <widget>
++ <class>QFrame</class>
++ <property stdset="1">
++ <name>name</name>
++ <cstring>GrFrame</cstring>
++ </property>
++ <property stdset="1">
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>7</vsizetype>
++ </sizepolicy>
++ </property>
++ <property stdset="1">
++ <name>minimumSize</name>
++ <size>
++ <width>0</width>
++ <height>0</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>maximumSize</name>
++ <size>
++ <width>1</width>
++ <height>32767</height>
++ </size>
++ </property>
++ <property stdset="1">
++ <name>frameShape</name>
++ <enum>NoFrame</enum>
++ </property>
++ <property stdset="1">
++ <name>frameShadow</name>
++ <enum>Plain</enum>
++ </property>
++ <property stdset="1">
++ <name>lineWidth</name>
++ <number>0</number>
++ </property>
++ </widget>
++ </hbox>
++ </widget>
++ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>StatusLine</cstring>
+ </property>
+ <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>2</x>
+- <y>2</y>
+- <width>228</width>
+- <height>14</height>
+- </rect>
++ <name>sizePolicy</name>
++ <sizepolicy>
++ <hsizetype>5</hsizetype>
++ <vsizetype>0</vsizetype>
++ </sizepolicy>
+ </property>
+ <property stdset="1">
+- <name>text</name>
+- <string>Status</string>
++ <name>frameShape</name>
++ <enum>Box</enum>
++ </property>
++ <property stdset="1">
++ <name>frameShadow</name>
++ <enum>Sunken</enum>
+ </property>
+ <property stdset="1">
+- <name>indent</name>
+- <number>1</number>
++ <name>text</name>
++ <string>Status</string>
+ </property>
+ </widget>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>Italic</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>192</x>
+- <y>1</y>
+- <width>20</width>
+- <height>22</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image0</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>flat</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>italic</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QSpinBox</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>Size</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>135</x>
+- <y>0</y>
+- <width>36</width>
+- <height>23</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>maxValue</name>
+- <number>24</number>
+- </property>
+- <property stdset="1">
+- <name>minValue</name>
+- <number>6</number>
+- </property>
+- <property stdset="1">
+- <name>value</name>
+- <number>12</number>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>size</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>Bold</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>172</x>
+- <y>1</y>
+- <width>20</width>
+- <height>22</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image1</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>flat</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>bold</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QLabel</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>TypeLabel</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>1</x>
+- <y>3</y>
+- <width>27</width>
+- <height>20</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string>Font</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>Underline</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>212</x>
+- <y>1</y>
+- <width>20</width>
+- <height>22</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image2</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>flat</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>underline</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>FgColor</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>1</x>
+- <y>204</y>
+- <width>18</width>
+- <height>16</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>palette</name>
+- <palette>
+- <active>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>192</red>
+- <green>192</green>
+- <blue>192</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- </active>
+- <disabled>
+- <color>
+- <red>128</red>
+- <green>128</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>128</red>
+- <green>128</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>192</red>
+- <green>192</green>
+- <blue>192</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- </disabled>
+- <inactive>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>192</red>
+- <green>192</green>
+- <blue>192</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- </inactive>
+- </palette>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>flat</name>
+- <bool>true</bool>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>BgColor</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>1</x>
+- <y>219</y>
+- <width>18</width>
+- <height>16</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>palette</name>
+- <palette>
+- <active>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>127</red>
+- <green>127</green>
+- <blue>127</blue>
+- </color>
+- <color>
+- <red>170</red>
+- <green>170</green>
+- <blue>170</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>192</red>
+- <green>192</green>
+- <blue>192</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- </active>
+- <disabled>
+- <color>
+- <red>128</red>
+- <green>128</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>127</red>
+- <green>127</green>
+- <blue>127</blue>
+- </color>
+- <color>
+- <red>170</red>
+- <green>170</green>
+- <blue>170</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>128</red>
+- <green>128</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>192</red>
+- <green>192</green>
+- <blue>192</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- </disabled>
+- <inactive>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>127</red>
+- <green>127</green>
+- <blue>127</blue>
+- </color>
+- <color>
+- <red>170</red>
+- <green>170</green>
+- <blue>170</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- <color>
+- <red>192</red>
+- <green>192</green>
+- <blue>192</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>0</blue>
+- </color>
+- <color>
+- <red>0</red>
+- <green>0</green>
+- <blue>128</blue>
+- </color>
+- <color>
+- <red>255</red>
+- <green>255</green>
+- <blue>255</blue>
+- </color>
+- </inactive>
+- </palette>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>flat</name>
+- <bool>true</bool>
+- </property>
+- </widget>
+- <widget>
+- <class>QLabel</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>SizeLabel</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>111</x>
+- <y>4</y>
+- <width>23</width>
+- <height>16</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string>Size</string>
+- </property>
+- <property stdset="1">
+- <name>alignment</name>
+- <set>AlignVCenter|AlignRight</set>
+- </property>
+- <property>
+- <name>hAlign</name>
+- </property>
+- </widget>
+- <widget>
+- <class>QComboBox</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>Selection</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>32</x>
+- <y>0</y>
+- <width>80</width>
+- <height>23</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>sizeLimit</name>
+- <number>12</number>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>font</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QComboBox</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>Operation</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>171</x>
+- <y>0</y>
+- <width>61</width>
+- <height>22</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>sizeLimit</name>
+- <number>16</number>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbCursor</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>24</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image3</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>move selection</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbBrush</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>44</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image4</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>paint</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbLine</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>64</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image5</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>draw lines</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbPolygon</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>84</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image6</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>draw shapes</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbSelect</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>104</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image7</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>select region</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbText</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>124</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>font</name>
+- <font>
+- <family>abisource-courier new</family>
+- <pointsize>14</pointsize>
+- <bold>1</bold>
+- </font>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image8</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>insert text</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbFill</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>144</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image9</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>fill</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbPicker</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>164</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image10</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>pick color</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QPushButton</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>PbErazor</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>0</x>
+- <y>184</y>
+- <width>21</width>
+- <height>21</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>text</name>
+- <string></string>
+- </property>
+- <property stdset="1">
+- <name>pixmap</name>
+- <pixmap>image11</pixmap>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property stdset="1">
+- <name>toggleButton</name>
+- <bool>true</bool>
+- </property>
+- <property>
+- <name>toolTip</name>
+- <string>erease</string>
+- </property>
+- </widget>
+- <widget>
+- <class>QFrame</class>
+- <property stdset="1">
+- <name>name</name>
+- <cstring>GrFrame</cstring>
+- </property>
+- <property stdset="1">
+- <name>geometry</name>
+- <rect>
+- <x>22</x>
+- <y>24</y>
+- <width>212</width>
+- <height>212</height>
+- </rect>
+- </property>
+- <property stdset="1">
+- <name>frameShape</name>
+- <enum>WinPanel</enum>
+- </property>
+- <property stdset="1">
+- <name>frameShadow</name>
+- <enum>Sunken</enum>
+- </property>
+- </widget>
++ </vbox>
+ </widget>
+ <images>
+ <image>
+ <name>image0</name>
+- <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a40882983009a981e4c884a627021ea882184a822860801147fc08152ad351700811545c3</data>
++ <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a808829c30092981e840b15441183526489619887db5eace629a38be95120866c073c0c90dd871a56b5d65c00316543a8</data>
+ </image>
+ <image>
+ <name>image1</name>
+- <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a808829c30092981e840b15441183526489619887db5eace629a38be95120866c073c0c90dd871a56b5d65c00316543a8</data>
++ <data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a40882983009a981e4c884a627021ea882184a822860801147fc08152ad351700811545c3</data>
+ </image>
+ <image>
+ <name>image2</name>
diff --git a/packages/qpphoto/qpphoto_1.0.2.bb b/packages/qpphoto/qpphoto_1.0.2.bb
new file mode 100644
index 0000000000..9cd1314bb0
--- /dev/null
+++ b/packages/qpphoto/qpphoto_1.0.2.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Painting program. Small picture editor."
+HOMEPAGE = "http://zaurus.colognearts.de/qpphoto/"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "qpPhoto"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+PR = "r0"
+
+inherit opie
+
+SRC_URI = "http://zaurus.colognearts.de/qpphoto/qpPhoto_1.0.2_src.tar.gz \
+ file://draw.patch;patch=1 \
+ file://drawview.patch;patch=1 \
+ file://drawwidget.patch;patch=1 "
+
+S = "${WORKDIR}/qpPhoto_1.0.2"
+
+do_compile() {
+ export STAGING_BINDIR=${STAGING_BINDIR}
+ oe_runmake clean
+ oe_runmake
+}
+
+do_install() {
+# install -d ${D}${palmtopdir}/apps/Applications
+ install -d ${D}${palmtopdir}/pics
+# install -d ${D}${bindir}
+
+ install -m 0644 qpPhoto.png ${D}${palmtopdir}/pics
+# install -m 0644 qpPhoto.desktop ${D}${palmtopdir}/apps/Applications
+# install -m 0755 qpPhoto ${D}${bindir}
+}
+
+# FILES_${PN} = " ${palmtopdir}/apps/Applications/qpPhoto.desktop ${palmtopdir}/pics/qpPhoto.png ${bindir}/qpPhoto "
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
index fa63e588f3..20a29e094a 100644
--- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
@@ -1,9 +1,8 @@
DESCRIPTION = "X Input extension library."
SECTION = "x11/libs"
-#MAINTAINER = ""
LICENSE = "MIT-X"
-DEPENDS = "xproto libx11 xextproto"
+DEPENDS = "xproto libx11 xext"
XORG_PN = "libXi"
diff --git a/packages/xqt2/.mtn2git_empty b/packages/xqt2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xqt2/.mtn2git_empty
diff --git a/packages/xqt2/files/.mtn2git_empty b/packages/xqt2/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xqt2/files/.mtn2git_empty
diff --git a/packages/xqt2/files/KeyMap.patch b/packages/xqt2/files/KeyMap.patch
new file mode 100644
index 0000000000..62564cf248
--- /dev/null
+++ b/packages/xqt2/files/KeyMap.patch
@@ -0,0 +1,19 @@
+--- xc/../xqt2/xfree86/xqt-driver/KeyMap.h 2004-10-16 08:06:07.000000000 +0200
++++ xc/../xqt2/xfree86/xqt-driver/KeyMap~.h 2006-05-10 19:41:16.000000000 +0200
+@@ -75,6 +75,7 @@
+ /* [ */ K(BracketLeft, XK_bracketleft, XK_braceleft) // Fn+T
+ /* { */ K(BraceLeft, XK_braceleft, NoSymbol) // ???
+ /* cent */ K(cent, XK_cent, NoSymbol) // Fn+U
++/* Enter */ K(Enter, XK_Return, NoSymbol)
+ /* Return */ K(Return, XK_Return, NoSymbol)
+ /* OK */ K(F33, XK_Return, NoSymbol)
+ /* Control */ K(Control, XK_Control_L, NoSymbol)
+@@ -162,7 +163,7 @@
+ /* F30 */ K(F30, XK_F30, NoSymbol)
+ /* F31 */ K(F31, XK_F31, NoSymbol)
+ /* F32 */ K(F32, XK_F32, NoSymbol)
+-/* F33 */ K(F33, XK_F33, NoSymbol)
++/* F33 */ /* K(F33, XK_F33, NoSymbol) */ // Key already defined as 'ok'
+ /* F34 */ K(F34, XK_F34, NoSymbol)
+ /* F35 */ K(F35, XK_F35, NoSymbol)
+
diff --git a/packages/xqt2/files/cross.patch b/packages/xqt2/files/cross.patch
new file mode 100644
index 0000000000..c00068aa26
--- /dev/null
+++ b/packages/xqt2/files/cross.patch
@@ -0,0 +1,62 @@
+diff -ur xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.org/config/cf/X11.tmpl 2003-02-26 06:57:52.000000000 +0900
++++ xc/config/cf/X11.tmpl 2004-09-16 19:19:46.000000000 +0900
+@@ -1582,9 +1582,9 @@
+ MKFONTDIR = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/mkfontdir
+ XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
+ # elif UseInstalledOnCrossCompile
+- MKFONTDIR = $(BINDIR)/mkfontdir
+- FONTC = $(BINDIR)/bdftopcf
+- XCURSORGEN = $(BINDIR)/xcursorgen
++ MKFONTDIR = /usr/X11R6/bin/mkfontdir
++ FONTC = /usr/X11R6/bin/bdftopcf
++ XCURSORGEN = /usr/X11R6/bin/xcursorgen
+ # endif
+ # if HasPerl
+ MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
+diff -ur xc.org/config/cf/cross.def xc/config/cf/cross.def
+--- xc.org/config/cf/cross.def 2002-04-04 23:05:33.000000000 +0900
++++ xc/config/cf/cross.def 2004-09-16 19:19:46.000000000 +0900
+@@ -5,7 +5,7 @@
+ * compiler images. It will have to be edited to reflect these
+ * given your local configuration.
+ */
+-#if 0
++#if 1
+ #undef i386Architecture
+ #define Arm32Architecture
+
+@@ -14,18 +14,18 @@
+ #define ServerCDebugFlags -O2
+ #undef StandardDefines
+ #define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
+- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
++ -D_BSD_SOURCE -D_GNU_SOURCE
+ #undef CcCmd
+-#define StdIncDir /skiff/local/arm-linux/include
++#define StdIncDir $(TOPDIR)/tmp/cross/arm-linux/include
+ #define PreIncDir
+ #undef PostIncDir
+-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
+-#define CcCmd /skiff/local/bin/arm-linux-gcc
++#define PostIncDir $(TOPDIR)/tmp/cross/lib/gcc-lib/arm-linux/2.95.2/include
++#define CcCmd $(TOPDIR)/tmp/cross/bin/arm-linux-gcc
+ #undef CplusplusCmd
+ #define HasCplusplus YES
+-#define CplusplusCmd /skiff/local/bin/arm-linux-g++
++#define CplusplusCmd $(TOPDIR)/tmp/cross/bin/arm-linux-g++
+ #define DoRanlibCmd YES
+-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
++#define RanlibCmd $(TOPDIR)/tmp/cross/bin/arm-linux-ranlib
+ #undef ExtraLoadFlags
+ #define ExtraLoadFlags
+ #define FbNoPixelAddrCode
+@@ -33,7 +33,7 @@
+ #define TermcapLibrary -ltermcap
+
+ #undef LdPostLib
+-#define LdPostLib -L/skiff/local/arm-linux/lib
++#define LdPostLib -L$(TOPDIR)/tmp/cross/arm-linux/lib
+
+ #undef ExtensionOSDefines
+ #define ExtensionOSDefines
diff --git a/packages/xqt2/files/fephack.patch b/packages/xqt2/files/fephack.patch
new file mode 100644
index 0000000000..c09a7ed507
--- /dev/null
+++ b/packages/xqt2/files/fephack.patch
@@ -0,0 +1,32 @@
+diff -ur xc.org/lib/X11/KeyBind.c xc/lib/X11/KeyBind.c
+--- xc.org/lib/X11/KeyBind.c 2001-12-15 04:54:02.000000000 +0900
++++ xc/lib/X11/KeyBind.c 2004-09-16 19:19:46.000000000 +0900
+@@ -545,6 +545,13 @@
+ unsigned int modifiers;
+ KeySym symbol;
+
++ /* X/Qt hack start */
++ if (event->keycode & 0x100) {
++ *buffer = event->keycode & 0xff;
++ return 1;
++ }
++ /* X/Qt hack end */
++
+ if (! _XTranslateKey(event->display, event->keycode, event->state,
+ &modifiers, &symbol))
+ return 0;
+diff -ur xc.org/lib/X11/XlibInt.c xc/lib/X11/XlibInt.c
+--- xc.org/lib/X11/XlibInt.c 2003-02-18 14:15:27.000000000 +0900
++++ xc/lib/X11/XlibInt.c 2004-09-16 19:19:46.000000000 +0900
+@@ -2358,6 +2358,11 @@
+ ev->state = event->u.keyButtonPointer.state;
+ ev->same_screen = event->u.keyButtonPointer.sameScreen;
+ ev->keycode = event->u.u.detail;
++ /* X/Qt hack start */
++ if (event->u.keyButtonPointer.pad1 == 0xff) {
++ ev->keycode |= 0x100;
++ }
++ /* X/Qt hack end */
+ }
+ break;
+ case ButtonPress:
diff --git a/packages/xqt2/files/imake-staging.patch b/packages/xqt2/files/imake-staging.patch
new file mode 100644
index 0000000000..bf2e350830
--- /dev/null
+++ b/packages/xqt2/files/imake-staging.patch
@@ -0,0 +1,38 @@
+--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
+@@ -2038,11 +2038,11 @@
+ */
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = LdPreLib $(INSTALLED_LIBS)
+ LDPOSTLIB = LdPostLib
+- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
++ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+
+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
+--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
++++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
+@@ -114,7 +114,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+ PICFLAGS = LargePositionIndependentCFlags
+ # endif
+--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
++++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
+@@ -3359,7 +3359,7 @@
+ FREETYPE2LIBDIR = Freetype2LibDir
+ FREETYPE2INCDIR = Freetype2IncDir
+ #if Freetype2LibDirStandard
+-FREETYPE2LIB = -lfreetype
++FREETYPE2LIB = $(LD_STAGING) -lfreetype
+ #else
+ FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
+ #endif
diff --git a/packages/xqt2/files/moc_call.patch b/packages/xqt2/files/moc_call.patch
new file mode 100644
index 0000000000..6e150e201a
--- /dev/null
+++ b/packages/xqt2/files/moc_call.patch
@@ -0,0 +1,11 @@
+--- xc/../xqt2/xfree86/xqt-driver/Imakefile 2006-05-09 11:59:07.000000000 +0200
++++ xc/../xqt2/xfree86/xqt-driver/Imakefile 2004-09-16 12:40:30.000000000 +0200
+@@ -12,7 +12,7 @@
+
+ QTDIR = QtDir
+
+-MOC = QtDir/bin/moc
++MOC = MocBin
+
+ INCLUDES = -I. \
+ -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
diff --git a/packages/xqt2/files/xchar2b.patch b/packages/xqt2/files/xchar2b.patch
new file mode 100644
index 0000000000..5561bc4ec7
--- /dev/null
+++ b/packages/xqt2/files/xchar2b.patch
@@ -0,0 +1,25 @@
+* XChar2b patch
+
+This is *EXTREMELY* important patch to handle strings contains 2-byte character
+correctly on ARM architecture hardware.
+
+On ARM architecture, size of the XChar2b structure will be 4, because gcc
+adds 2 byte padding at the last of the structure. This will breaks the
+XChar2b stream!
+
+This patch makes the size of the structure to 2 byte, with
+__attribute__ ((packed)) declaration.
+
+
+diff -ur xc.org/lib/X11/Xlib.h xc/lib/X11/Xlib.h
+--- xc.org/lib/X11/Xlib.h 2002-06-01 03:45:42.000000000 +0900
++++ xc/lib/X11/Xlib.h 2004-09-16 19:19:46.000000000 +0900
+@@ -1059,7 +1059,7 @@
+ typedef struct { /* normal 16 bit characters are two bytes */
+ unsigned char byte1;
+ unsigned char byte2;
+-} XChar2b;
++} __attribute__ ((packed)) XChar2b;
+
+ typedef struct {
+ XChar2b *chars; /* two byte characters */
diff --git a/packages/xqt2/files/xqt-make.patch b/packages/xqt2/files/xqt-make.patch
new file mode 100644
index 0000000000..f031b26794
--- /dev/null
+++ b/packages/xqt2/files/xqt-make.patch
@@ -0,0 +1,43 @@
+diff -ur xc.org/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
+--- xc.org/programs/Xserver/Imakefile 2003-02-18 02:06:40.000000000 +0900
++++ xc/programs/Xserver/Imakefile 2004-09-16 19:37:14.000000000 +0900
+@@ -1350,13 +1350,38 @@
+
+ #endif /* XDarwinServer */
+
++#if defined(XqtXServer)
++XCOMM
++XCOMM Xqt Server Section
++XCOMM
++
++QTDIR = QtDir
++
++KDDIRS = StdKdDirs
++
++XQTDDXDIR = hw/xqt
++SHADOWDIR = miext/shadow
++XQTDIRS = $(STDDIRS) $(KDDIRS) $(XQTDDXDIR) $(SHADOWDIR) $(LAYERDIR) $(DEPDIRS)
++
++XQTLIB = $(XQTDDXDIR)/LibraryTargetName(xqt)
++XQTOBJS =
++
++XQTLIBS = PreFbLibs $(XQTLIB) KdLibs $(SHADOW) $(LAYER) FbPostFbLibs
++XQTSYSLIBS = StdKdSysLibs -L$(QTDIR)/lib QtLibs
++
++/* C++ linker must be used to build Xqt server */
++CCLINK = $(CXXLINK)
++
++ServerTarget(Xqt,$(XQTDIRS),$(XQTOBJS),$(XQTLIBS),$(XQTSYSLIBS))
++#endif /* XqtServer */
++
+
+ CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
+ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR)
+ IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
+ DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
+ $(HPDDXDIR) $(XFREE86DDXDIR) $(XWINDDXDIR) $(DARWINDDXDIR) \
+- $(XVFBDDXDIR) $(XNESTDDXDIR)
++ $(XVFBDDXDIR) $(XNESTDDXDIR) $(XQTDDXDIR)
+ SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \
+ $(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) \
+ $(XWINPARSERDIR)
diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb
new file mode 100644
index 0000000000..1b294475a4
--- /dev/null
+++ b/packages/xqt2/xqt2_20060509.bb
@@ -0,0 +1,111 @@
+DESCRIPTION = "Xqt2 is an X-Server than runs within the Opie environment"
+HOMEPAGE = "http://xqt.sourceforge.jp"
+DEPENDS = "freetype libxi xmu flex-native virtual/libqte2 libqpe-opie"
+LICENSE = "GPL"
+SECTION = "opie/applications"
+APPTYPE = "binary"
+APPNAME = "Xqt"
+PR = "r0"
+
+inherit palmtop
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xqt2;method=pserver;date=${PV} \
+ http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-1.tgz \
+ http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-2.tgz \
+ http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-3.tgz \
+ http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-4.tgz \
+ http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-5.tgz \
+ file://KeyMap.patch;patch=1 \
+ file://moc_call.patch;patch=1 \
+ file://imake-staging.patch;patch=1 \
+ file://cross.patch;patch=1 \
+ file://fephack.patch;patch=1 \
+ file://xchar2b.patch;patch=1 \
+ file://xqt-make.patch;patch=1 "
+S = "${WORKDIR}/xc"
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+do_configure() {
+ #general config
+ echo "#define BuildServersOnly YES" > config/cf/host.def
+ echo "#define ProjectRoot /usr" >> config/cf/host.def
+
+ # do not build these XServers
+ echo "#define XnestServer NO" >> config/cf/host.def
+ echo "#define XdmxServer NO" >> config/cf/host.def
+
+ # build commands
+ echo "#define CcCmd ${CC}" >> config/cf/host.def
+ echo "#define CplusplusCmd ${CXX}" >> config/cf/host.def
+ echo "#define LdCmd ${LD}" >> config/cf/host.def
+
+ # Qt defines
+ echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
+ echo "#define QtDir ${QTDIR}" >> config/cf/host.def
+ echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
+ echo "#define MocBin ${STAGING_BINDIR}/moc" >> config/cf/host.def
+ echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX QtCmnDefs" >> config/cf/host.def
+
+ # Build these XServers
+ echo "#define XqtXServer YES" >> config/cf/host.def
+ echo "#define XF86Server NO" >> config/cf/host.def
+ echo "#define TinyXServer YES" >> config/cf/host.def
+ echo "#define KDriveXServer YES" >> config/cf/host.def
+ echo "#define KdriveServerExtraDefines -DDDXOSFATALERROR -DDDXOSVERRORF" >> config/cf/host.def
+
+ # General Config
+ echo "#define SystemUsrIncDir ${STAGING_INCDIR}" >> config/cf/host.def
+ echo "#define IncRoot ${STAGING_INCDIR}" >> config/cf/host.def
+ echo "#define LdPostLib -L${STAGING_LIBDIR}" >> config/cf/host.def
+
+ echo "#undef BuildRandR " >> config/cf/host.def
+ echo "#define BuildRandR YES" >> config/cf/host.def
+ echo "#define BuildLBX YES" >> config/cf/host.def
+
+ # change standard defines
+ if [ ${TARGET_ARCH} == "arm" ]; then
+ echo "#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE" >> config/cf/host.def
+ echo "#define Arm32Architecture" >> config/cf/host.def
+ fi
+ echo "" > config/cf/date.def
+}
+
+do_compile() {
+ export TOPDIR=${TOPDIR}
+ mkdir -p programs/Xserver/hw/xqt
+ #cp -r ../xqt-driver/* programs/Xserver/hw/xqt
+ (cd programs/Xserver/hw/xqt && ln -s ../../../../../xqt2/xfree86/xqt-driver/* .)
+ unset CC
+ make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
+ make CC="${BUILD_CC}" xmakefile
+ make Makefiles
+ make clean
+ #make depend
+ make includes CC="${BUILD_CC}"
+ make -C config/util CC="${BUILD_CC}"
+ for l in font xtrans Xdmcp Xau lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
+ make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xserver-xqt
+ install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xqt
+}
+
+do_install() {
+ oe_runmake -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" \
+ CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+ oe_runmake -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" \
+ CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+
+ install -d ${D}${palmtopdir}/Apps/applications/
+ install -m 0644 ${WORKDIR}/xqt2/xfree86/files/Xqt.desktop ${D}${palmtopdir}/Apps/applications
+ install -d ${D}${palmtopdir}/bin/
+ install -m 0755 ${D}${bindir}/Xqt ${D}${palmtopdir}/bin/Xqt
+ install -d ${D}${palmtopdir}/pics
+ install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}${palmtopdir}/pics
+}
+
+PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"