From ce25e933a9e0897f6bbac479970ce02725e6a210 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 2 Oct 2010 22:33:24 +0100 Subject: [PATCH] meta-openmoko: Drop as this code is very stale Signed-off-by: Richard Purdie --- .../include/meta-openmoko-scm-revisions.inc | 37 ----- meta-openmoko/conf/layer.conf | 11 -- .../packages/dfu-util/dfu-util-native_svn.bb | 11 -- .../packages/dfu-util/dfu-util_svn.bb | 13 -- meta-openmoko/packages/dialer/dialer_git.bb | 15 -- .../freesmartphone/gsm0710muxd_git.bb | 21 --- .../gsmd2/fix-dbus-location.patch | 135 ------------------ .../packages/freesmartphone/gsmd2_git.bb | 35 ----- .../packages/images/poky-image-openmoko.bb | 17 --- .../packages/libspiff/files/autofoo.patch | 29 ---- .../packages/libspiff/files/makefile.patch | 15 -- .../packages/libspiff/libspiff_0.8.3.bb | 21 --- .../packages/liburiparser/files/autofoo.patch | 10 -- .../liburiparser/liburiparser_0.5.1.bb | 12 -- .../openmoko-dialer3/openmoko-dialer3_svn.bb | 21 --- .../packages/openmoko2/libmokogsmd2_svn.bb | 7 - .../packages/openmoko2/libmokojournal2_svn.bb | 12 -- .../packages/openmoko2/libmokopanelui2_svn.bb | 6 - .../packages/openmoko2/libmokoui2_svn.bb | 10 -- .../packages/openmoko2/moko-gtk-engine_svn.bb | 15 -- .../packages/openmoko2/neod/htc.patch | 32 ----- .../packages/openmoko2/neod/ipaq.patch | 32 ----- .../openmoko2/openmoko-alsa-scenarios.bb | 21 --- .../openmoko2/openmoko-appearance_svn.bb | 8 -- .../openmoko-browser2/fingerscroll.diff | 13 -- .../openmoko-browser2/webkit-update.patch | 99 ------------- .../openmoko2/openmoko-browser2_svn.bb | 16 --- .../openmoko2/openmoko-calculator2_svn.bb | 7 - .../openmoko2/openmoko-common2_svn.bb | 26 ---- .../openmoko2/openmoko-contacts2_svn.bb | 13 -- .../packages/openmoko2/openmoko-dates2_svn.bb | 19 --- .../om-gta01/kernel-2.6.24.patch | 13 -- .../om-gta02/kernel-2.6.24.patch | 15 -- .../openmoko-dialer2/openmoko-dialer.patch | 117 --------------- .../openmoko2/openmoko-dialer2_svn.bb | 15 -- .../openmoko-icon-theme-standard2_svn.bb | 41 ------ .../openmoko-icon-theme-standard_svn.bb | 18 --- .../packages/openmoko2/openmoko-libs.inc | 9 -- .../openmoko2/openmoko-mediaplayer2_svn.bb | 25 ---- .../openmoko2/openmoko-messages2_svn.bb | 11 -- .../openmoko2/openmoko-panel-gsm_svn.bb | 6 - .../openmoko2/openmoko-sample2_svn.bb | 24 ---- .../packages/openmoko2/openmoko-session2.bb | 53 ------- .../openmoko-session2/etc/matchbox/session | 12 -- .../openmoko-session2/matchbox-session | 24 ---- .../openmoko-sound-system2/pulseaudio | 50 ------- .../openmoko2/openmoko-sound-system2/session | 28 ---- .../openmoko2/openmoko-sound-system2_0.1.0.bb | 34 ----- .../openmoko-sound-theme-standard2_svn.bb | 25 ---- .../openmoko-tasks2/openmoko-tasks.desktop | 12 -- .../openmoko-tasks2/openmoko-tasks.png | Bin 14517 -> 0 bytes .../packages/openmoko2/openmoko-tasks2_svn.bb | 23 --- .../openmoko2/openmoko-terminal2_svn.bb | 8 -- .../openmoko2/openmoko-theme-standard2_svn.bb | 21 --- .../openmoko2/openmoko-today2-folders_svn.bb | 9 -- .../packages/openmoko2/openmoko-today2_svn.bb | 8 -- .../openmoko2/openmoko-worldclock2_svn.bb | 6 - meta-openmoko/packages/openmoko2/openmoko.inc | 10 -- .../packages/usbpath/usbpath-native_svn.bb | 3 - meta-openmoko/packages/usbpath/usbpath_svn.bb | 14 -- .../packages/vala/vala-native_0.1.5.bb | 5 - meta-openmoko/packages/vala/vala_0.1.5.bb | 11 -- 62 files changed, 1389 deletions(-) delete mode 100644 meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc delete mode 100644 meta-openmoko/conf/layer.conf delete mode 100644 meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb delete mode 100644 meta-openmoko/packages/dfu-util/dfu-util_svn.bb delete mode 100644 meta-openmoko/packages/dialer/dialer_git.bb delete mode 100644 meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb delete mode 100644 meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch delete mode 100644 meta-openmoko/packages/freesmartphone/gsmd2_git.bb delete mode 100644 meta-openmoko/packages/images/poky-image-openmoko.bb delete mode 100644 meta-openmoko/packages/libspiff/files/autofoo.patch delete mode 100644 meta-openmoko/packages/libspiff/files/makefile.patch delete mode 100644 meta-openmoko/packages/libspiff/libspiff_0.8.3.bb delete mode 100644 meta-openmoko/packages/liburiparser/files/autofoo.patch delete mode 100644 meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb delete mode 100644 meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/libmokoui2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/neod/htc.patch delete mode 100644 meta-openmoko/packages/openmoko2/neod/ipaq.patch delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-libs.inc delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-session2.bb delete mode 100755 meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session delete mode 100755 meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session delete mode 100755 meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-system2/session delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb delete mode 100644 meta-openmoko/packages/openmoko2/openmoko.inc delete mode 100644 meta-openmoko/packages/usbpath/usbpath-native_svn.bb delete mode 100644 meta-openmoko/packages/usbpath/usbpath_svn.bb delete mode 100644 meta-openmoko/packages/vala/vala-native_0.1.5.bb delete mode 100644 meta-openmoko/packages/vala/vala_0.1.5.bb diff --git a/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc b/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc deleted file mode 100644 index 09df0993ae..0000000000 --- a/meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc +++ /dev/null @@ -1,37 +0,0 @@ -SRCREV_pn-dfu-util-native ??= "3139" -SRCREV_pn-dfu-util ??= "3139" -SRCREV_pn-dialer ??= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93" -SRCREV_pn-gsm0710muxd ??= "6fecc78198dd821bbe29efd096bd8fecd855179d" -SRCREV_pn-gsmd2 ??= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" -SRCREV_pn-libmokogsmd2 ??= "4334" -SRCREV_pn-libmokojournal2 ??= "3473" -SRCREV_pn-libmokopanelui2 ??= "3349" -SRCREV_pn-libmokoui2 ??= "4342" -SRCREV_pn-moko-gtk-engine ??= "3612" -SRCREV_pn-openmoko-alsa-scenarios ??= "4406" -SRCREV_pn-openmoko-appearance ??= "3262" -SRCREV_pn-openmoko-appmanager2 ??= "3442" -SRCREV_pn-openmoko-browser2 ??= "4172" -SRCREV_pn-openmoko-calculator2 ??= "3655" -SRCREV_pn-openmoko-common2 ??= "3259" -SRCREV_pn-openmoko-contacts2 ??= "418" -SRCREV_pn-openmoko-dates2 ??= "673" -SRCREV_pn-openmoko-dialer2 ??= "4448" -SRCREV_pn-openmoko-panel-gsm ??= "4335" -SRCREV_pn-openmoko-dialer3 ??= "111" -SRCREV_pn-openmoko-feedreader2 ??= "3645" -SRCREV_pn-openmoko-firststart2 ??= "3158" -SRCREV_pn-openmoko-icon-theme-standard2 ??= "4232" -SRCREV_pn-openmoko-mediaplayer2 ??= "4173" -SRCREV_pn-openmoko-messages2 ??= "4340" -SRCREV_pn-openmoko-sample2 ??= "3537" -SRCREV_pn-openmoko-sound-theme-standard2 ??= "4271" -SRCREV_pn-openmoko-tasks2 ??= "403" -SRCREV_pn-openmoko-terminal2 ??= "4039" -SRCREV_pn-openmoko-theme-standard2 ??= "4338" -SRCREV_pn-openmoko-today2-folders ??= "3704" -SRCREV_pn-openmoko-today2 ??= "4168" -SRCREV_pn-openmoko-worldclock2 ??= "3365" -SRCREV_pn-usbpath-native ??= "3172" -SRCREV_pn-usbpath ??= "3172" - diff --git a/meta-openmoko/conf/layer.conf b/meta-openmoko/conf/layer.conf deleted file mode 100644 index 88f15b6db8..0000000000 --- a/meta-openmoko/conf/layer.conf +++ /dev/null @@ -1,11 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" - -# We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb" - -BBFILE_COLLECTIONS += "openmoko" -BBFILE_PATTERN_moblin := "^${LAYERDIR}/" -BBFILE_PRIORITY_moblin = "5" - -require conf/distro/include/meta-openmoko-scm-revisions.inc diff --git a/meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb b/meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb deleted file mode 100644 index c049500a61..0000000000 --- a/meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb +++ /dev/null @@ -1,11 +0,0 @@ -require dfu-util_${PV}.bb - -inherit native deploy - -DEPENDS = "libusb-native usbpath-native" - -do_deploy() { - install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util -} - -addtask deploy before do_package after do_install diff --git a/meta-openmoko/packages/dfu-util/dfu-util_svn.bb b/meta-openmoko/packages/dfu-util/dfu-util_svn.bb deleted file mode 100644 index 4224fd1576..0000000000 --- a/meta-openmoko/packages/dfu-util/dfu-util_svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "USB Device Firmware Upgrade utility" -SECTION = "devel" -AUTHOR = "Harald Welte" -LICENSE = "GPL" -PV = "0.1+svnr${SRCREV}" -PR = "r0" - -DEPENDS = "libusb usbpath" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http" -S = "${WORKDIR}/dfu-util" - -inherit autotools diff --git a/meta-openmoko/packages/dialer/dialer_git.bb b/meta-openmoko/packages/dialer/dialer_git.bb deleted file mode 100644 index 602565f04f..0000000000 --- a/meta-openmoko/packages/dialer/dialer_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "The Dialer" -DEPENDS = "pulseaudio eds-dbus libjana libnotify libgsmd" -LICENSE = "GPL" -PV = "0.0+gitr${SRCREV}" -PR = "r5" - -inherit autotools pkgconfig - -SRC_URI = "git://folks.o-hand.com/thomas/git/phone.git;protocol=http" -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" - -FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" -FILES_${PN} += "${datadir}/icons" \ No newline at end of file diff --git a/meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb b/meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb deleted file mode 100644 index 410ac36e2f..0000000000 --- a/meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "GSM 07.10 muxer userspace daemon" -HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd" -AUTHOR = "M. Dietrich" -SECTION = "console/network" -DEPENDS = "dbus dbus-glib" -LICENSE = "GPL" -PV = "0.9.1+gitr${SRCREV}" - -SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" -S = "${WORKDIR}/git" - -inherit autotools - -# install init script for people who want to manually -# start/stop it, but don't add runlevels. -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 data/gsm0710muxd ${D}${sysconfdir}/init.d/ -} - -FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch b/meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch deleted file mode 100644 index 01c598af48..0000000000 --- a/meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- - libfreesmartphone/Makefile.am | 14 +++++++------- - serial/Makefile.am | 2 +- - src/Makefile.am | 14 +++++++------- - 3 files changed, 15 insertions(+), 15 deletions(-) - ---- git.orig/libfreesmartphone/Makefile.am -+++ git/libfreesmartphone/Makefile.am -@@ -21,47 +21,47 @@ fso-marshallers.h: $(top_srcdir)/src/sma - fso-marshallers.c: $(top_srcdir)/src/smartphone_marshaller.txt - glib-genmarshal --prefix fso_marshaller --body $(top_srcdir)/src/smartphone_marshaller.txt > fso-marshallers.c - - - freesmartphone-call-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_call --mode=glib-client \ - --output=freesmartphone-call-binding.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml - - freesmartphone-sms-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_sms --mode=glib-client \ - --output=freesmartphone-sms-binding.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml - - freesmartphone-device-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_device --mode=glib-client \ - --output=freesmartphone-device-binding.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml - - freesmartphone-sim-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_sim --mode=glib-client \ - --output=freesmartphone-sim-binding.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml - - freesmartphone-phonebook-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_phonebook --mode=glib-client \ - --output=freesmartphone-phonebook-binding.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml - - freesmartphone-pdp-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_pdp --mode=glib-client \ - --output=freesmartphone-pdp-binding.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml - - freesmartphone-network-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_network --mode=glib-client \ - --output=freesmartphone-network-binding.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml - - CLEANFILES = $(BUILT_SOURCES) ---- git.orig/serial/Makefile.am -+++ git/serial/Makefile.am -@@ -11,11 +11,11 @@ COMMON_LDFLAGS = -avoid-version -module - BUILT_SOURCES = fsomuxer_client.h - - CLEANFILES = $(BUILT_SOURCES) - - fsomuxer_client.h: fsomuxer.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --mode=glib-client \ - --output=fsomuxer_client.h \ - fsomuxer.xml - - ---- git.orig/src/Makefile.am -+++ git/src/Makefile.am -@@ -30,47 +30,47 @@ dbus_marshal.h: $(srcdir)/smartphone_mar - dbus_marshal.c: $(srcdir)/smartphone_marshaller.txt - glib-genmarshal --prefix gsmd_smartphone_marshaller --body $(srcdir)/smartphone_marshaller.txt > dbus_marshal.c - - - dbus_call_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_call --mode=glib-server \ - --output=dbus_call_glue.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml - - dbus_sms_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_sms --mode=glib-server \ - --output=dbus_sms_glue.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml - - dbus_device_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_device --mode=glib-server \ - --output=dbus_device_glue.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml - - dbus_sim_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_sim --mode=glib-server \ - --output=dbus_sim_glue.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml - - dbus_phonebook_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_phonebook --mode=glib-server \ - --output=dbus_phonebook_glue.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml - - dbus_pdp_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_pdp --mode=glib-server \ - --output=dbus_pdp_glue.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml - - dbus_network_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml -- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \ -+ $(LIBTOOL) --mode=execute dbus-binding-tool \ - --prefix=smartphone_network --mode=glib-server \ - --output=dbus_network_glue.h \ - $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml - - gsmd-types.h: $(srcdir)/gsmd-error.h diff --git a/meta-openmoko/packages/freesmartphone/gsmd2_git.bb b/meta-openmoko/packages/freesmartphone/gsmd2_git.bb deleted file mode 100644 index 8c1cf5b7e2..0000000000 --- a/meta-openmoko/packages/freesmartphone/gsmd2_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "GSM 07.07 phone server" -HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd" -AUTHOR = "Ixonos Team" -SECTION = "console/network" -DEPENDS = "dbus-native dbus dbus-glib" -RDEPENDS = "gsm0710muxd" -LICENSE = "GPL" -PV = "0.1.0+gitr${SRCREV}" -PR = "r3" - -SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master \ - file://fix-dbus-location.patch;patch=1" - -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OECONF = "--disable-tests" - -do_install_append () { - install -d ${D}${sysconfdir}/gsmd2 - - install -d ${D}${sysconfdir}/dbus-1/system.d/ - install -m 0644 ${S}/res/freesmartphone.conf ${D}${sysconfdir}/dbus-1/system.d/ - - install -d ${D}${datadir}/dbus-1/system-services - install -m 0644 ${S}/gsmd2.service ${D}${datadir}/dbus-1/system-services/ -} - -PACKAGES =+ "libgsmd2 libfreesmartphone" - -FILES_libgsmd2 = "${libdir}/libgsmd2.so.* ${libdir}/gsmd2/*.so" -FILES_libfreesmartphone = "${libdir}/libfreesmartphone.so.*" -FILES_${PN}-dev += "${libdir}/gsmd2/*.*a" -FILES_${PN} = "${bindir}/gsmd2 ${sysconfdir}/dbus-1/ ${datadir}/dbus-1/" diff --git a/meta-openmoko/packages/images/poky-image-openmoko.bb b/meta-openmoko/packages/images/poky-image-openmoko.bb deleted file mode 100644 index bf151e5422..0000000000 --- a/meta-openmoko/packages/images/poky-image-openmoko.bb +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES} apps-x11-games" - -inherit poky-image - -IMAGE_INSTALL += "openmoko-today2 openmoko-dialer2 openmoko-theme-standard2 dates web-webkit eds-dbus tasks" -IMAGE_INSTALL += "openmoko-contacts2 openmoko-session2 \ - matchbox-keyboard \ - matchbox-stroke \ - matchbox-config-gtk \ - matchbox-themes-gtk \ - xcursor-transparent-theme \ - openmoko-icon-theme-standard \ - settings-daemon" diff --git a/meta-openmoko/packages/libspiff/files/autofoo.patch b/meta-openmoko/packages/libspiff/files/autofoo.patch deleted file mode 100644 index 5f96a2c217..0000000000 --- a/meta-openmoko/packages/libspiff/files/autofoo.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: libspiff-0.8.2/configure.in -=================================================================== ---- libspiff-0.8.2.orig/configure.in -+++ libspiff-0.8.2/configure.in -@@ -80,24 +80,6 @@ AC_ARG_WITH(uriparser-lib, [ --with-uri - - - --# Local headers must come very first. Otherwise we --# risk including headers of an already installed --# libSpiff version if its path is in CPPFLAGS --CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}" -- -- -- --# Append $prefix as a fallback at the very end --if test "x${prefix}" != "xNONE"; then -- WORKING_PREFIX=${prefix} --else -- WORKING_PREFIX=${ac_default_prefix} --fi --LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib" --CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include" -- -- -- - # Check presence - EXPAT_MISSING="Please install libexpat 1.95.8 or later. - On Ubuntu enter 'sudo apt-get install libexpat-dev'." diff --git a/meta-openmoko/packages/libspiff/files/makefile.patch b/meta-openmoko/packages/libspiff/files/makefile.patch deleted file mode 100644 index 87ec9a345c..0000000000 --- a/meta-openmoko/packages/libspiff/files/makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- libspiff-0.8.3.orig/Makefile.am -+++ libspiff-0.8.3/Makefile.am -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in --AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects -+AUTOMAKE_OPTIONS = 1.10 gnu dist-zip dist-bzip2 subdir-objects - - lib_LTLIBRARIES = libspiff.la - - bin_PROGRAMS = \ - examples/check/spiff_check \ diff --git a/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb b/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb deleted file mode 100644 index f10ff59f69..0000000000 --- a/meta-openmoko/packages/libspiff/libspiff_0.8.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application." -HOMEPAGE = "http://libspiff.sf.net" -SECTION = "libs" -LICENSE = "BSD" -DEPENDS = "expat liburiparser" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1 \ - file://makefile.patch;patch=1" - -S = "${WORKDIR}/libspiff-${PV}" - -inherit autotools pkgconfig lib_package - -EXTRA_OECONF = "\ - --with-expat=${STAGING_LIBDIR}/.. \ - --with-uriparser=${STAGING_LIBDIR}/.. \ -" - -CPPFLAGS += "-I${S}/include" - diff --git a/meta-openmoko/packages/liburiparser/files/autofoo.patch b/meta-openmoko/packages/liburiparser/files/autofoo.patch deleted file mode 100644 index f578b21886..0000000000 --- a/meta-openmoko/packages/liburiparser/files/autofoo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/configure.in 2008-06-21 12:20:52.000000000 +0200 -+++ uriparser-0.5.1/configure.in 2008-06-21 12:21:16.000000000 +0200 -@@ -9,6 +9,7 @@ - AC_PROG_LIBTOOL - AC_HEADER_STDC - -+AM_PROG_CC_C_O - - - # URI_SIZEDOWN diff --git a/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb b/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb deleted file mode 100644 index 55ef0a057e..0000000000 --- a/meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "uriparser is a strictly RFC 3986 compliant URI parsing library." -HOMEPAGE = "http://uriparser.sf.net" -SECTION = "libs" -LICENSE = "BSD" - -SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/uriparser-${PV}" - -inherit autotools pkgconfig - - diff --git a/meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb b/meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb deleted file mode 100644 index e6b3d0bd05..0000000000 --- a/meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "The Openmoko Dialer" -SECTION = "openmoko/pim" -HOMEPAGE = "http://projects.openmoko.org/projects/shr/" -PKG_TAGS_${PN} = "group::communication" -DEPENDS = " libmokoui2 libmokojournal2 pulseaudio dbus-glib libnotify libjana" -RDEPENDS = "gsmd2" - -PV = "0.0.1+svnr${SRCREV}" -SRCREV = "${AUTOREV}" -PR = "r1" - -inherit autotools pkgconfig openmoko2 - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/shr/trunk/;module=${PN};proto=http" - -LICENSE = "${@openmoko_two_get_license(d)}" -SUBDIR = "${@openmoko_two_get_subdir(d)}" - -S = "${WORKDIR}/${PN}" - -FILES_${PN} += "${datadir}/icons" diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb deleted file mode 100644 index 261116ece7..0000000000 --- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb +++ /dev/null @@ -1,7 +0,0 @@ -SECTION = "openmoko/libs" -DEPENDS = "libgsmd glib-2.0" -PV = "0.1.0+svnr${SRCREV}" -PR = "r2" - -inherit openmoko2 - diff --git a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb deleted file mode 100644 index d9fd351c84..0000000000 --- a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb +++ /dev/null @@ -1,12 +0,0 @@ -SECTION = "openmoko/libs" -DEPENDS = "eds-dbus" -PV = "0.1.0+svnr${SRCREV}" -PR = "r2" - -inherit openmoko2 lib_package - -do_configure_prepend() { - touch gtk-doc.make -} - - diff --git a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb deleted file mode 100644 index a715ff8f0d..0000000000 --- a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "openmoko/libs" -DEPENDS = "gtk+ matchbox-panel-2 dbus" -PV = "0.3.0+svnr${SRCREV}" -PR = "r0" - -inherit openmoko2 diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb deleted file mode 100644 index f427fa8f99..0000000000 --- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "openmoko/libs" -DEPENDS = "gtk+" -PV = "0.1.0+svnr${SRCREV}" -PR = "r2" - -inherit openmoko2 - -do_configure_prepend() { - touch gtk-doc.make -} diff --git a/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb deleted file mode 100644 index 2939ac3fc1..0000000000 --- a/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Moko GTK+ theme engine" -SECTION = "openmoko/libs" -DEPENDS = "gtk+" -PV = "0.1.0+svnr${SRCREV}" -PR = "r0" - -inherit openmoko2 - -PACKAGES += "moko-gtk-theme" -FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so " -FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug" -FILES_moko-gtk-theme = "${datadir}/themes" -RDEPENDS_${PN} = "moko-gtk-theme" - diff --git a/meta-openmoko/packages/openmoko2/neod/htc.patch b/meta-openmoko/packages/openmoko2/neod/htc.patch deleted file mode 100644 index 0ced894a45..0000000000 --- a/meta-openmoko/packages/openmoko2/neod/htc.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: neod/configure.ac -=================================================================== ---- neod.orig/configure.ac 2007-09-15 23:01:30.000000000 +0200 -+++ neod/configure.ac 2007-09-15 23:02:01.000000000 +0200 -@@ -32,6 +32,10 @@ - NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX" - fi - -+if test x"$neod_platform" = x"htc"; then -+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC" -+fi -+ - CFLAGS=$NEOD_CFLAGS - - AC_OUTPUT([ -Index: neod/src/buttonactions.c -=================================================================== ---- neod.orig/src/buttonactions.c 2007-09-15 23:02:15.000000000 +0200 -+++ neod/src/buttonactions.c 2007-09-15 23:04:16.000000000 +0200 -@@ -63,6 +63,12 @@ - #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a - #endif - -+#ifdef NEOD_PLATFORM_HTC -+ #define AUX_BUTTON_KEYCODE 0xd4 /* camera */ -+ #define POWER_BUTTON_KEYCODE 0x74 /* power */ -+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a -+#endif -+ - #define HEADPHONE_INSERTION_SWITCHCODE 0x02 - - GPollFD input_fd[10]; diff --git a/meta-openmoko/packages/openmoko2/neod/ipaq.patch b/meta-openmoko/packages/openmoko2/neod/ipaq.patch deleted file mode 100644 index 19b61ab1f5..0000000000 --- a/meta-openmoko/packages/openmoko2/neod/ipaq.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: neod/src/buttonactions.c -=================================================================== ---- neod.orig/src/buttonactions.c 2007-09-29 17:24:43.000000000 +0200 -+++ neod/src/buttonactions.c 2007-09-29 17:24:49.000000000 +0200 -@@ -69,6 +69,12 @@ - #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a - #endif - -+#ifdef NEOD_PLATFORM_IPAQ -+ #define AUX_BUTTON_KEYCODE 89 /* _KEY_RECORD */ -+ #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */ -+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a -+#endif -+ - #define HEADPHONE_INSERTION_SWITCHCODE 0x02 - - GPollFD input_fd[10]; -Index: neod/configure.ac -=================================================================== ---- neod.orig/configure.ac 2007-09-29 17:25:12.000000000 +0200 -+++ neod/configure.ac 2007-09-29 17:25:48.000000000 +0200 -@@ -36,6 +36,10 @@ - NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC" - fi - -+if test x"$neod_platform" = x"ipaq"; then -+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ" -+fi -+ - CFLAGS=$NEOD_CFLAGS - - AC_OUTPUT([ diff --git a/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb deleted file mode 100644 index 08531e898e..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Package for the different scenarios used by Openmoko" -SECTION = "openmoko/base" -PV = "1.0+svnr${SRCREV}" -PR = "r1" - -COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" - -SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http" - -S = "${WORKDIR}/${MACHINE_ARCH}" - -do_install() { - install -d ${D}${datadir}/openmoko/scenarios/ - install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/ - install -d ${D}${sysconfdir}/ - install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state -} - -PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" - -FILES_${PN} += "${datadir}/openmoko" diff --git a/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb deleted file mode 100644 index a6f5c11171..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "The Openmoko Appearance Editor" -SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 gconf gtk+" -RDEPENDS = "libedata-cal openmoko-today2-folders" -PV = "0.1.0+svnr${SRCREV}" -PR = "r0" - -inherit openmoko2 gtk-icon-cache diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff b/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff deleted file mode 100644 index 89f79496a0..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/current-page.c -=================================================================== ---- openmoko-browser2/src/current-page.c (revision 3249) -+++ openmoko-browser2/src/current-page.c (working copy) -@@ -129,7 +129,7 @@ - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8); - - -- data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new (); -+ data->currentFingerScroll = moko_finger_scroll_new (); - gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0); - } - diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch deleted file mode 100644 index 18e8a88e25..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac ---- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200 -+++ openmoko-browser2/configure.ac 2008-03-05 12:12:32.954623867 +0100 -@@ -40,7 +40,7 @@ - # base deps - PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0) - PKG_CHECK_MODULES(GTHREAD, gthread-2.0 ) --PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk) -+PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0) - - # glib-genmarshal - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h ---- openmoko-browser2.orig/src/browser-data.h 2007-12-12 20:31:07.000000000 +0100 -+++ openmoko-browser2/src/browser-data.h 2008-03-05 12:12:50.497959252 +0100 -@@ -27,7 +27,7 @@ - #ifndef OPENMOKO_BROWSER_DATA_H - #define OPENMOKO_BROWSER_DATA_H - --#include "webkitwebview.h" -+#include - - #include - #include -diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c ---- openmoko-browser2.orig/src/current-page.c 2007-12-12 20:31:07.000000000 +0100 -+++ openmoko-browser2/src/current-page.c 2008-03-05 12:13:56.032884030 +0100 -@@ -28,8 +28,8 @@ - #include "current-page.h" - - #include --#include --#include -+#include -+#include - - /* - * From a list of BrowserPage's in BrowserData::currentPage show -@@ -42,7 +42,7 @@ - static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data) - { - g_return_if_fail (data->currentPage); -- webkit_web_view_go_backward(data->currentPage->webKitPage); -+ webkit_web_view_go_back(data->currentPage->webKitPage); - } - - static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data) -@@ -66,7 +66,7 @@ - g_assert (page == data->currentPage->webKitPage); - - if (prog == 100) { -- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page)); -+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page)); - gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page)); - gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL); - } -@@ -176,7 +176,7 @@ - * Update the GtkToolItems - */ - /* XXX ### FIXME TODO check if we should show stop/reload */ -- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage)); -+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage)); - gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage)); - gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL); - gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE); -diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c ---- openmoko-browser2.orig/src/main.c 2007-12-12 20:31:07.000000000 +0100 -+++ openmoko-browser2/src/main.c 2008-03-05 12:14:46.337942098 +0100 -@@ -33,7 +33,7 @@ - #include - #include - --#include -+#include - - #include - #include -@@ -55,7 +55,6 @@ - gdk_threads_init (); - gdk_threads_enter (); - gtk_init (&argc, &argv); -- webkit_init (); - moko_stock_register (); - g_set_application_name (_("Browser")); - -diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c ---- openmoko-browser2.orig/src/open-pages-page.c 2007-12-12 20:31:07.000000000 +0100 -+++ openmoko-browser2/src/open-pages-page.c 2008-03-05 12:13:37.671282983 +0100 -@@ -28,8 +28,8 @@ - #include "open-pages-page.h" - #include "current-page.h" - --#include --#include -+#include -+#include - #include - - #include diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb deleted file mode 100644 index 6d8349313f..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "The Openmoko Webbrowser" -SECTION = "openmoko/apps" -DEPENDS += "intltool libmokoui2 check webkit-gtk" -PV = "0.0.1+svnr${SRCREV}" -PR = "r2" - -inherit openmoko2 - -SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171" - -#SRC_URI += "file://fingerscroll.diff;patch=1" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g -} - diff --git a/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb deleted file mode 100644 index ba202bcec9..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "A Calculator for Openmoko" -SECTION = "openmoko/tools" -DEPENDS = "libmokoui2" -PV = "0.1.0+svnr${SRCREV}" -PR = "r0" - -inherit openmoko2 diff --git a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb deleted file mode 100644 index 0ea381437c..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Common files for the Openmoko framework" -SECTION = "openmoko/base" -PV = "0.1.0+svnr${SRCREV}" -PR = "r0" - -inherit openmoko2 - -SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http" -S = "${WORKDIR}" - -ALLOW_EMPTY = "1" - -dirs = "pixmaps" - -do_install() { - find . -name .svn | xargs rm -rf - install -d ${D}${datadir} - for i in ${dirs}; do - cp -fR $i ${D}${datadir}/$i; - done - # moved to xserver-kdrive-common - rm -f ${D}${datadir}/pixmaps/xsplash* -} - -PACKAGE_ARCH = "all" -FILES_${PN} = "${datadir}" diff --git a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb deleted file mode 100644 index 4d7b1bcd7d..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "The Openmoko Address Book" -SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 libmokojournal2 dbus-glib libjana" -RDEPENDS = "libedata-book" -PV = "0.1.0+svnr${SRCREV}" -PR = "r5" - -inherit openmoko2 - -SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http" -S = "${WORKDIR}/hito/" - -EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko" diff --git a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb deleted file mode 100644 index ff3bfa62a6..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "The Openmoko Calendar" -SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana" -RDEPENDS = "libedata-cal" -PV = "0.1.0+svnr${SRCREV}" -PR = "r2" - -inherit openmoko2 pkgconfig - -SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=openmoko2;proto=http" -S = "${WORKDIR}/openmoko2/" - -EXTRA_OECONF = "--with-frontend=openmoko" - -do_configure_prepend() { - touch gtk-doc.make -} - - diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch deleted file mode 100644 index c6f34f4131..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: openmoko-dialer2/src/phone-kit/moko-notify.c -=================================================================== ---- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800 -+++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800 -@@ -38,7 +38,7 @@ - - #define DEFAULT_RINGTONE "/default_ringtone.ogg" - #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" --#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" -+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" - - struct _MokoNotifyPrivate - { diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch deleted file mode 100644 index 72c516f5d6..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: openmoko-dialer2/src/phone-kit/moko-notify.c -=================================================================== ---- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051) -+++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy) -@@ -37,8 +37,8 @@ - MOKO_TYPE_NOTIFY, MokoNotifyPrivate)) - - #define DEFAULT_RINGTONE "/default_ringtone.ogg" --#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" --#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" -+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl" -+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" - - struct _MokoNotifyPrivate - { diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch deleted file mode 100644 index 5969726857..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- openmoko-dialer2/src/moko-dialer.c~ 2007-08-27 20:02:37.000000000 +0930 -+++ openmoko-dialer2/src/moko-dialer.c 2007-08-27 18:59:37.000000000 +0930 -@@ -69,8 +69,7 @@ - - /* Registration variables */ - guint reg_timeout; -- gboolean reg_request; -- gboolean registered; -+ MokoGsmdConnectionNetregType registered; - }; - - enum -@@ -292,8 +291,7 @@ - - moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), FALSE); - -- priv->reg_request = TRUE; -- priv->registered = FALSE; -+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE; - priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, - (GSourceFunc)register_network_cb, - dialer); -@@ -424,14 +422,14 @@ - g_return_if_fail (MOKO_IS_DIALER (dialer)); - priv = dialer->priv; - -+ g_warning ("on_network_registered: type is %d\n", type); -+ - switch (type) - { - case MOKO_GSMD_CONNECTION_NETREG_NONE: - case MOKO_GSMD_CONNECTION_NETREG_SEARCHING: - /* Do nothing */ - g_print ("NetReg: Searching for network\n"); -- g_source_remove (priv->reg_timeout); -- priv->registered = TRUE; - break; - case MOKO_GSMD_CONNECTION_NETREG_DENIED: - /* This may be a pin issue*/ -@@ -441,11 +439,12 @@ - g_print ("NetReg: Network registered\n"); - g_print("\tLocationAreaCode = %x\n\tCellID = %x\n", lac, cell); - g_source_remove (priv->reg_timeout); -- priv->registered = TRUE; - break; - default: - g_warning ("Unhandled register event type = %d\n", type); - }; -+ -+ priv->registered = type; - } - - static void -@@ -619,28 +618,32 @@ - g_return_val_if_fail (MOKO_DIALER (dialer), TRUE); - priv = MOKO_DIALER_GET_PRIVATE (dialer); - -- if (!priv->reg_request) -+ /* We check whether we've been registered yet, otherwise keep poking -+ * gsmd -+ */ -+ switch (priv->registered) - { -- /* We have yet to request registration, so lets do it */ -- /* FIXME: do the pin stuff */ -- g_print ("Requesting registration\n"); -- moko_gsmd_connection_network_register (priv->connection); -- } -- else -- { -- /* We check whether we've been registered yet, otherwise keep poking -- * gsmd -- */ -- if (priv->registered) -- { -- g_print ("Network Registered\n"); -- return FALSE; -- } -- else -- { -+ case MOKO_GSMD_CONNECTION_NETREG_NONE: -+ /* We have yet to request registration, so lets do it */ -+ /* FIXME: do the pin stuff */ - g_print ("Requesting registration\n"); - moko_gsmd_connection_network_register (priv->connection); -- } -+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING; -+ break; -+ case MOKO_GSMD_CONNECTION_NETREG_SEARCHING: -+ g_print ("Waiting for registration\n"); -+ break; -+ case MOKO_GSMD_CONNECTION_NETREG_DENIED: -+ g_print ("Registration denied, retrying\n"); -+ moko_gsmd_connection_network_register (priv->connection); -+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING; -+ break; -+ case MOKO_GSMD_CONNECTION_NETREG_HOME: -+ case MOKO_GSMD_CONNECTION_NETREG_ROAMING: -+ g_print ("Network Registered\n"); -+ return FALSE; -+ default: -+ g_warning ("Unhandled register event type = %d\n", priv->registered); - } - - return TRUE; -@@ -754,9 +757,8 @@ - - /* Handle network registration a few seconds after powering up the - * antenna*/ -- priv->reg_request = TRUE; -- priv->registered = FALSE; -- priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, -+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE; -+ priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT * 2, - (GSourceFunc)register_network_cb, - dialer); - diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb deleted file mode 100644 index fa76c44a14..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "The Openmoko Dialer" -SECTION = "openmoko/pim" -DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify" -PV = "0.1.0+svnr${SRCREV}" -PR = "r8" -PE = "1" - -inherit openmoko2 - -SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch;patch=1" -SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;patch=1" - -EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" - -FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" diff --git a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb deleted file mode 100644 index c97980eee1..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework" -SECTION = "openmoko/base" -PV = "0.1.0+svnr${SRCREV}" -PR = "r2" - -PACKAGE_ARCH = "all" - -inherit openmoko2 - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http" -S = "${WORKDIR}/icons" - -PACKAGES += "${PN}-compat" - -FILES_${PN} = "${datadir}/icons/openmoko-standard" -FILES_${PN}-compat = "${datadir}/icons/hicolor" - -do_install_append () { - mkdir --parents "${D}/${datadir}/icons/hicolor" - cd "${D}/${datadir}/icons/openmoko-standard" - FILES=`find . -type f -name moko\* -o -name openmoko*` - cd ../hicolor - for F in $FILES; do - mkdir --parents `dirname $F` - ln -s ${datadir}/icons/openmoko-standard/$F $F - done -} - -pkg_postinst_${PN} () { - if [ "x$D" != "x" ]; then - exit 1 - fi - gtk-update-icon-cache -q /usr/share/icons/openmoko-standard -} - -pkg_postinst_${PN}-compat () { - if [ "x$D" != "x" ]; then - exit 1 - fi - gtk-update-icon-cache -q /usr/share/icons/hicolor -} diff --git a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb deleted file mode 100644 index fb46f1de55..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" -SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" -PR = "r2" - -inherit openmoko-base autotools - -SRC_URI = "${OPENMOKO_MIRROR}/src/target/OM-2007.2/artwork;module=icons;proto=http" -S = "${WORKDIR}/icons" - -PACKAGE_ARCH = "all" - -pkg_postinst_${PN} () { - if [ "x$D" != "x" ]; then - exit 1 - fi - gtk-update-icon-cache -q /usr/share/icons/openmoko-standard -} diff --git a/meta-openmoko/packages/openmoko2/openmoko-libs.inc b/meta-openmoko/packages/openmoko2/openmoko-libs.inc deleted file mode 100644 index 13a9d8d62f..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-libs.inc +++ /dev/null @@ -1,9 +0,0 @@ -HOMEPAGE = "http://www.openmoko.org" -LICENSE = "GPL" -PV = "0.0.1+svn${SRCDATE}" - -inherit autotools pkgconfig - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/libraries;module=${REAL_PN};proto=http" - -S = "${WORKDIR}/${PN}" diff --git a/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb deleted file mode 100644 index 118c510f17..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A media player for Openmoko" -SECTION = "openmoko/tools" -DEPENDS = "libmokoui2 expat gstreamer libspiff curl tslib" -RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2" -PV = "0.1.0+svnr${SRCREV}" -PR = "r4" - -inherit openmoko2 - -FILES_${PN} += "${datadir}/openmoko-mediaplayer" - -do_install_append() { - install -d ${D}${sysconfdir}/gconf/schemas - install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas -} - -pkg_postinst_openmoko-mediaplayer2 () { -#!/bin/sh -e -if [ "x$D" != "x" ]; then - exit 1 -fi - -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null -} diff --git a/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb deleted file mode 100644 index f28f7f8e0a..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "The Openmoko Message application" -SECTION = "openmoko/pim" -DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana" -PV = "0.1.0+svnr${SRCREV}" -PR = "r1" - -inherit openmoko2 - -EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" - -FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/" diff --git a/meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb deleted file mode 100644 index e8a5bc877d..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb +++ /dev/null @@ -1,6 +0,0 @@ -DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel" -DEPENDS = "libmokogsmd2 libnotify" -PV = "0.1.0+svn${SVNREV}" -PR = "r2" - -inherit openmoko-panel-plugin diff --git a/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb deleted file mode 100644 index b944e79b45..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "The Openmoko Sample Project" -SECTION = "openmoko/applications" -DEPENDS = "libmokoui2 intltool gconf" -PV = "0.0.1+svnr${SRCREV}" -PR = "r0" - -inherit openmoko2 - -PACKAGES += "${PN}-src" -# path should match the toolchain path -FILES_${PN}-src = "/usr/local/openmoko" -PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk" - -do_configure_prepend() { - install -d ${WORKDIR}/source - cp -pPR ${S} ${WORKDIR}/source/ - find ${WORKDIR}/source -name ".svn"|xargs rm -rf -} - -do_install_append() { - install -d ${D}/usr/local/openmoko/source/ - cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ -} - diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2.bb b/meta-openmoko/packages/openmoko2/openmoko-session2.bb deleted file mode 100644 index d0c3268e0c..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-session2.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Custom Matchbox session files for Openmoko" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2" -RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r69" - -SRC_URI = "\ - file://etc \ - file://matchbox-session \ -" - -S = "${WORKDIR}" - -inherit update-alternatives - -do_install() { - install -d ${D}${bindir} - install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir} - install -d ${D}${sysconfdir} - cp -R ${S}/etc/* ${D}${sysconfdir} - rm -fR ${D}${sysconfdir}/.svn - rm -fR ${D}${sysconfdir}/matchbox/.svn - chmod -R 755 ${D}${sysconfdir}/ -} - -PACKAGE_ARCH = "all" - -pkg_postinst_openmoko-session2 () { -#!/bin/sh -e -if [ "x$D" != "x" ]; then - exit 1 -fi - -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5" -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1 -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8 -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2 -# gstreamer audio settings -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc - -} - -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "11" - -CONFFILES_${PN} = "${sysconfdir}/matchbox/session" diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session deleted file mode 100755 index 732cce9d3f..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -SHOWCURSOR="no" - -openmoko-today & -phone-kit & - -matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ & - -matchbox-panel-2 --start-applets systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,openmoko-panel-wifi --titlebar & - -exec neod diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session deleted file mode 100755 index 65f1ce72ca..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# Very simple session manager for matchbox tools -# - -# Uncomment below to enable parsing of debian menu entrys -# export MB_USE_DEB_MENUS=1 - -if [ -e $HOME/.matchbox/session ] -then -exec $HOME/.matchbox/session -fi - -if [ -e /etc/matchbox/session ] -then -exec /etc/matchbox/session -fi - -# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session -# dont exist. - -matchbox-desktop & -matchbox-panel --orientation south & -exec matchbox-window-manager $@ diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio deleted file mode 100755 index 964947376e..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio +++ /dev/null @@ -1,50 +0,0 @@ -#!/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 audio server: " - # FIXME once alsa/shm permissions have been fixed, supply --system - start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session - - if [ $? = 0 ]; then - echo "$prog (warning ignores)." # FIXME remove comment on warning - else - echo "(failed.)" - fi -} - -stop() { - echo -n "Stopping audio server: " - start-stop-daemon -K -x /usr/bin/pulseaudio - echo "pulseaudio." -} - -# 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 diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session deleted file mode 100644 index 7ba07e9784..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/pulseaudio -nF - -# Create autoload entries for the device drivers -add-autoload-sink output module-alsa-sink 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_unintrusive.wav -load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav -load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav - diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb deleted file mode 100644 index 33cd5648d4..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -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 \ - gst-plugin-pulse \ -" -RREPLACES = "openmoko-sound-system" -RPROVIDES = "openmoko-sound-system" -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" diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb deleted file mode 100644 index 3096da4813..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Standard sound theme for the Openmoko framework" -SECTION = "openmoko/base" -RREPLACES = "openmoko-sound-theme-standard" -RPROVIDES = "openmoko-sound-theme-standard" -PV = "0.1+svnr${SRCREV}" -PR = "r3" - -inherit openmoko2 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 ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do - cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/ - done -} - -FILES_${PN} = "${datadir}" - diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop deleted file mode 100644 index f9e813a734..0000000000 --- a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Tasks -Comment=What you need to do -Exec=tasks -Icon=openmoko-tasks -Terminal=false -Type=Application -Categories=GTK;Application;PIM;Office -MimeType=text/x-vcard; -SingleInstance=true -StartupNotify=true diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png deleted file mode 100644 index f28d1ade99101dfccde15114a74449e21275e835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14517 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