[oe-commits] org.oe.dev merge of '7e6adf2eba691057299d67aeff9562e39132c566'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Jul 6 12:55:16 UTC 2007
merge of '7e6adf2eba691057299d67aeff9562e39132c566'
and '87a802e7da1ecadc7269191d43d5c0434062ef8d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e8dc4f041dca4b8c8a8a6a99fd71ceeb39df12c6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e8dc4f041dca4b8c8a8a6a99fd71ceeb39df12c6
Files:
1
packages/openmoko-pim/openmoko-contacts
packages/openmoko-pim/openmoko-contacts/index.theme
packages/openmoko-pim/openmoko-contacts/intltool-update.in
packages/openmoko-pim/openmoko-contacts/stock_contact.png
packages/openmoko-pim/openmoko-contacts/stock_person.png
packages/openmoko-pim/openmoko-dates
packages/openmoko-pim/openmoko-dates/compile-fix.patch
packages/openmoko-pim/openmoko-dates/intltool-update.in
packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch
packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch
packages/openmoko-base/files
packages/openmoko-base/openmoko-session
packages/openmoko-apps/openmoko-terminal
packages/openmoko-base/openmoko-sound-system
packages/openmoko-pim/files
packages/openmoko-apps/openmoko-calculator_svn.bb
packages/openmoko-apps/openmoko-terminal/gtkterm2rc
packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop
packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png
packages/openmoko-apps/openmoko-terminal_svn.bb
packages/openmoko-base/openmoko-sound-system/pulseaudio
packages/openmoko-base/openmoko-sound-system/session
packages/openmoko-base/openmoko-sound-system_0.1.0.bb
packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
packages/openmoko-pim/files/index.theme
packages/openmoko-pim/files/intltool-update.in
packages/openmoko-pim/files/openmoko-dates.desktop
packages/openmoko-pim/files/openmoko-dates.png
packages/openmoko-pim/files/stock_contact.png
packages/openmoko-pim/files/stock_person.png
packages/openmoko-pim/openmoko-tasks_svn.bb
packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
packages/openmoko-base/openmoko-libs_svn.bb
packages/openmoko-base/openmoko-session/session
packages/openmoko-base/openmoko-session_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
packages/openmoko-pim/openmoko-dates_svn.bb
packages/openmoko-pim/openmoko-today_svn.bb
packages/tasks/task-openmoko.bb
mtn:manual_merge
true
mtn:execute
packages/bluez/bluez-utils/02dtl1_cs.sh
packages/opie-init/opie-init/c7x0/opie
packages/opie-init/opie-init/mnci/opie
packages/perl/perl-5.8.8/native-makedepend-dash.patch
packages/gtkhtml/gtkhtml-3.6
packages/linux/linux-handhelds-2.6/htcapache
packages/linux/linux-handhelds-2.6/htcsable
packages/bluez/bluez-dtl1-workaround_1.0.bb
packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch
packages/libtool/libtool-1.5.10/rpath-control.patch
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/opie-multikey/files/fix-rpath.patch
packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/perl/perl-5.8.8/asm-pageh-fix.patch
packages/perl/perl-5.8.8/makedepend-dash.patch
packages/uclibc/files/errno_values.h.patch
packages/uclibc/files/termios.h.patch
packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
classes/kernel.bbclass
classes/opie.bbclass
classes/palmtop.bbclass
classes/sdk.bbclass
conf/bitbake.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
conf/machine/h2200.conf
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/index.php
contrib/feed-browser/update.php
packages/bluez/bluez-utils.inc
packages/bluez/bluez-utils_3.11.bb
packages/bluez/bluez-utils_3.12.bb
packages/bluez/bluez-utils_3.4.bb
packages/bluez/bluez-utils_3.7.bb
packages/bluez/bluez-utils_3.8.bb
packages/gaim/pidgin.inc
packages/gaim/pidgin_2.0.2.bb
packages/glib-2.0/glib-2.0_2.12.12.bb
packages/glib-2.0/glib.inc
packages/gpephone/xoo-vm_0.7-20070204.bb
packages/gtkhtml/gtkhtml-3.6_3.6.2.bb
packages/gtkmm/gtkmm.inc
packages/libopie/libopie2.inc
packages/libopie/libopie2_cvs.bb
packages/libopietooth/libopietooth1.inc
packages/libopietooth/libopietooth1_cvs.bb
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_cvs.bb
packages/libqtaux/libqtaux2.inc
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-x86-2.6.20/i486-defconfig
packages/linux/linux-x86_2.6.20.bb
packages/meta/meta-sdk-gpe.bb
packages/meta/meta-sdk.bb
packages/opie-alarm/opie-alarm/01opiealarm
packages/opie-alarm/opie-alarm.inc
packages/opie-alarm/opie-alarm_cvs.bb
packages/opie-init/opie-init/opie
packages/opie-init/opie-init.inc
packages/opie-init/opie-init_1.2.2.bb
packages/opie-multikey/opie-multikey_cvs.bb
packages/opie-networksettings/opie-networksettings.inc
packages/opie-networksettings/opie-networksettings_cvs.bb
packages/opie-qcop/opie-qcop.inc
packages/opie-qcop/opie-qcop_cvs.bb
packages/opie-qss/opie-qss.inc
packages/opie-qss/opie-qss_cvs.bb
packages/opie-quicklauncher/opie-quicklauncher.inc
packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/perl/perl-native_5.8.8.bb
packages/perl/perl_5.8.8.bb
packages/qemu/qemu-native.inc
packages/qt/qt4_arch.inc
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
packages/tasks/task-base.bb
packages/tasks/task-opie.bb
packages/uclibc/uclibc_0.9.29.bb
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
Diffs:
#
# mt diff -r7e6adf2eba691057299d67aeff9562e39132c566 -re8dc4f041dca4b8c8a8a6a99fd71ceeb39df12c6
#
#
#
# delete "packages/openmoko-pim/openmoko-contacts"
#
# delete "packages/openmoko-pim/openmoko-contacts/index.theme"
#
# delete "packages/openmoko-pim/openmoko-contacts/intltool-update.in"
#
# delete "packages/openmoko-pim/openmoko-contacts/stock_contact.png"
#
# delete "packages/openmoko-pim/openmoko-contacts/stock_person.png"
#
# delete "packages/openmoko-pim/openmoko-dates"
#
# delete "packages/openmoko-pim/openmoko-dates/compile-fix.patch"
#
# delete "packages/openmoko-pim/openmoko-dates/intltool-update.in"
#
# delete "packages/openmoko-pim/openmoko-dates/om-dates-temp-buildfix_20070308.patch"
#
# delete "packages/openmoko-pim/openmoko-dates/remove-bogus-include.patch"
#
# rename "packages/openmoko-base/files"
# to "packages/openmoko-base/openmoko-session"
#
# add_dir "packages/openmoko-apps/openmoko-terminal"
#
# add_dir "packages/openmoko-base/openmoko-sound-system"
#
# add_dir "packages/openmoko-pim/files"
#
# add_file "packages/openmoko-apps/openmoko-calculator_svn.bb"
# content [337cc4cd117cefda5d1110edcb0ff572ffdda2ca]
#
# add_file "packages/openmoko-apps/openmoko-terminal/gtkterm2rc"
# content [cb9f7dc9458766f12f26d77224f3cf15425c5e6c]
#
# add_file "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop"
# content [c6a4e2f10cf669b9feb999ea6a2fcda0201d0a1d]
#
# add_file "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png"
# content [e7db9d314755face71a3ad7fd49d186333e1202f]
#
# add_file "packages/openmoko-apps/openmoko-terminal_svn.bb"
# content [5b909c837b04c515be7224d5aac6d622a8c27550]
#
# add_file "packages/openmoko-base/openmoko-sound-system/pulseaudio"
# content [d433451e55cb5437d6d11869506ebab909fc386b]
#
# add_file "packages/openmoko-base/openmoko-sound-system/session"
# content [2d729d476a1b9fa1ab08c40c8f8d00ff7e126359]
#
# add_file "packages/openmoko-base/openmoko-sound-system_0.1.0.bb"
# content [b17f4014d9d87df4e995907d56b14ff983834d1d]
#
# add_file "packages/openmoko-base/openmoko-sound-theme-standard_svn.bb"
# content [6e57e9b6ea74759e04f0c76d6855305a93ded158]
#
# add_file "packages/openmoko-pim/files/index.theme"
# content [86a7df229b6c78109d39db118f65d6d384a89ffc]
#
# add_file "packages/openmoko-pim/files/intltool-update.in"
# content [b66bce5c6724910ec058c62cc14d5987adb6ff75]
#
# add_file "packages/openmoko-pim/files/openmoko-dates.desktop"
# content [6c99efb02f5b06ed514caa4d21f5730b547fe276]
#
# add_file "packages/openmoko-pim/files/openmoko-dates.png"
# content [b55c10b47a4d5d1aa15e5e26584f951ecc39c092]
#
# add_file "packages/openmoko-pim/files/stock_contact.png"
# content [1b6ef3d87bd8e2e471c29e26cc36bf881f7a19b8]
#
# add_file "packages/openmoko-pim/files/stock_person.png"
# content [2a100b56cdbb251c95db843ad5142a01a40d9be5]
#
# add_file "packages/openmoko-pim/openmoko-tasks_svn.bb"
# content [9c4d4168ec79558e95869d4094bbb093beb1bf0e]
#
# patch "packages/openmoko-base/openmoko-icon-theme-standard_svn.bb"
# from [1bb8567e5884cb5cfff6a978969c2bdda39a17b0]
# to [80697dbfe450a8f2d4047ec78dde405e797d5a57]
#
# patch "packages/openmoko-base/openmoko-libs_svn.bb"
# from [dd7eb1f538df699f20256d8f379700b3a72f2cef]
# to [adf0ca211a78e2352a7a4ba89dc18d49eb8f2ee7]
#
# patch "packages/openmoko-base/openmoko-session/session"
# from [63f0b0b66b735a4c931d806d858d877a7b0b0ba0]
# to [63b586046c1425b8e3e086e9c21de425e61b893c]
#
# patch "packages/openmoko-base/openmoko-session_svn.bb"
# from [48ddee5be6a27435d476a746622d29fc73e5c6a9]
# to [718fa6627900d5dca4f892c41ae12c3e48cc8ff2]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb"
# from [991954459f09926de2d3e390938d130774c1f2b8]
# to [260a4ef2e7491dfc23d96d055a0a0e1ed674ee54]
#
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
# from [6d104d0313f76959c66df4b901536055301d1467]
# to [bfc63108e3dc559f00f3a76883668682fdd583c0]
#
# patch "packages/openmoko-pim/openmoko-today_svn.bb"
# from [8868668fe6c32f7f8815bebb4e74929cfed7db2b]
# to [df476ab7fc344063de78fe6a654104181e61337e]
#
# patch "packages/tasks/task-openmoko.bb"
# from [9d1d4ea6b3f7a6edb9b60d090084b5ce649b06b6]
# to [859882ae5d3c109a3ecc2a2257452e468d11ac72]
#
# set "packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/openmoko-base/openmoko-sound-system/pulseaudio"
# attr "mtn:execute"
# value "true"
#
# set "packages/openmoko-pim/files/openmoko-dates.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/openmoko-pim/files/stock_contact.png"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/openmoko-pim/files/stock_person.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/openmoko-apps/openmoko-calculator_svn.bb 337cc4cd117cefda5d1110edcb0ff572ffdda2ca
+++ packages/openmoko-apps/openmoko-calculator_svn.bb 337cc4cd117cefda5d1110edcb0ff572ffdda2ca
@@ -0,0 +1,9 @@
+DESCRIPTION = "The OpenMoko Calculator Application"
+SECTION = "openmoko/applications"
+AUTHOR = "Rodolphe Ortalo <rodolphe.ortalo at free.fr>"
+
+PV = "0.0.3+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko
+
============================================================
--- packages/openmoko-apps/openmoko-terminal/gtkterm2rc cb9f7dc9458766f12f26d77224f3cf15425c5e6c
+++ packages/openmoko-apps/openmoko-terminal/gtkterm2rc cb9f7dc9458766f12f26d77224f3cf15425c5e6c
@@ -0,0 +1,85 @@
+##
+# 1=RIGHT, 2=TOP, 3=BOTTOM, 4=LEFT
+##
+notebookPanel=3
+
+##
+# 0=HIDDEN, 1=LEFT, 2=RIGHT
+##
+terminalScrollbar=2
+
+##
+# 0=NO SCROLLBAR
+##
+maxScrollbackBuffer=999
+
+##
+# 0=FALSE, 1=TRUE
+##
+quitPRGonExitLastTerminal=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+showTabsByOneTerminal=0
+
+##
+#A Font name: use gnome-font-properties to look at available fonts
+##
+terminalFont=BitStream Vera Sans Mono 11
+
+##
+# Separator for marking with mouse
+##
+worldClass=-A-Za-z0-9/_:.,?+%=
+
+##
+# 0=FALSE, 1=TRUE
+##
+scrollOnKeyStroke=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+scrollOnOutput=0
+
+##
+# 0=FALSE, 1=TRUE
+##
+blink=1
+
+##
+# 0=FALSE, 1=TRUE
+##
+beep=1
+
+##
+# x y Default Terminal Size in pix
+##
+terminalSize=80 25
+
+##
+# NEW COLOR Definition
+##
+red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0xcccc 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
+grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc 0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
+blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0xcccc 0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
+
+##
+# COLOR Definition
+##
+
+##
+# First section
+##
+[section]
+match=
+worldClass=-A-Za-z0-9/_:.,?+%=
+scrollOnKeyStroke=1
+scrollOnOutput=0
+beep=1
+blink=1
+red=0x0000 0xcccc 0x0000 0xaaaa 0x0000 0xaaaa 0x6666 0xaaaa 0x0000 0x0000 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff 0x5555 0xffff
+grn=0x0000 0xcccc 0x0000 0x0000 0xaaaa 0x5555 0x6666 0x0000 0xaaaa 0xcccc 0x5555 0x5555 0xffff 0xffff 0x5555 0x5555 0xffff 0xffff
+blu=0x0000 0xcccc 0x0000 0x0000 0x0000 0x0000 0xffff 0xaaaa 0xaaaa 0x0000 0x5555 0x5555 0x5555 0x5555 0xffff 0xffff 0xffff 0xffff
+
============================================================
--- packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop c6a4e2f10cf669b9feb999ea6a2fcda0201d0a1d
+++ packages/openmoko-apps/openmoko-terminal/openmoko-terminal.desktop c6a4e2f10cf669b9feb999ea6a2fcda0201d0a1d
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Terminal
+Comment=Command Line Interface Terminal
+Exec=gtkterm2
+Icon=openmoko-terminal
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=false
+StartupNotify=true
============================================================
# packages/openmoko-apps/openmoko-terminal/openmoko-terminal.png is binary
============================================================
--- packages/openmoko-apps/openmoko-terminal_svn.bb 5b909c837b04c515be7224d5aac6d622a8c27550
+++ packages/openmoko-apps/openmoko-terminal_svn.bb 5b909c837b04c515be7224d5aac6d622a8c27550
@@ -0,0 +1,34 @@
+DESCRIPTION = "The OpenMoko Command Line Console"
+SECTION = "openmoko/applications"
+RDEPENDS += "gtkterm2"
+PV = "1.0.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko
+
+SRC_URI = "file://openmoko-terminal.png \
+ file://openmoko-terminal.desktop \
+ file://gtkterm2rc"
+
+do_install() {
+ install -d ${D}${sysconfdir}/skel
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/
+ install -m 0644 ${WORKDIR}/gtkterm2rc ${D}${sysconfdir}/skel/.gtkterm2rc
+}
+
+pkg_postinst_openmoko-terminal() {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+ exit 1 # don't run at image generation time
+else
+ if [ -e "$HOME/.gtkterm2rc" ]; then
+ echo "not overriding $HOME/.gtkterm2rc"
+ else
+ echo "installing $HOME/.gtkterm2rc from /etc/skel"
+ cp -f ${sysconfdir}/skel/.gtkterm2rc $HOME/
+ fi
+fi
+}
============================================================
--- packages/openmoko-base/openmoko-sound-system/pulseaudio d433451e55cb5437d6d11869506ebab909fc386b
+++ packages/openmoko-base/openmoko-sound-system/pulseaudio d433451e55cb5437d6d11869506ebab909fc386b
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# pulseaudio This shell script starts and stops pulseaudio.
+#
+# chkconfig: 345 90 40
+# description: Pulseaudio manages the sound input/output
+# processname: pulseaudio
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="pulseaudio"
+
+start() {
+ echo -n "Starting the audio server..."
+ # FIXME once alsa/shm permissions have been fixed, supply --system
+ pulseaudio --resample-method=trivial -D -nF /etc/pulse/session
+ echo $prog
+}
+
+stop() {
+ # Stop daemons.
+ echo -n "Shutting down $prog: "
+ killall pulseaudio
+ echo "done"
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
+exit $RETVAL
============================================================
--- packages/openmoko-base/openmoko-sound-system/session 2d729d476a1b9fa1ab08c40c8f8d00ff7e126359
+++ packages/openmoko-base/openmoko-sound-system/session 2d729d476a1b9fa1ab08c40c8f8d00ff7e126359
@@ -0,0 +1,26 @@
+#!/usr/bin/pulseaudio -nF
+
+# Create autoload entries for the device drivers
+add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output
+add-autoload-source input module-alsa-source source_name=input
+
+# Load several protocols
+load-module module-esound-protocol-unix
+load-module module-simple-protocol-tcp
+load-module module-native-protocol-unix
+load-module module-cli-protocol-unix
+
+# Make some devices default
+set-default-sink output
+set-default-source input
+
+# Don't fail if the audio files referred to below don't exist
+.nofail
+
+# Load an audio to the sample cache for usage with module-x11-bell
+load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
+load-module module-x11-bell sample=x11-bell
+
+# Load samples
+load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
============================================================
--- packages/openmoko-base/openmoko-sound-system_0.1.0.bb b17f4014d9d87df4e995907d56b14ff983834d1d
+++ packages/openmoko-base/openmoko-sound-system_0.1.0.bb b17f4014d9d87df4e995907d56b14ff983834d1d
@@ -0,0 +1,31 @@
+DESCRIPTION = "OpenMoko Sound System"
+SECTION = "openmoko/base"
+RDEPENDS = "\
+ pulseaudio-server \
+ pulseaudio-module-alsa-sink \
+ pulseaudio-module-alsa-source \
+ pulseaudio-module-cli \
+ pulseaudio-module-esound-protocol-unix \
+ pulseaudio-module-simple-protocol-tcp \
+ pulseaudio-module-native-protocol-unix \
+ pulseaudio-module-cli-protocol-unix \
+"
+PR = "r5"
+
+inherit openmoko-base update-rc.d
+
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+ file://session"
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+ install -d ${D}/${sysconfdir}/pulse
+ install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+}
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/openmoko-base/openmoko-sound-theme-standard_svn.bb 6e57e9b6ea74759e04f0c76d6855305a93ded158
+++ packages/openmoko-base/openmoko-sound-theme-standard_svn.bb 6e57e9b6ea74759e04f0c76d6855305a93ded158
@@ -0,0 +1,23 @@
+DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
+S = "${WORKDIR}/sounds"
+
+do_install() {
+ find ${WORKDIR} -name ".svn" | xargs rm -rf
+ install -d ${D}${datadir}/openmoko/sounds
+ for i in *.mp3; do
+ cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
+ done
+ for i in touchscreen_click.wav notify_doorbell.wav startup_openmoko.wav; do
+ cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+ done
+}
+
+FILES_${PN} = "${datadir}"
+
============================================================
--- packages/openmoko-pim/files/index.theme 86a7df229b6c78109d39db118f65d6d384a89ffc
+++ packages/openmoko-pim/files/index.theme 86a7df229b6c78109d39db118f65d6d384a89ffc
@@ -0,0 +1,654 @@
+[Icon Theme]
+Name=Hicolor
+Comment=Fallback icon theme
+Hidden=true
+Directories=192x192/apps,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,72x72/apps,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,36x36/apps,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,24x24/actions,24x24/apps,24x24/devices,24x24/filesystems,24x24/mimetypes,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/document,32x32/stock/form,32x32/stock/generic,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/document,36x36/stock/form,36x36/stock/generic,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/document,48x48/stock/form,48x48/stock/generic,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,scalable/emblems,192x192/emblems,96x96/emblems,72x72/emblems,48x48/emblems,36x36/emblems,24x24/emblems,16x16/emblems,12x12/emblems
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
+
+[16x16/apps]
+Size=16
+Context=Applications
+Type=Threshold
+
+[16x16/devices]
+Size=16
+Context=Devices
+Type=Threshold
+
+[16x16/filesystems]
+Size=16
+Context=FileSystems
+Type=Threshold
+
+[16x16/mimetypes]
+Size=16
+Context=MimeTypes
+Type=Threshold
+
+[22x22/actions]
+%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r87a802e7da1ecadc7269191d43d5c0434062ef8d -re8dc4f041dca4b8c8a8a6a99fd71ceeb39df12c6
#
#
#
# delete "packages/bluez/bluez-utils/02dtl1_cs.sh"
#
# delete "packages/opie-init/opie-init/c7x0/opie"
#
# delete "packages/opie-init/opie-init/mnci/opie"
#
# delete "packages/perl/perl-5.8.8/native-makedepend-dash.patch"
#
# add_dir "packages/gtkhtml/gtkhtml-3.6"
#
# add_dir "packages/linux/linux-handhelds-2.6/htcapache"
#
# add_dir "packages/linux/linux-handhelds-2.6/htcsable"
#
# add_file "packages/bluez/bluez-dtl1-workaround_1.0.bb"
# content [4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f]
#
# add_file "packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch"
# content [24ca1839c8f9660e8791e4a91370e3e6f805a70f]
#
# add_file "packages/libtool/libtool-1.5.10/rpath-control.patch"
# content [4b31b6687ccede8fff1b635bac99942b42df9243]
#
# add_file "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
# content [7addd9dd4ac5d4edc0a0214f42a704e645017508]
#
# add_file "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
# content [8859f0978e3ec80e423cf6fa402235335902f60a]
#
# add_file "packages/opie-multikey/files/fix-rpath.patch"
# content [c1275cf0c3e1eac9898ee5c1bb9b3ff0ba0f0486]
#
# add_file "packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch"
# content [3149f72c0600716f90b9ece4df7300b28f3c5dee]
#
# add_file "packages/opie-taskbar/opie-taskbar-images.inc"
# content [d360a128f6873d3f280eb4f83502e056159dc8df]
#
# add_file "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
# content [f3d0e51204ca5fdab33a587c2c7f69acfa799f9e]
#
# add_file "packages/perl/perl-5.8.8/asm-pageh-fix.patch"
# content [88de907a5838bef4de53f3c7515dad79964e02c0]
#
# add_file "packages/perl/perl-5.8.8/makedepend-dash.patch"
# content [a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27]
#
# add_file "packages/uclibc/files/errno_values.h.patch"
# content [449baeeb6e48f88f75f07d09cdee9bd3ffcba48e]
#
# add_file "packages/uclibc/files/termios.h.patch"
# content [a49212a1ef49d0a938f6687ab867600f05b3f1a4]
#
# add_file "packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb"
# content [97dfedad01f8662328b1032c806286a00f75caa0]
#
# patch "classes/kernel.bbclass"
# from [b3df4a5e97f27bbbdeedf06373b1f8a115c48333]
# to [2e82e59b9e169550dbe74e03b862098d7257369f]
#
# patch "classes/opie.bbclass"
# from [2653571d91e93ff5043997740e80656344ad35d8]
# to [441638d80c7d1595e6037940f20b24b8bca48ebd]
#
# patch "classes/palmtop.bbclass"
# from [47dee0d1bcbc560241a59d1d1689a90ca8e37b3f]
# to [56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb]
#
# patch "classes/sdk.bbclass"
# from [f5a6cb53cd1f28070b6b61af23f5004767157e55]
# to [100957b869cd48dd7933ace807f396c946442a32]
#
# patch "conf/bitbake.conf"
# from [4481b02aa24ad52f996889ffadf4f12e9912c116]
# to [28be7aa3c03959211fa8fff38d1903e1ec2dd8de]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [5f9d6cf541be67c463ff4f89b5de124a851e5dc5]
# to [492fb6241aa69eb82747c0c5b369480a2ed86c6f]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
# from [5f9b174bd679d8f5b634fdcde2cddde0853a9369]
# to [07a52b1c21aa01167bd3a2e275bec12dab2a4797]
#
# patch "conf/machine/h2200.conf"
# from [06be039ceb7fc91de15ca6a3389483ee6372798f]
# to [ff1f7205bab8be68726927066f32d2c9dbc19f32]
#
# patch "contrib/feed-browser/includes/functions.inc"
# from [f33374987037202cd21d7f82a93b7da3f0c573a9]
# to [041208fd72802891209d607c7a4f1777a946ed1d]
#
# patch "contrib/feed-browser/index.php"
# from [0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf]
# to [b7a98a4213e06372bea54a7e27ea29b13d1e615a]
#
# patch "contrib/feed-browser/update.php"
# from [0a6696349338576e60018f0f8fbbf645cec91913]
# to [9b418cf2e8cefddae617ffd8e121293445ea1ee1]
#
# patch "packages/bluez/bluez-utils.inc"
# from [41deef17c0f5dace32506f5702ea35539c41bff6]
# to [13716750ab0571681b9e8449ea1ce394c881897e]
#
# patch "packages/bluez/bluez-utils_3.11.bb"
# from [4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10]
# to [0b6adc1cba101361b308c4adcb33d6ec603c6be6]
#
# patch "packages/bluez/bluez-utils_3.12.bb"
# from [c9a40ce5190424b1ede28c8cc855bb8d094a3186]
# to [bff8a6de03a41e1f81fd85fc8e43f72ae0ccc458]
#
# patch "packages/bluez/bluez-utils_3.4.bb"
# from [6e23c5824e702fbbaab762244716ebfd9bcdcc4b]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
# patch "packages/bluez/bluez-utils_3.7.bb"
# from [7644ffe67fd0cf94cfed472498a4263e024d4de3]
# to [997459c635cbd92f7c2b398e5962dd23bf5c9623]
#
# patch "packages/bluez/bluez-utils_3.8.bb"
# from [dd085c7f50957785f015790ff90f72a6eab37cf1]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
# patch "packages/gaim/pidgin.inc"
# from [e29a09b918f8e325f24898d1a61c57d3a11e50e7]
# to [f2b101bebf0f41aa0943a55e76c86c0933428cbc]
#
# patch "packages/gaim/pidgin_2.0.2.bb"
# from [f38dd9af51ab37706164482bcece1477daca655a]
# to [a9a41db903f3d596482445b8db09f363c20c02fd]
#
# patch "packages/glib-2.0/glib-2.0_2.12.12.bb"
# from [2816061c0061c8373ee760be7e88620e243cbc2a]
# to [030996100e8c5110ee7690dae2a49a7cef321ecf]
#
# patch "packages/glib-2.0/glib.inc"
# from [07cceb9af55dc0d2d4fe2a1e1889a66327fdc4c8]
# to [09c2d1615f7c249f8ab1c68778bafbc98293ff6b]
#
# patch "packages/gpephone/xoo-vm_0.7-20070204.bb"
# from [5228f8e9c69a2d20caea19ae8d355fdf2a5295bb]
# to [75d7ab96fd0fb00311b37907ddb10da84d8bef4e]
#
# patch "packages/gtkhtml/gtkhtml-3.6_3.6.2.bb"
# from [8e6b36356e74e2e1e8b0ca6bb493a488f4df5610]
# to [635c93b9d318b910d01d772af59963371fdab2cd]
#
# patch "packages/gtkmm/gtkmm.inc"
# from [5daa50929bf91d353c37e24808bdcf6ffe37866c]
# to [c99e2e2f13acddd410f35d4c40468e00186e71fb]
#
# patch "packages/libopie/libopie2.inc"
# from [1473fa57b6e31b62c32c3f467f79fb57b52dc658]
# to [46a70b5412163b8031b130f39a8726cfbb93dd6b]
#
# patch "packages/libopie/libopie2_cvs.bb"
# from [66b355cdaf0863882ba11282e95ea14ad73da233]
# to [5bb0e0ab2a48fe329bb2f0f14bf1d5f9e3b8af87]
#
# patch "packages/libopietooth/libopietooth1.inc"
# from [c21cf9e9a7e0dea60da73327864bd21d66ad8e8a]
# to [e59ef172e1966dd379dcb4b605c11edc65d8ba97]
#
# patch "packages/libopietooth/libopietooth1_cvs.bb"
# from [d5762ce00b24d296f0b7f5a2706bea8fc623480e]
# to [4b37cb3e703e6e899c9ae8fe5bd1ac58dbbb0147]
#
# patch "packages/libqpe/libqpe-opie.inc"
# from [3346fde77506aea54b8d7d57c5fe1dcae017a6ca]
# to [c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [f96cc1aefe160f38dd0536ab17ca7a8896d39937]
# to [66eb84a06f4f226608fdaccbcc077ac5fb2e540e]
#
# patch "packages/libqtaux/libqtaux2.inc"
# from [5250f41cd924ff8df098caa6a7e0729af80c2553]
# to [0c427ee2ab568405ca1b63c3b4c07177b5963b94]
#
# patch "packages/libtool/libtool-cross_1.5.10.bb"
# from [3b24a14b6df3c0d9f7064a5bab60102a3ebe1b57]
# to [1d9d18b4a0241cde485f05db92de7f18738d2507]
#
# patch "packages/libtool/libtool-native_1.5.10.bb"
# from [bc799a0464069f3531cbb0a017c4d8d2a1afd63e]
# to [3db44cdc921e61d2528664266cd0eda2cbf4d430]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [a52ed332d359bc91a192a08cf926d94a67787424]
# to [cbbdd4376b6cb43e5460b02f28a25c2a29323db7]
#
# patch "packages/linux/linux-x86-2.6.20/i486-defconfig"
# from [eaeef6226e5d7f2bff7c3cadede34d438f45330a]
# to [cff3c0080167dd8eefe97ec8f9ba2f6e1b60269d]
#
# patch "packages/linux/linux-x86_2.6.20.bb"
# from [0f6a1d20b4dcd3f8f28bcd7434bd8c778f6494de]
# to [3221d944ae3c2cbf3030007c7cc3d0ac8f0ff3f0]
#
# patch "packages/meta/meta-sdk-gpe.bb"
# from [47ea869e6d4ac18d47ca62a018ebea80da185c55]
# to [911556373f204b869c56247be3aa3b40fc1f128a]
#
# patch "packages/meta/meta-sdk.bb"
# from [07d62cef69fc1e5ce78c9473a1807dab6b7e1a55]
# to [807b4b0871d6078e260e5f860e81d01c4d38a7b1]
#
# patch "packages/opie-alarm/opie-alarm/01opiealarm"
# from [f4c0fab007d8b54c9b69608c97748164b7fdcd10]
# to [f904dc9959b3d5118cc391b82d0fd5d5ff16ffc2]
#
# patch "packages/opie-alarm/opie-alarm.inc"
# from [4a1a59205a8611a22b1346bc7f42b353e20d5652]
# to [07de57bed4ed8e3cb6e9d63ab283f3914598dc35]
#
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
# from [1796ca94836c627bd6abf2690d14a343efbdf8ee]
# to [aadc0b4fc4280abbdfd3f206d4d8e240fbb48621]
#
# patch "packages/opie-init/opie-init/opie"
# from [939a977703c5c993189c8355d175b621bfe71969]
# to [93b7f76dcb458b0a64b1675729ab077b8f12daf6]
#
# patch "packages/opie-init/opie-init.inc"
# from [5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d]
# to [d712bf62a00db9475cc0d6bc511012e02a6ae815]
#
# patch "packages/opie-init/opie-init_1.2.2.bb"
# from [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
# to [1780c7093e5c02aea9b70522d452841ba424f856]
#
# patch "packages/opie-multikey/opie-multikey_cvs.bb"
# from [2254fb5be4ca2f2ed96362209f6d3ba3a030ab1a]
# to [eeeb85a14c02e906b881fe457e35e8b763c7a532]
#
# patch "packages/opie-networksettings/opie-networksettings.inc"
# from [97e2373b09df75c93aea7b014dfd9090f50fe171]
# to [eb022a472b604f09c97ffb9d451798e9451c16fa]
#
# patch "packages/opie-networksettings/opie-networksettings_cvs.bb"
# from [fdf639c975afaedf8b2ce6fc7b065b61b9205e7d]
# to [68708b9ebf72a6e166db6c397ee9a0419886312d]
#
# patch "packages/opie-qcop/opie-qcop.inc"
# from [5a2b1a1f0ec2d69a4d4c851c4d6ac6c50ca0a49d]
# to [fcf1b2682b07002f61b4f423c9ba3de8f1267a93]
#
# patch "packages/opie-qcop/opie-qcop_cvs.bb"
# from [c2097d44582c668bbb719ae77cb032333a4a58de]
# to [13db751dc05218bcda19c0254130a3083f6f6137]
#
# patch "packages/opie-qss/opie-qss.inc"
# from [24500a4faeeb7c466f109bbac2d55ad32a0de673]
# to [35451379dab7f75ba605b88c3ff29bb4f09d8641]
#
# patch "packages/opie-qss/opie-qss_cvs.bb"
# from [197567cb76e69706001149dcace45820034867bb]
# to [f270446f9bf86f9676a307c3f33e54275536b6d6]
#
# patch "packages/opie-quicklauncher/opie-quicklauncher.inc"
# from [08c19f70c27a55e7af90b65ca9f2bbf5a36a8f55]
# to [48fe0abf27157f260e622aa3abfa2c54ea2a92ed]
#
# patch "packages/opie-quicklauncher/opie-quicklauncher_cvs.bb"
# from [d844e5142763e1aa87b5ceba214d3ba4a89a8606]
# to [f9d1805249f9ed2056460ce0eb86fc1977af98e3]
#
# patch "packages/opie-taskbar/opie-taskbar.inc"
# from [5e37066e544b2568997efb629a7497162c167149]
# to [be2742efc78e19b24da24ffd4ac78bff559fed6e]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [6e4c569e12d7cb8d875e488eac41f12c82db84a9]
# to [6ab03fd59add9cd0437b756d1e8d70378db9023c]
#
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
# from [485a535dc2b358d5755ccec0f9697b159b0bb964]
# to [4dc8b9267c72d84126fbce18970082e888865a36]
#
# patch "packages/perl/perl-native_5.8.8.bb"
# from [2f2d7163b1fd47aa9554cf3e954cd81ea1e73556]
# to [2cae048240cb214c212fca8f25326366a6306e02]
#
# patch "packages/perl/perl_5.8.8.bb"
# from [f198d25a435c2c098c223920580b19b2aca03755]
# to [c97084e319193690d0222303aa7f475971c1dff9]
#
# patch "packages/qemu/qemu-native.inc"
# from [71d3322a1e1cff08495c023c071fdd6a29e15a80]
# to [740a86de6db274cb5c05df97968b02f1bc33a4cf]
#
# patch "packages/qt/qt4_arch.inc"
# from [8912a21d98b8e45e7143daad589738537496a81a]
# to [43091f9af06d057e17db4730361caf8d5fc177c6]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [77b17aa1d6610e4d5c33ba805a1fef052f47a292]
# to [0e2d31bd18afd0af1299d429093ac3e9f7267767]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [f87b668c5dc754048758ef15a98e30583eb4067b]
# to [ea3847c6b0e7010eb2a471918cdea3a7aa68f032]
#
# patch "packages/tasks/task-base.bb"
# from [3514d4e6a1530da85764ea0064424f2cb95b4e98]
# to [6b16edd2133933a5f4f6922ccb991374fbed6a1a]
#
# patch "packages/tasks/task-opie.bb"
# from [104850af17afa7f7a6340e0cbf3ef4e4bb8351ad]
# to [d9b3a961501d5c121f18763d6efbd94634b0ebb4]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [4747e0d84e923f3e2393759e6b97315cedfb9b8a]
# to [a0c7d07639a2581b3d3ac3d18b716e2ea54fecca]
#
# patch "packages/udev/udev_092.bb"
# from [9c280c1d2cc7237d3dd3cc93dd6a6861334b7786]
# to [3b1cae0e753955c3ad4b534712c7f13582d9a938]
#
# patch "packages/udev/udev_097.bb"
# from [8d341ef0c55e6945df0f9050797bba9644b6d15b]
# to [1944d7e0e7e54cc38dcca0c59c66c7080828011f]
#
# patch "packages/udev/udev_100.bb"
# from [cf318dbe137533d51d411b1f6361520cd7e366a3]
# to [3a32c3de3de21597a8c1984dbf4e9892cafda3b0]
#
============================================================
--- packages/bluez/bluez-dtl1-workaround_1.0.bb 4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f
+++ packages/bluez/bluez-dtl1-workaround_1.0.bb 4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f
@@ -0,0 +1,17 @@
+DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume."
+SECTION = "console"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "file://02dtl1_cs.sh"
+
+do_install() {
+ install -d ${D}${sysconfdir}/apm/event.d/
+ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch 24ca1839c8f9660e8791e4a91370e3e6f805a70f
+++ packages/gtkhtml/gtkhtml-3.6/cross-includedir.patch 24ca1839c8f9660e8791e4a91370e3e6f805a70f
@@ -0,0 +1,25 @@
+diff --git a/components/html-editor/Makefile.am b/components/html-editor/Makefile.am
+index 7fda5ae..925e409 100644
+--- a/components/html-editor/Makefile.am
++++ b/components/html-editor/Makefile.am
+@@ -5,7 +5,7 @@ gtkhtml_data = $(datadir)/gtkhtml- at GTKHTML_API_VERSION@
+ gladedir = $(gtkhtml_data)
+ glade_DATA = gtkhtml-editor-properties.glade
+
+-INCLUDES = -I$(top_srcdir)/src -I$(srcdir) -I$(includedir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
++INCLUDES = -I$(top_srcdir)/src -I$(srcdir) $(GTKHTML_CFLAGS) $(SOUP_CFLAGS) \
+ -DG_LOG_DOMAIN=\"gtkhtml\" \
+ -DSRCDIR=\"$(srcdir)\" \
+ -DPREFIX=\"$(prefix)\"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f76178f..2d70183 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,6 @@ NULL=
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(srcdir) \
+- -I$(includedir) \
+ $(GTKHTML_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ -DG_LOG_DOMAIN=\"gtkhtml\" \
============================================================
--- packages/libtool/libtool-1.5.10/rpath-control.patch 4b31b6687ccede8fff1b635bac99942b42df9243
+++ packages/libtool/libtool-1.5.10/rpath-control.patch 4b31b6687ccede8fff1b635bac99942b42df9243
@@ -0,0 +1,21 @@
+diff --git a/ltmain.in b/ltmain.in
+--- a/ltmain.in
++++ b/ltmain.in
+@@ -3688,6 +3705,7 @@ EOF
+ rpath="$finalize_rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
++ if test "$OE_LT_RPATH_ALLOW" = "any" -o "${OE_LT_RPATH_ALLOW/:${libdir}:/}" != "$OE_LT_RPATH_ALLOW" ; then
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+@@ -3712,6 +3730,9 @@ EOF
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
++ else
++ echo "OE: Not hardcoding '$libdir' into rpath"
++ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
============================================================
--- packages/linux/linux-handhelds-2.6/htcapache/defconfig 7addd9dd4ac5d4edc0a0214f42a704e645017508
+++ packages/linux/linux-handhelds-2.6/htcapache/defconfig 7addd9dd4ac5d4edc0a0214f42a704e645017508
@@ -0,0 +1,1362 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21-hh10
+# Fri Jul 6 13:14:59 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list