summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-openmoko/conf/distro/include/meta-openmoko-scm-revisions.inc37
-rw-r--r--meta-openmoko/conf/layer.conf11
-rw-r--r--meta-openmoko/packages/dfu-util/dfu-util-native_svn.bb11
-rw-r--r--meta-openmoko/packages/dfu-util/dfu-util_svn.bb13
-rw-r--r--meta-openmoko/packages/dialer/dialer_git.bb15
-rw-r--r--meta-openmoko/packages/freesmartphone/gsm0710muxd_git.bb21
-rw-r--r--meta-openmoko/packages/freesmartphone/gsmd2/fix-dbus-location.patch135
-rw-r--r--meta-openmoko/packages/freesmartphone/gsmd2_git.bb35
-rw-r--r--meta-openmoko/packages/images/poky-image-openmoko.bb17
-rw-r--r--meta-openmoko/packages/libspiff/files/autofoo.patch29
-rw-r--r--meta-openmoko/packages/libspiff/files/makefile.patch15
-rw-r--r--meta-openmoko/packages/libspiff/libspiff_0.8.3.bb21
-rw-r--r--meta-openmoko/packages/liburiparser/files/autofoo.patch10
-rw-r--r--meta-openmoko/packages/liburiparser/liburiparser_0.5.1.bb12
-rw-r--r--meta-openmoko/packages/openmoko-dialer3/openmoko-dialer3_svn.bb21
-rw-r--r--meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb7
-rw-r--r--meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb12
-rw-r--r--meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb6
-rw-r--r--meta-openmoko/packages/openmoko2/libmokoui2_svn.bb10
-rw-r--r--meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb15
-rw-r--r--meta-openmoko/packages/openmoko2/neod/htc.patch32
-rw-r--r--meta-openmoko/packages/openmoko2/neod/ipaq.patch32
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb21
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb8
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff13
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch99
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb16
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb7
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb26
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb13
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb19
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch13
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch15
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch117
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb15
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb41
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard_svn.bb18
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-libs.inc9
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb25
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb11
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-panel-gsm_svn.bb6
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb24
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-session2.bb53
-rwxr-xr-xmeta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session12
-rwxr-xr-xmeta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session24
-rwxr-xr-xmeta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio50
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-sound-system2/session28
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb34
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb25
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop12
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.pngbin14517 -> 0 bytes
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb23
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb8
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb21
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb9
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb8
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb6
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko.inc10
-rw-r--r--meta-openmoko/packages/usbpath/usbpath-native_svn.bb3
-rw-r--r--meta-openmoko/packages/usbpath/usbpath_svn.bb14
-rw-r--r--meta-openmoko/packages/vala/vala-native_0.1.5.bb5
-rw-r--r--meta-openmoko/packages/vala/vala_0.1.5.bb11
62 files changed, 0 insertions, 1389 deletions
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 @@
1SRCREV_pn-dfu-util-native ??= "3139"
2SRCREV_pn-dfu-util ??= "3139"
3SRCREV_pn-dialer ??= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
4SRCREV_pn-gsm0710muxd ??= "6fecc78198dd821bbe29efd096bd8fecd855179d"
5SRCREV_pn-gsmd2 ??= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
6SRCREV_pn-libmokogsmd2 ??= "4334"
7SRCREV_pn-libmokojournal2 ??= "3473"
8SRCREV_pn-libmokopanelui2 ??= "3349"
9SRCREV_pn-libmokoui2 ??= "4342"
10SRCREV_pn-moko-gtk-engine ??= "3612"
11SRCREV_pn-openmoko-alsa-scenarios ??= "4406"
12SRCREV_pn-openmoko-appearance ??= "3262"
13SRCREV_pn-openmoko-appmanager2 ??= "3442"
14SRCREV_pn-openmoko-browser2 ??= "4172"
15SRCREV_pn-openmoko-calculator2 ??= "3655"
16SRCREV_pn-openmoko-common2 ??= "3259"
17SRCREV_pn-openmoko-contacts2 ??= "418"
18SRCREV_pn-openmoko-dates2 ??= "673"
19SRCREV_pn-openmoko-dialer2 ??= "4448"
20SRCREV_pn-openmoko-panel-gsm ??= "4335"
21SRCREV_pn-openmoko-dialer3 ??= "111"
22SRCREV_pn-openmoko-feedreader2 ??= "3645"
23SRCREV_pn-openmoko-firststart2 ??= "3158"
24SRCREV_pn-openmoko-icon-theme-standard2 ??= "4232"
25SRCREV_pn-openmoko-mediaplayer2 ??= "4173"
26SRCREV_pn-openmoko-messages2 ??= "4340"
27SRCREV_pn-openmoko-sample2 ??= "3537"
28SRCREV_pn-openmoko-sound-theme-standard2 ??= "4271"
29SRCREV_pn-openmoko-tasks2 ??= "403"
30SRCREV_pn-openmoko-terminal2 ??= "4039"
31SRCREV_pn-openmoko-theme-standard2 ??= "4338"
32SRCREV_pn-openmoko-today2-folders ??= "3704"
33SRCREV_pn-openmoko-today2 ??= "4168"
34SRCREV_pn-openmoko-worldclock2 ??= "3365"
35SRCREV_pn-usbpath-native ??= "3172"
36SRCREV_pn-usbpath ??= "3172"
37
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 @@
1# We have a conf and classes directory, add to BBPATH
2BBPATH := "${BBPATH}:${LAYERDIR}"
3
4# We have a packages directory, add to BBFILES
5BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
6
7BBFILE_COLLECTIONS += "openmoko"
8BBFILE_PATTERN_moblin := "^${LAYERDIR}/"
9BBFILE_PRIORITY_moblin = "5"
10
11require 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 @@
1require dfu-util_${PV}.bb
2
3inherit native deploy
4
5DEPENDS = "libusb-native usbpath-native"
6
7do_deploy() {
8 install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util
9}
10
11addtask 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 @@
1DESCRIPTION = "USB Device Firmware Upgrade utility"
2SECTION = "devel"
3AUTHOR = "Harald Welte"
4LICENSE = "GPL"
5PV = "0.1+svnr${SRCREV}"
6PR = "r0"
7
8DEPENDS = "libusb usbpath"
9
10SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http"
11S = "${WORKDIR}/dfu-util"
12
13inherit 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 @@
1DESCRIPTION = "The Dialer"
2DEPENDS = "pulseaudio eds-dbus libjana libnotify libgsmd"
3LICENSE = "GPL"
4PV = "0.0+gitr${SRCREV}"
5PR = "r5"
6
7inherit autotools pkgconfig
8
9SRC_URI = "git://folks.o-hand.com/thomas/git/phone.git;protocol=http"
10S = "${WORKDIR}/git"
11
12EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
13
14FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
15FILES_${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 @@
1DESCRIPTION = "GSM 07.10 muxer userspace daemon"
2HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
3AUTHOR = "M. Dietrich"
4SECTION = "console/network"
5DEPENDS = "dbus dbus-glib"
6LICENSE = "GPL"
7PV = "0.9.1+gitr${SRCREV}"
8
9SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
10S = "${WORKDIR}/git"
11
12inherit autotools
13
14# install init script for people who want to manually
15# start/stop it, but don't add runlevels.
16do_install_append() {
17 install -d ${D}${sysconfdir}/init.d
18 install -m 0755 data/gsm0710muxd ${D}${sysconfdir}/init.d/
19}
20
21FILES_${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 @@
1---
2 libfreesmartphone/Makefile.am | 14 +++++++-------
3 serial/Makefile.am | 2 +-
4 src/Makefile.am | 14 +++++++-------
5 3 files changed, 15 insertions(+), 15 deletions(-)
6
7--- git.orig/libfreesmartphone/Makefile.am
8+++ git/libfreesmartphone/Makefile.am
9@@ -21,47 +21,47 @@ fso-marshallers.h: $(top_srcdir)/src/sma
10 fso-marshallers.c: $(top_srcdir)/src/smartphone_marshaller.txt
11 glib-genmarshal --prefix fso_marshaller --body $(top_srcdir)/src/smartphone_marshaller.txt > fso-marshallers.c
12
13
14 freesmartphone-call-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
15- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
16+ $(LIBTOOL) --mode=execute dbus-binding-tool \
17 --prefix=smartphone_call --mode=glib-client \
18 --output=freesmartphone-call-binding.h \
19 $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
20
21 freesmartphone-sms-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
22- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
23+ $(LIBTOOL) --mode=execute dbus-binding-tool \
24 --prefix=smartphone_sms --mode=glib-client \
25 --output=freesmartphone-sms-binding.h \
26 $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
27
28 freesmartphone-device-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
29- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
30+ $(LIBTOOL) --mode=execute dbus-binding-tool \
31 --prefix=smartphone_device --mode=glib-client \
32 --output=freesmartphone-device-binding.h \
33 $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
34
35 freesmartphone-sim-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
36- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
37+ $(LIBTOOL) --mode=execute dbus-binding-tool \
38 --prefix=smartphone_sim --mode=glib-client \
39 --output=freesmartphone-sim-binding.h \
40 $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
41
42 freesmartphone-phonebook-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
43- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
44+ $(LIBTOOL) --mode=execute dbus-binding-tool \
45 --prefix=smartphone_phonebook --mode=glib-client \
46 --output=freesmartphone-phonebook-binding.h \
47 $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
48
49 freesmartphone-pdp-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
50- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
51+ $(LIBTOOL) --mode=execute dbus-binding-tool \
52 --prefix=smartphone_pdp --mode=glib-client \
53 --output=freesmartphone-pdp-binding.h \
54 $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
55
56 freesmartphone-network-binding.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
57- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
58+ $(LIBTOOL) --mode=execute dbus-binding-tool \
59 --prefix=smartphone_network --mode=glib-client \
60 --output=freesmartphone-network-binding.h \
61 $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
62
63 CLEANFILES = $(BUILT_SOURCES)
64--- git.orig/serial/Makefile.am
65+++ git/serial/Makefile.am
66@@ -11,11 +11,11 @@ COMMON_LDFLAGS = -avoid-version -module
67 BUILT_SOURCES = fsomuxer_client.h
68
69 CLEANFILES = $(BUILT_SOURCES)
70
71 fsomuxer_client.h: fsomuxer.xml
72- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
73+ $(LIBTOOL) --mode=execute dbus-binding-tool \
74 --mode=glib-client \
75 --output=fsomuxer_client.h \
76 fsomuxer.xml
77
78
79--- git.orig/src/Makefile.am
80+++ git/src/Makefile.am
81@@ -30,47 +30,47 @@ dbus_marshal.h: $(srcdir)/smartphone_mar
82 dbus_marshal.c: $(srcdir)/smartphone_marshaller.txt
83 glib-genmarshal --prefix gsmd_smartphone_marshaller --body $(srcdir)/smartphone_marshaller.txt > dbus_marshal.c
84
85
86 dbus_call_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
87- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
88+ $(LIBTOOL) --mode=execute dbus-binding-tool \
89 --prefix=smartphone_call --mode=glib-server \
90 --output=dbus_call_glue.h \
91 $(top_srcdir)/interface/org.freesmartphone.GSM.Call.xml
92
93 dbus_sms_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
94- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
95+ $(LIBTOOL) --mode=execute dbus-binding-tool \
96 --prefix=smartphone_sms --mode=glib-server \
97 --output=dbus_sms_glue.h \
98 $(top_srcdir)/interface/org.freesmartphone.GSM.SMS.xml
99
100 dbus_device_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
101- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
102+ $(LIBTOOL) --mode=execute dbus-binding-tool \
103 --prefix=smartphone_device --mode=glib-server \
104 --output=dbus_device_glue.h \
105 $(top_srcdir)/interface/org.freesmartphone.GSM.Device.xml
106
107 dbus_sim_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
108- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
109+ $(LIBTOOL) --mode=execute dbus-binding-tool \
110 --prefix=smartphone_sim --mode=glib-server \
111 --output=dbus_sim_glue.h \
112 $(top_srcdir)/interface/org.freesmartphone.GSM.SIM.xml
113
114 dbus_phonebook_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
115- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
116+ $(LIBTOOL) --mode=execute dbus-binding-tool \
117 --prefix=smartphone_phonebook --mode=glib-server \
118 --output=dbus_phonebook_glue.h \
119 $(top_srcdir)/interface/org.freesmartphone.GSM.Phonebook.xml
120
121 dbus_pdp_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
122- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
123+ $(LIBTOOL) --mode=execute dbus-binding-tool \
124 --prefix=smartphone_pdp --mode=glib-server \
125 --output=dbus_pdp_glue.h \
126 $(top_srcdir)/interface/org.freesmartphone.GSM.PDP.xml
127
128 dbus_network_glue.h: $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
129- $(LIBTOOL) --mode=execute /usr/bin/dbus-binding-tool \
130+ $(LIBTOOL) --mode=execute dbus-binding-tool \
131 --prefix=smartphone_network --mode=glib-server \
132 --output=dbus_network_glue.h \
133 $(top_srcdir)/interface/org.freesmartphone.GSM.Network.xml
134
135 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 @@
1DESCRIPTION = "GSM 07.07 phone server"
2HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
3AUTHOR = "Ixonos Team"
4SECTION = "console/network"
5DEPENDS = "dbus-native dbus dbus-glib"
6RDEPENDS = "gsm0710muxd"
7LICENSE = "GPL"
8PV = "0.1.0+gitr${SRCREV}"
9PR = "r3"
10
11SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master \
12 file://fix-dbus-location.patch;patch=1"
13
14S = "${WORKDIR}/git"
15
16inherit autotools
17
18EXTRA_OECONF = "--disable-tests"
19
20do_install_append () {
21 install -d ${D}${sysconfdir}/gsmd2
22
23 install -d ${D}${sysconfdir}/dbus-1/system.d/
24 install -m 0644 ${S}/res/freesmartphone.conf ${D}${sysconfdir}/dbus-1/system.d/
25
26 install -d ${D}${datadir}/dbus-1/system-services
27 install -m 0644 ${S}/gsmd2.service ${D}${datadir}/dbus-1/system-services/
28}
29
30PACKAGES =+ "libgsmd2 libfreesmartphone"
31
32FILES_libgsmd2 = "${libdir}/libgsmd2.so.* ${libdir}/gsmd2/*.so"
33FILES_libfreesmartphone = "${libdir}/libfreesmartphone.so.*"
34FILES_${PN}-dev += "${libdir}/gsmd2/*.*a"
35FILES_${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 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES} apps-x11-games"
6
7inherit poky-image
8
9IMAGE_INSTALL += "openmoko-today2 openmoko-dialer2 openmoko-theme-standard2 dates web-webkit eds-dbus tasks"
10IMAGE_INSTALL += "openmoko-contacts2 openmoko-session2 \
11 matchbox-keyboard \
12 matchbox-stroke \
13 matchbox-config-gtk \
14 matchbox-themes-gtk \
15 xcursor-transparent-theme \
16 openmoko-icon-theme-standard \
17 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 @@
1Index: libspiff-0.8.2/configure.in
2===================================================================
3--- libspiff-0.8.2.orig/configure.in
4+++ libspiff-0.8.2/configure.in
5@@ -80,24 +80,6 @@ AC_ARG_WITH(uriparser-lib, [ --with-uri
6
7
8
9-# Local headers must come very first. Otherwise we
10-# risk including headers of an already installed
11-# libSpiff version if its path is in CPPFLAGS
12-CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
13-
14-
15-
16-# Append $prefix as a fallback at the very end
17-if test "x${prefix}" != "xNONE"; then
18- WORKING_PREFIX=${prefix}
19-else
20- WORKING_PREFIX=${ac_default_prefix}
21-fi
22-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
23-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
24-
25-
26-
27 # Check presence
28 EXPAT_MISSING="Please install libexpat 1.95.8 or later.
29 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 @@
1---
2 Makefile.am | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5--- libspiff-0.8.3.orig/Makefile.am
6+++ libspiff-0.8.3/Makefile.am
7@@ -1,7 +1,7 @@
8 ## Process this file with automake to produce Makefile.in
9-AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects
10+AUTOMAKE_OPTIONS = 1.10 gnu dist-zip dist-bzip2 subdir-objects
11
12 lib_LTLIBRARIES = libspiff.la
13
14 bin_PROGRAMS = \
15 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 @@
1DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application."
2HOMEPAGE = "http://libspiff.sf.net"
3SECTION = "libs"
4LICENSE = "BSD"
5DEPENDS = "expat liburiparser"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \
8 file://autofoo.patch;patch=1 \
9 file://makefile.patch;patch=1"
10
11S = "${WORKDIR}/libspiff-${PV}"
12
13inherit autotools pkgconfig lib_package
14
15EXTRA_OECONF = "\
16 --with-expat=${STAGING_LIBDIR}/.. \
17 --with-uriparser=${STAGING_LIBDIR}/.. \
18"
19
20CPPFLAGS += "-I${S}/include"
21
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 @@
1--- /tmp/configure.in 2008-06-21 12:20:52.000000000 +0200
2+++ uriparser-0.5.1/configure.in 2008-06-21 12:21:16.000000000 +0200
3@@ -9,6 +9,7 @@
4 AC_PROG_LIBTOOL
5 AC_HEADER_STDC
6
7+AM_PROG_CC_C_O
8
9
10 # 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 @@
1DESCRIPTION = "uriparser is a strictly RFC 3986 compliant URI parsing library."
2HOMEPAGE = "http://uriparser.sf.net"
3SECTION = "libs"
4LICENSE = "BSD"
5
6SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \
7 file://autofoo.patch;patch=1"
8S = "${WORKDIR}/uriparser-${PV}"
9
10inherit autotools pkgconfig
11
12
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 @@
1DESCRIPTION = "The Openmoko Dialer"
2SECTION = "openmoko/pim"
3HOMEPAGE = "http://projects.openmoko.org/projects/shr/"
4PKG_TAGS_${PN} = "group::communication"
5DEPENDS = " libmokoui2 libmokojournal2 pulseaudio dbus-glib libnotify libjana"
6RDEPENDS = "gsmd2"
7
8PV = "0.0.1+svnr${SRCREV}"
9SRCREV = "${AUTOREV}"
10PR = "r1"
11
12inherit autotools pkgconfig openmoko2
13
14SRC_URI = "svn://svn.projects.openmoko.org/svnroot/shr/trunk/;module=${PN};proto=http"
15
16LICENSE = "${@openmoko_two_get_license(d)}"
17SUBDIR = "${@openmoko_two_get_subdir(d)}"
18
19S = "${WORKDIR}/${PN}"
20
21FILES_${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 @@
1SECTION = "openmoko/libs"
2DEPENDS = "libgsmd glib-2.0"
3PV = "0.1.0+svnr${SRCREV}"
4PR = "r2"
5
6inherit openmoko2
7
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 @@
1SECTION = "openmoko/libs"
2DEPENDS = "eds-dbus"
3PV = "0.1.0+svnr${SRCREV}"
4PR = "r2"
5
6inherit openmoko2 lib_package
7
8do_configure_prepend() {
9 touch gtk-doc.make
10}
11
12
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 @@
1SECTION = "openmoko/libs"
2DEPENDS = "gtk+ matchbox-panel-2 dbus"
3PV = "0.3.0+svnr${SRCREV}"
4PR = "r0"
5
6inherit 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 @@
1SECTION = "openmoko/libs"
2DEPENDS = "gtk+"
3PV = "0.1.0+svnr${SRCREV}"
4PR = "r2"
5
6inherit openmoko2
7
8do_configure_prepend() {
9 touch gtk-doc.make
10}
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 @@
1DESCRIPTION = "Moko GTK+ theme engine"
2SECTION = "openmoko/libs"
3DEPENDS = "gtk+"
4PV = "0.1.0+svnr${SRCREV}"
5PR = "r0"
6
7inherit openmoko2
8
9PACKAGES += "moko-gtk-theme"
10FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
11FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
12FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
13FILES_moko-gtk-theme = "${datadir}/themes"
14RDEPENDS_${PN} = "moko-gtk-theme"
15
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 @@
1Index: neod/configure.ac
2===================================================================
3--- neod.orig/configure.ac 2007-09-15 23:01:30.000000000 +0200
4+++ neod/configure.ac 2007-09-15 23:02:01.000000000 +0200
5@@ -32,6 +32,10 @@
6 NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
7 fi
8
9+if test x"$neod_platform" = x"htc"; then
10+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
11+fi
12+
13 CFLAGS=$NEOD_CFLAGS
14
15 AC_OUTPUT([
16Index: neod/src/buttonactions.c
17===================================================================
18--- neod.orig/src/buttonactions.c 2007-09-15 23:02:15.000000000 +0200
19+++ neod/src/buttonactions.c 2007-09-15 23:04:16.000000000 +0200
20@@ -63,6 +63,12 @@
21 #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
22 #endif
23
24+#ifdef NEOD_PLATFORM_HTC
25+ #define AUX_BUTTON_KEYCODE 0xd4 /* camera */
26+ #define POWER_BUTTON_KEYCODE 0x74 /* power */
27+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
28+#endif
29+
30 #define HEADPHONE_INSERTION_SWITCHCODE 0x02
31
32 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 @@
1Index: neod/src/buttonactions.c
2===================================================================
3--- neod.orig/src/buttonactions.c 2007-09-29 17:24:43.000000000 +0200
4+++ neod/src/buttonactions.c 2007-09-29 17:24:49.000000000 +0200
5@@ -69,6 +69,12 @@
6 #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
7 #endif
8
9+#ifdef NEOD_PLATFORM_IPAQ
10+ #define AUX_BUTTON_KEYCODE 89 /* _KEY_RECORD */
11+ #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
12+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
13+#endif
14+
15 #define HEADPHONE_INSERTION_SWITCHCODE 0x02
16
17 GPollFD input_fd[10];
18Index: neod/configure.ac
19===================================================================
20--- neod.orig/configure.ac 2007-09-29 17:25:12.000000000 +0200
21+++ neod/configure.ac 2007-09-29 17:25:48.000000000 +0200
22@@ -36,6 +36,10 @@
23 NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
24 fi
25
26+if test x"$neod_platform" = x"ipaq"; then
27+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
28+fi
29+
30 CFLAGS=$NEOD_CFLAGS
31
32 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 @@
1DESCRIPTION = "Package for the different scenarios used by Openmoko"
2SECTION = "openmoko/base"
3PV = "1.0+svnr${SRCREV}"
4PR = "r1"
5
6COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
7
8SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
9
10S = "${WORKDIR}/${MACHINE_ARCH}"
11
12do_install() {
13 install -d ${D}${datadir}/openmoko/scenarios/
14 install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
15 install -d ${D}${sysconfdir}/
16 install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
17}
18
19PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
20
21FILES_${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 @@
1DESCRIPTION = "The Openmoko Appearance Editor"
2SECTION = "openmoko/pim"
3DEPENDS = "libmokoui2 gconf gtk+"
4RDEPENDS = "libedata-cal openmoko-today2-folders"
5PV = "0.1.0+svnr${SRCREV}"
6PR = "r0"
7
8inherit 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 @@
1Index: src/current-page.c
2===================================================================
3--- openmoko-browser2/src/current-page.c (revision 3249)
4+++ openmoko-browser2/src/current-page.c (working copy)
5@@ -129,7 +129,7 @@
6 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8);
7
8
9- data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new ();
10+ data->currentFingerScroll = moko_finger_scroll_new ();
11 gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0);
12 }
13
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 @@
1diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac
2--- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200
3+++ openmoko-browser2/configure.ac 2008-03-05 12:12:32.954623867 +0100
4@@ -40,7 +40,7 @@
5 # base deps
6 PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0)
7 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 )
8-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
9+PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
10
11 # glib-genmarshal
12 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
13diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h
14--- openmoko-browser2.orig/src/browser-data.h 2007-12-12 20:31:07.000000000 +0100
15+++ openmoko-browser2/src/browser-data.h 2008-03-05 12:12:50.497959252 +0100
16@@ -27,7 +27,7 @@
17 #ifndef OPENMOKO_BROWSER_DATA_H
18 #define OPENMOKO_BROWSER_DATA_H
19
20-#include "webkitwebview.h"
21+#include <webkit/webkitwebview.h>
22
23 #include <glib.h>
24 #include <gtk/gtk.h>
25diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c
26--- openmoko-browser2.orig/src/current-page.c 2007-12-12 20:31:07.000000000 +0100
27+++ openmoko-browser2/src/current-page.c 2008-03-05 12:13:56.032884030 +0100
28@@ -28,8 +28,8 @@
29 #include "current-page.h"
30
31 #include <moko-finger-scroll.h>
32-#include <webkitwebframe.h>
33-#include <webkitwebview.h>
34+#include <webkit/webkitwebframe.h>
35+#include <webkit/webkitwebview.h>
36
37 /*
38 * From a list of BrowserPage's in BrowserData::currentPage show
39@@ -42,7 +42,7 @@
40 static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
41 {
42 g_return_if_fail (data->currentPage);
43- webkit_web_view_go_backward(data->currentPage->webKitPage);
44+ webkit_web_view_go_back(data->currentPage->webKitPage);
45 }
46
47 static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
48@@ -66,7 +66,7 @@
49 g_assert (page == data->currentPage->webKitPage);
50
51 if (prog == 100) {
52- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
53+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page));
54 gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page));
55 gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
56 }
57@@ -176,7 +176,7 @@
58 * Update the GtkToolItems
59 */
60 /* XXX ### FIXME TODO check if we should show stop/reload */
61- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
62+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage));
63 gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage));
64 gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL);
65 gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
66diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c
67--- openmoko-browser2.orig/src/main.c 2007-12-12 20:31:07.000000000 +0100
68+++ openmoko-browser2/src/main.c 2008-03-05 12:14:46.337942098 +0100
69@@ -33,7 +33,7 @@
70 #include <gtk/gtk.h>
71 #include <glib/gi18n.h>
72
73-#include <webkit.h>
74+#include <webkit/webkit.h>
75
76 #include <moko-finger-scroll.h>
77 #include <moko-stock.h>
78@@ -55,7 +55,6 @@
79 gdk_threads_init ();
80 gdk_threads_enter ();
81 gtk_init (&argc, &argv);
82- webkit_init ();
83 moko_stock_register ();
84 g_set_application_name (_("Browser"));
85
86diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c
87--- openmoko-browser2.orig/src/open-pages-page.c 2007-12-12 20:31:07.000000000 +0100
88+++ openmoko-browser2/src/open-pages-page.c 2008-03-05 12:13:37.671282983 +0100
89@@ -28,8 +28,8 @@
90 #include "open-pages-page.h"
91 #include "current-page.h"
92
93-#include <webkitwebframe.h>
94-#include <webkitwebview.h>
95+#include <webkit/webkitwebframe.h>
96+#include <webkit/webkitwebview.h>
97 #include <moko-finger-scroll.h>
98
99 #include <glib/gi18n.h>
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 @@
1DESCRIPTION = "The Openmoko Webbrowser"
2SECTION = "openmoko/apps"
3DEPENDS += "intltool libmokoui2 check webkit-gtk"
4PV = "0.0.1+svnr${SRCREV}"
5PR = "r2"
6
7inherit openmoko2
8
9SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
10
11#SRC_URI += "file://fingerscroll.diff;patch=1"
12
13do_compile_prepend() {
14 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
15}
16
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 @@
1DESCRIPTION = "A Calculator for Openmoko"
2SECTION = "openmoko/tools"
3DEPENDS = "libmokoui2"
4PV = "0.1.0+svnr${SRCREV}"
5PR = "r0"
6
7inherit 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 @@
1DESCRIPTION = "Common files for the Openmoko framework"
2SECTION = "openmoko/base"
3PV = "0.1.0+svnr${SRCREV}"
4PR = "r0"
5
6inherit openmoko2
7
8SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
9S = "${WORKDIR}"
10
11ALLOW_EMPTY = "1"
12
13dirs = "pixmaps"
14
15do_install() {
16 find . -name .svn | xargs rm -rf
17 install -d ${D}${datadir}
18 for i in ${dirs}; do
19 cp -fR $i ${D}${datadir}/$i;
20 done
21 # moved to xserver-kdrive-common
22 rm -f ${D}${datadir}/pixmaps/xsplash*
23}
24
25PACKAGE_ARCH = "all"
26FILES_${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 @@
1DESCRIPTION = "The Openmoko Address Book"
2SECTION = "openmoko/pim"
3DEPENDS = "libmokoui2 libmokojournal2 dbus-glib libjana"
4RDEPENDS = "libedata-book"
5PV = "0.1.0+svnr${SRCREV}"
6PR = "r5"
7
8inherit openmoko2
9
10SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
11S = "${WORKDIR}/hito/"
12
13EXTRA_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 @@
1DESCRIPTION = "The Openmoko Calendar"
2SECTION = "openmoko/pim"
3DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
4RDEPENDS = "libedata-cal"
5PV = "0.1.0+svnr${SRCREV}"
6PR = "r2"
7
8inherit openmoko2 pkgconfig
9
10SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=openmoko2;proto=http"
11S = "${WORKDIR}/openmoko2/"
12
13EXTRA_OECONF = "--with-frontend=openmoko"
14
15do_configure_prepend() {
16 touch gtk-doc.make
17}
18
19
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 @@
1Index: openmoko-dialer2/src/phone-kit/moko-notify.c
2===================================================================
3--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800
4+++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800
5@@ -38,7 +38,7 @@
6
7 #define DEFAULT_RINGTONE "/default_ringtone.ogg"
8 #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
9-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
10+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
11
12 struct _MokoNotifyPrivate
13 {
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 @@
1Index: openmoko-dialer2/src/phone-kit/moko-notify.c
2===================================================================
3--- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051)
4+++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy)
5@@ -37,8 +37,8 @@
6 MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
7
8 #define DEFAULT_RINGTONE "/default_ringtone.ogg"
9-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
10-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
11+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
12+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
13
14 struct _MokoNotifyPrivate
15 {
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 @@
1--- openmoko-dialer2/src/moko-dialer.c~ 2007-08-27 20:02:37.000000000 +0930
2+++ openmoko-dialer2/src/moko-dialer.c 2007-08-27 18:59:37.000000000 +0930
3@@ -69,8 +69,7 @@
4
5 /* Registration variables */
6 guint reg_timeout;
7- gboolean reg_request;
8- gboolean registered;
9+ MokoGsmdConnectionNetregType registered;
10 };
11
12 enum
13@@ -292,8 +291,7 @@
14
15 moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), FALSE);
16
17- priv->reg_request = TRUE;
18- priv->registered = FALSE;
19+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE;
20 priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT,
21 (GSourceFunc)register_network_cb,
22 dialer);
23@@ -424,14 +422,14 @@
24 g_return_if_fail (MOKO_IS_DIALER (dialer));
25 priv = dialer->priv;
26
27+ g_warning ("on_network_registered: type is %d\n", type);
28+
29 switch (type)
30 {
31 case MOKO_GSMD_CONNECTION_NETREG_NONE:
32 case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
33 /* Do nothing */
34 g_print ("NetReg: Searching for network\n");
35- g_source_remove (priv->reg_timeout);
36- priv->registered = TRUE;
37 break;
38 case MOKO_GSMD_CONNECTION_NETREG_DENIED:
39 /* This may be a pin issue*/
40@@ -441,11 +439,12 @@
41 g_print ("NetReg: Network registered\n");
42 g_print("\tLocationAreaCode = %x\n\tCellID = %x\n", lac, cell);
43 g_source_remove (priv->reg_timeout);
44- priv->registered = TRUE;
45 break;
46 default:
47 g_warning ("Unhandled register event type = %d\n", type);
48 };
49+
50+ priv->registered = type;
51 }
52
53 static void
54@@ -619,28 +618,32 @@
55 g_return_val_if_fail (MOKO_DIALER (dialer), TRUE);
56 priv = MOKO_DIALER_GET_PRIVATE (dialer);
57
58- if (!priv->reg_request)
59+ /* We check whether we've been registered yet, otherwise keep poking
60+ * gsmd
61+ */
62+ switch (priv->registered)
63 {
64- /* We have yet to request registration, so lets do it */
65- /* FIXME: do the pin stuff */
66- g_print ("Requesting registration\n");
67- moko_gsmd_connection_network_register (priv->connection);
68- }
69- else
70- {
71- /* We check whether we've been registered yet, otherwise keep poking
72- * gsmd
73- */
74- if (priv->registered)
75- {
76- g_print ("Network Registered\n");
77- return FALSE;
78- }
79- else
80- {
81+ case MOKO_GSMD_CONNECTION_NETREG_NONE:
82+ /* We have yet to request registration, so lets do it */
83+ /* FIXME: do the pin stuff */
84 g_print ("Requesting registration\n");
85 moko_gsmd_connection_network_register (priv->connection);
86- }
87+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING;
88+ break;
89+ case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
90+ g_print ("Waiting for registration\n");
91+ break;
92+ case MOKO_GSMD_CONNECTION_NETREG_DENIED:
93+ g_print ("Registration denied, retrying\n");
94+ moko_gsmd_connection_network_register (priv->connection);
95+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING;
96+ break;
97+ case MOKO_GSMD_CONNECTION_NETREG_HOME:
98+ case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
99+ g_print ("Network Registered\n");
100+ return FALSE;
101+ default:
102+ g_warning ("Unhandled register event type = %d\n", priv->registered);
103 }
104
105 return TRUE;
106@@ -754,9 +757,8 @@
107
108 /* Handle network registration a few seconds after powering up the
109 * antenna*/
110- priv->reg_request = TRUE;
111- priv->registered = FALSE;
112- priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT,
113+ priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE;
114+ priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT * 2,
115 (GSourceFunc)register_network_cb,
116 dialer);
117
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 @@
1DESCRIPTION = "The Openmoko Dialer"
2SECTION = "openmoko/pim"
3DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
4PV = "0.1.0+svnr${SRCREV}"
5PR = "r8"
6PE = "1"
7
8inherit openmoko2
9
10SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch;patch=1"
11SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;patch=1"
12
13EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
14
15FILES_${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 @@
1DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
2SECTION = "openmoko/base"
3PV = "0.1.0+svnr${SRCREV}"
4PR = "r2"
5
6PACKAGE_ARCH = "all"
7
8inherit openmoko2
9
10SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
11S = "${WORKDIR}/icons"
12
13PACKAGES += "${PN}-compat"
14
15FILES_${PN} = "${datadir}/icons/openmoko-standard"
16FILES_${PN}-compat = "${datadir}/icons/hicolor"
17
18do_install_append () {
19 mkdir --parents "${D}/${datadir}/icons/hicolor"
20 cd "${D}/${datadir}/icons/openmoko-standard"
21 FILES=`find . -type f -name moko\* -o -name openmoko*`
22 cd ../hicolor
23 for F in $FILES; do
24 mkdir --parents `dirname $F`
25 ln -s ${datadir}/icons/openmoko-standard/$F $F
26 done
27}
28
29pkg_postinst_${PN} () {
30 if [ "x$D" != "x" ]; then
31 exit 1
32 fi
33 gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
34}
35
36pkg_postinst_${PN}-compat () {
37 if [ "x$D" != "x" ]; then
38 exit 1
39 fi
40 gtk-update-icon-cache -q /usr/share/icons/hicolor
41}
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 @@
1DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
2SECTION = "openmoko/base"
3PV = "0.0+svn${SRCDATE}"
4PR = "r2"
5
6inherit openmoko-base autotools
7
8SRC_URI = "${OPENMOKO_MIRROR}/src/target/OM-2007.2/artwork;module=icons;proto=http"
9S = "${WORKDIR}/icons"
10
11PACKAGE_ARCH = "all"
12
13pkg_postinst_${PN} () {
14 if [ "x$D" != "x" ]; then
15 exit 1
16 fi
17 gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
18}
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 @@
1HOMEPAGE = "http://www.openmoko.org"
2LICENSE = "GPL"
3PV = "0.0.1+svn${SRCDATE}"
4
5inherit autotools pkgconfig
6
7SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/libraries;module=${REAL_PN};proto=http"
8
9S = "${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 @@
1DESCRIPTION = "A media player for Openmoko"
2SECTION = "openmoko/tools"
3DEPENDS = "libmokoui2 expat gstreamer libspiff curl tslib"
4RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
5PV = "0.1.0+svnr${SRCREV}"
6PR = "r4"
7
8inherit openmoko2
9
10FILES_${PN} += "${datadir}/openmoko-mediaplayer"
11
12do_install_append() {
13 install -d ${D}${sysconfdir}/gconf/schemas
14 install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas
15}
16
17pkg_postinst_openmoko-mediaplayer2 () {
18#!/bin/sh -e
19if [ "x$D" != "x" ]; then
20 exit 1
21fi
22
23export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
24gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
25}
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 @@
1DESCRIPTION = "The Openmoko Message application"
2SECTION = "openmoko/pim"
3DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
4PV = "0.1.0+svnr${SRCREV}"
5PR = "r1"
6
7inherit openmoko2
8
9EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
10
11FILES_${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 @@
1DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel"
2DEPENDS = "libmokogsmd2 libnotify"
3PV = "0.1.0+svn${SVNREV}"
4PR = "r2"
5
6inherit 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 @@
1DESCRIPTION = "The Openmoko Sample Project"
2SECTION = "openmoko/applications"
3DEPENDS = "libmokoui2 intltool gconf"
4PV = "0.0.1+svnr${SRCREV}"
5PR = "r0"
6
7inherit openmoko2
8
9PACKAGES += "${PN}-src"
10# path should match the toolchain path
11FILES_${PN}-src = "/usr/local/openmoko"
12PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
13
14do_configure_prepend() {
15 install -d ${WORKDIR}/source
16 cp -pPR ${S} ${WORKDIR}/source/
17 find ${WORKDIR}/source -name ".svn"|xargs rm -rf
18}
19
20do_install_append() {
21 install -d ${D}/usr/local/openmoko/source/
22 cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
23}
24
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 @@
1DESCRIPTION = "Custom Matchbox session files for Openmoko"
2LICENSE = "GPL"
3SECTION = "x11"
4RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
5RCONFLICTS_${PN} = "openmoko-session matchbox-common"
6PR = "r69"
7
8SRC_URI = "\
9 file://etc \
10 file://matchbox-session \
11"
12
13S = "${WORKDIR}"
14
15inherit update-alternatives
16
17do_install() {
18 install -d ${D}${bindir}
19 install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
20 install -d ${D}${sysconfdir}
21 cp -R ${S}/etc/* ${D}${sysconfdir}
22 rm -fR ${D}${sysconfdir}/.svn
23 rm -fR ${D}${sysconfdir}/matchbox/.svn
24 chmod -R 755 ${D}${sysconfdir}/
25}
26
27PACKAGE_ARCH = "all"
28
29pkg_postinst_openmoko-session2 () {
30#!/bin/sh -e
31if [ "x$D" != "x" ]; then
32 exit 1
33fi
34
35gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
36gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
37gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
38gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
39gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
40gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
41gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
42# gstreamer audio settings
43gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
44gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
45
46}
47
48ALTERNATIVE_NAME = "x-window-manager"
49ALTERNATIVE_PATH = "${bindir}/matchbox-session"
50ALTERNATIVE_LINK = "${bindir}/x-window-manager"
51ALTERNATIVE_PRIORITY = "11"
52
53CONFFILES_${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 @@
1#!/bin/sh
2SHOWCURSOR="no"
3
4openmoko-today &
5phone-kit &
6
7matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ &
8
9matchbox-panel-2 --start-applets systray,startup \
10 --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,openmoko-panel-wifi --titlebar &
11
12exec 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 @@
1#!/bin/sh
2#
3# Very simple session manager for matchbox tools
4#
5
6# Uncomment below to enable parsing of debian menu entrys
7# export MB_USE_DEB_MENUS=1
8
9if [ -e $HOME/.matchbox/session ]
10then
11exec $HOME/.matchbox/session
12fi
13
14if [ -e /etc/matchbox/session ]
15then
16exec /etc/matchbox/session
17fi
18
19# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
20# dont exist.
21
22matchbox-desktop &
23matchbox-panel --orientation south &
24exec 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 @@
1#!/bin/sh
2#
3# pulseaudio This shell script starts and stops pulseaudio.
4#
5# chkconfig: 345 90 40
6# description: Pulseaudio manages the sound input/output
7# processname: pulseaudio
8
9# Source function library.
10#. /etc/rc.d/init.d/functions
11
12RETVAL=0
13prog="pulseaudio"
14
15start() {
16 echo -n "Starting audio server: "
17 # FIXME once alsa/shm permissions have been fixed, supply --system
18 start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session
19
20 if [ $? = 0 ]; then
21 echo "$prog (warning ignores)." # FIXME remove comment on warning
22 else
23 echo "(failed.)"
24 fi
25}
26
27stop() {
28 echo -n "Stopping audio server: "
29 start-stop-daemon -K -x /usr/bin/pulseaudio
30 echo "pulseaudio."
31}
32
33# See how we were called.
34case "$1" in
35 start)
36 start
37 ;;
38 stop)
39 stop
40 ;;
41 restart|reload)
42 stop
43 start
44 ;;
45 *)
46 echo "Usage: $0 {start|stop|restart}"
47 exit 1
48esac
49
50exit $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 @@
1#!/usr/bin/pulseaudio -nF
2
3# Create autoload entries for the device drivers
4add-autoload-sink output module-alsa-sink sink_name=output
5add-autoload-source input module-alsa-source source_name=input
6
7# Load several protocols
8load-module module-esound-protocol-unix
9load-module module-simple-protocol-tcp
10load-module module-native-protocol-unix
11load-module module-cli-protocol-unix
12
13# Make some devices default
14set-default-sink output
15set-default-source input
16
17# Don't fail if the audio files referred to below don't exist
18.nofail
19
20# Load an audio to the sample cache for usage with module-x11-bell
21load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
22load-module module-x11-bell sample=x11-bell
23
24# Load samples
25load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
26load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
27load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
28
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 @@
1DESCRIPTION = "Openmoko Sound System"
2SECTION = "openmoko/base"
3RDEPENDS = "\
4 pulseaudio-server \
5 pulseaudio-module-alsa-sink \
6 pulseaudio-module-alsa-source \
7 pulseaudio-module-cli \
8 pulseaudio-module-esound-protocol-unix \
9 pulseaudio-module-simple-protocol-tcp \
10 pulseaudio-module-native-protocol-unix \
11 pulseaudio-module-cli-protocol-unix \
12 gst-plugin-pulse \
13"
14RREPLACES = "openmoko-sound-system"
15RPROVIDES = "openmoko-sound-system"
16PR = "r5"
17
18inherit openmoko-base update-rc.d
19
20INITSCRIPT_NAME = "pulseaudio"
21INITSCRIPT_PARAMS = "defaults 35"
22
23SRC_URI = "file://pulseaudio \
24 file://session"
25S = "${WORKDIR}"
26
27do_install() {
28 install -d ${D}/${sysconfdir}/init.d
29 install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
30 install -d ${D}/${sysconfdir}/pulse
31 install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
32}
33
34PACKAGE_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 @@
1DESCRIPTION = "Standard sound theme for the Openmoko framework"
2SECTION = "openmoko/base"
3RREPLACES = "openmoko-sound-theme-standard"
4RPROVIDES = "openmoko-sound-theme-standard"
5PV = "0.1+svnr${SRCREV}"
6PR = "r3"
7
8inherit openmoko2 autotools
9
10SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
11S = "${WORKDIR}/sounds"
12
13do_install() {
14 find ${WORKDIR} -name ".svn" | xargs rm -rf
15 install -d ${D}${datadir}/openmoko/sounds
16 for i in *.mp3; do
17 cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
18 done
19 for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
20 cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
21 done
22}
23
24FILES_${PN} = "${datadir}"
25
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 @@
1[Desktop Entry]
2Encoding=UTF-8
3Name=Tasks
4Comment=What you need to do
5Exec=tasks
6Icon=openmoko-tasks
7Terminal=false
8Type=Application
9Categories=GTK;Application;PIM;Office
10MimeType=text/x-vcard;
11SingleInstance=true
12StartupNotify=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 f28d1ade99..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
+++ /dev/null
Binary files differ
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
deleted file mode 100644
index b18c269814..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1DESCRIPTION = "The Openmoko Agenda"
2SECTION = "openmoko/pim"
3DEPENDS = "dbus-glib eds-dbus libmokoui2"
4RDEPENDS = "libedata-cal"
5PV = "0.1.0+svnr${SRCREV}"
6PR = "r1"
7
8inherit openmoko2
9
10SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http \
11 file://openmoko-tasks.desktop \
12 file://openmoko-tasks.png"
13S = "${WORKDIR}/trunk"
14
15EXTRA_OECONF = "--enable-omoko --disable-gtk"
16
17do_install_append() {
18 install -d ${D}${datadir}/applications
19 install -m 0644 ${WORKDIR}/openmoko-tasks.desktop ${D}${datadir}/applications/tasks.desktop
20 install -d ${D}${datadir}/pixmaps
21 install -m 0644 ${WORKDIR}/openmoko-tasks.png ${D}${datadir}/pixmaps
22}
23
diff --git a/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
deleted file mode 100644
index 699691925c..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1DESCRIPTION = "The Openmoko Command Line Terminal"
2SECTION = "openmoko/applications"
3DEPENDS = "vala-native vte libmokoui2"
4RDEPENDS = "liberation-fonts"
5PV = "3.0.0+svnr${SRCREV}"
6PR = "r2"
7
8inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
deleted file mode 100644
index d4d23d11d6..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
2SECTION = "openmoko/base"
3RCONFLICTS = "openmoko-theme-standard"
4PV = "0.1.1+svnr${SRCREV}"
5PR = "r5"
6
7inherit openmoko2
8
9SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
10S = "${WORKDIR}/openmoko-standard-2"
11
12do_install() {
13 find ${WORKDIR} -name ".svn" | xargs rm -rf
14 install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
15 cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
16 rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
17
18}
19
20PACKAGE_ARCH = "all"
21FILES_${PN} = "${datadir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
deleted file mode 100644
index 94b9c45e7c..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1DESCRIPTION = "The Openmoko Today2 vfolder files"
2SECTION = "openmoko/misc"
3PV = "0.1.0+svnr${SRCREV}"
4PR = "r4"
5RCONFLICTS_${PN} = "matchbox-desktop-sato"
6
7inherit openmoko2
8
9FILES_${PN} += "${datadir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
deleted file mode 100644
index efd281a95e..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1DESCRIPTION = "The Openmoko Application Launcher"
2SECTION = "openmoko/pim"
3DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
4RDEPENDS = "libedata-cal openmoko-today2-folders"
5PV = "0.1.0+svnr${SRCREV}"
6PR = "r2"
7
8inherit openmoko2 gtk-icon-cache
diff --git a/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
deleted file mode 100644
index 5b3956ee23..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1DESCRIPTION = "A World-Clock for Openmoko"
2SECTION = "openmoko/tools"
3DEPENDS = "libmokoui2 libjana"
4PV = "0.1.0+svnr${SRCREV}"
5
6inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko.inc b/meta-openmoko/packages/openmoko2/openmoko.inc
deleted file mode 100644
index d5462be530..0000000000
--- a/meta-openmoko/packages/openmoko2/openmoko.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1HOMEPAGE = "http://www.openmoko.org"
2LICENSE = "GPL"
3DEPENDS = "gtk+ eds-dbus"
4PV = "0.0.1+svn${SRCDATE}"
5
6SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=${REAL_PN};proto=http"
7
8S = "${WORKDIR}/${REAL_PN}"
9
10inherit autotools
diff --git a/meta-openmoko/packages/usbpath/usbpath-native_svn.bb b/meta-openmoko/packages/usbpath/usbpath-native_svn.bb
deleted file mode 100644
index 7389e161c4..0000000000
--- a/meta-openmoko/packages/usbpath/usbpath-native_svn.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require usbpath_svn.bb
2inherit native
3DEPENDS = "libusb-native"
diff --git a/meta-openmoko/packages/usbpath/usbpath_svn.bb b/meta-openmoko/packages/usbpath/usbpath_svn.bb
deleted file mode 100644
index 0c0873ffe1..0000000000
--- a/meta-openmoko/packages/usbpath/usbpath_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Convert the physical locations of a USB device to/from its number"
2AUTHOR = "Werner Almesberger <werner@openmoko.org>"
3SECTION = "console/utils"
4LICENSE = "GPL"
5DEPENDS = "libusb"
6
7PV = "0.0+svnr${SRCREV}"
8
9SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;proto=http"
10
11S = "${WORKDIR}/usbpath"
12
13inherit autotools
14
diff --git a/meta-openmoko/packages/vala/vala-native_0.1.5.bb b/meta-openmoko/packages/vala/vala-native_0.1.5.bb
deleted file mode 100644
index f097e7db74..0000000000
--- a/meta-openmoko/packages/vala/vala-native_0.1.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require vala_${PV}.bb
2
3inherit native
4DEPENDS = "glib-2.0-native"
5
diff --git a/meta-openmoko/packages/vala/vala_0.1.5.bb b/meta-openmoko/packages/vala/vala_0.1.5.bb
deleted file mode 100644
index b83d19650a..0000000000
--- a/meta-openmoko/packages/vala/vala_0.1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. Vala compiles to C"
2SECTION = "devel"
3DEPENDS = "glib-2.0"
4HOMEPAGE = "http://live.gnome.org/Vala"
5LICENSE = "LGPL"
6
7SRC_URI = "http://download.gnome.org/sources/vala/0.1/vala-${PV}.tar.bz2"
8S = "${WORKDIR}/vala-${PV}"
9
10inherit autotools lib_package
11
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-26 17:02:29 +0000