summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-openmoko/packages/openmoko2/libjana/clockpatch.patch31
-rw-r--r--meta-openmoko/packages/openmoko2/libjana_svn.bb9
-rw-r--r--meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb2
-rw-r--r--meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb10
-rw-r--r--meta-openmoko/packages/openmoko2/libmokoui2_svn.bb1
-rw-r--r--meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb14
-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/neod_svn.bb7
-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.bb17
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb7
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb14
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb8
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb4
-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.bb10
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb6
-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-sample2_svn.bb24
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-session2.bb46
-rwxr-xr-xmeta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session9
-rwxr-xr-x[-rw-r--r--]meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session0
-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.pngbin0 -> 14517 bytes
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb17
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb8
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb12
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb5
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb4
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb6
41 files changed, 746 insertions, 60 deletions
diff --git a/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch b/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch
new file mode 100644
index 0000000000..7b20222239
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch
@@ -0,0 +1,31 @@
1Index: jana/libjana-gtk/jana-gtk-clock.c
2===================================================================
3--- jana.orig/libjana-gtk/jana-gtk-clock.c
4+++ jana/libjana-gtk/jana-gtk-clock.c
5@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock,
6 cairo_fill (cr);
7
8 /* Draw dark outline frame */
9- thickness = width/20;
10+ thickness = width/40;
11 cairo_new_path (cr);
12 cairo_rectangle (cr, thickness/2, thickness/2,
13 width - thickness, height - thickness);
14@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock,
15 cairo_set_source_rgb (cr, base_color[0]/2,
16 base_color[1]/2, base_color[2]/2);
17 cairo_stroke (cr);
18-
19+#if 0
20 /* Draw main outline frame */
21 cairo_new_path (cr);
22 cairo_rectangle (cr, thickness, thickness,
23@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock,
24 base_color[1]/1.5, base_color[2]/1.5);
25 cairo_set_line_width (cr, thickness/2);
26 cairo_stroke (cr);
27-
28+#endif
29 cairo_identity_matrix (cr);
30 }
31
diff --git a/meta-openmoko/packages/openmoko2/libjana_svn.bb b/meta-openmoko/packages/openmoko2/libjana_svn.bb
index 065f380969..48779e50fe 100644
--- a/meta-openmoko/packages/openmoko2/libjana_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libjana_svn.bb
@@ -1,13 +1,15 @@
1DESCRIPTION = "O-Hand Jana Library" 1DESCRIPTION = "O-Hand Jana Library"
2DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" 2DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf"
3PV = "0.1.0+svnr${SRCREV}" 3PV = "0.1.0+svnr${SRCREV}"
4PR = "r4" 4PR = "r5"
5 5
6inherit autotools pkgconfig lib_package 6inherit autotools pkgconfig lib_package
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http" 8SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http"
9S = "${WORKDIR}/trunk/" 9S = "${WORKDIR}/trunk/"
10 10
11EXTRA_OECONF = "--enable-examples "
12
11do_configure_prepend() { 13do_configure_prepend() {
12 touch gtk-doc.make 14 touch gtk-doc.make
13} 15}
@@ -23,6 +25,7 @@ PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
23LEAD_SONAME = "libjana.so" 25LEAD_SONAME = "libjana.so"
24 26
25FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*" 27FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
26FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*" 28FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*"
27FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf" 29FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
28FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*" 30FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*"
31FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png "
diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
index 8e547b3663..5625bf809d 100644
--- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,7 +1,7 @@
1SECTION = "openmoko/libs" 1SECTION = "openmoko/libs"
2DEPENDS = "libgsmd glib-2.0" 2DEPENDS = "libgsmd glib-2.0"
3PV = "0.1.0+svnr${SRCREV}" 3PV = "0.1.0+svnr${SRCREV}"
4PR = "r1" 4PR = "r2"
5 5
6inherit openmoko2 6inherit openmoko2
7 7
diff --git a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb
new file mode 100644
index 0000000000..0813111821
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb
@@ -0,0 +1,10 @@
1SECTION = "openmoko/libs"
2DEPENDS = "gtk+ matchbox-panel-2"
3PV = "0.3.0+svnr${SRCREV}"
4PR = "r0"
5
6inherit openmoko2
7
8do_stage() {
9 autotools_stage_all
10}
diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
index 7d22f27a58..3785074a82 100644
--- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
@@ -12,3 +12,4 @@ do_configure_prepend() {
12do_stage() { 12do_stage() {
13 autotools_stage_all 13 autotools_stage_all
14} 14}
15
diff --git a/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb
new file mode 100644
index 0000000000..027b3cb22b
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb
@@ -0,0 +1,14 @@
1DESCRIPTION = "Moko GTK+ theme engine"
2SECTION = "openmoko/libs"
3PV = "0.1.0+svnr${SRCREV}"
4PR = "r0"
5
6inherit openmoko2
7
8PACKAGES += "moko-gtk-theme"
9FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
10FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
11FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
12FILES_moko-gtk-theme = "${datadir}/themes"
13RDEPENDS_${PN} = "moko-gtk-theme"
14
diff --git a/meta-openmoko/packages/openmoko2/neod/htc.patch b/meta-openmoko/packages/openmoko2/neod/htc.patch
new file mode 100644
index 0000000000..0ced894a45
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/neod/htc.patch
@@ -0,0 +1,32 @@
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
new file mode 100644
index 0000000000..19b61ab1f5
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/neod/ipaq.patch
@@ -0,0 +1,32 @@
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/neod_svn.bb b/meta-openmoko/packages/openmoko2/neod_svn.bb
deleted file mode 100644
index 4d6115ae93..0000000000
--- a/meta-openmoko/packages/openmoko2/neod_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
2SECTION = "openmoko/daemons"
3DEPENDS = "gconf gtk+ pulseaudio"
4PV = "0.1.0+svn${SVNREV}"
5PR = "r0"
6
7inherit openmoko2 gconf
diff --git a/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb
new file mode 100644
index 0000000000..08531e898e
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb
@@ -0,0 +1,21 @@
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
new file mode 100644
index 0000000000..a6f5c11171
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb
@@ -0,0 +1,8 @@
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
new file mode 100644
index 0000000000..89f79496a0
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff
@@ -0,0 +1,13 @@
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
new file mode 100644
index 0000000000..18e8a88e25
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
@@ -0,0 +1,99 @@
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
new file mode 100644
index 0000000000..c7f3066946
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "The Openmoko Webbrowser"
2SECTION = "openmoko/apps"
3DEPENDS += "intltool libmokoui2 check webkit-gtk"
4PV = "0.0.1+svnr${SRCREV}"
5PR = "r2"
6
7inherit openmoko2
8LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
9
10SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
11
12#SRC_URI += "file://fingerscroll.diff;patch=1"
13
14do_compile_prepend() {
15 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
16}
17
diff --git a/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb
new file mode 100644
index 0000000000..ba202bcec9
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -0,0 +1,7 @@
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
index f54a23de18..0ea381437c 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,21 +1,25 @@
1DESCRIPTION = "Common files for the OpenMoko distribution" 1DESCRIPTION = "Common files for the Openmoko framework"
2SECTION = "openmoko/base" 2SECTION = "openmoko/base"
3PV = "0.0+svn${SRCDATE}" 3PV = "0.1.0+svnr${SRCREV}"
4PR = "r3" 4PR = "r0"
5 5
6inherit openmoko2 6inherit openmoko2
7 7
8SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http" 8SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
9S = "${WORKDIR}" 9S = "${WORKDIR}"
10 10
11ALLOW_EMPTY = "1"
12
11dirs = "pixmaps" 13dirs = "pixmaps"
12 14
13do_install() { 15do_install() {
14 find ${WORKDIR} -name ".svn" | xargs rm -rf 16 find . -name .svn | xargs rm -rf
15 install -d ${D}${datadir} 17 install -d ${D}${datadir}
16 for i in ${dirs}; do 18 for i in ${dirs}; do
17 cp -fpPR ${S}/$i ${D}${datadir} 19 cp -fR $i ${D}${datadir}/$i;
18 done 20 done
21 # moved to xserver-kdrive-common
22 rm -f ${D}${datadir}/pixmaps/xsplash*
19} 23}
20 24
21PACKAGE_ARCH = "all" 25PACKAGE_ARCH = "all"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
index c63738a912..4d7b1bcd7d 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,9 +1,9 @@
1DESCRIPTION = "The OpenMoko Address Book" 1DESCRIPTION = "The Openmoko Address Book"
2SECTION = "openmoko/pim" 2SECTION = "openmoko/pim"
3DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" 3DEPENDS = "libmokoui2 libmokojournal2 dbus-glib libjana"
4RDEPENDS = "libedata-book" 4RDEPENDS = "libedata-book"
5PV = "0.1.0+svn${SVNREV}" 5PV = "0.1.0+svnr${SRCREV}"
6PR = "r4" 6PR = "r5"
7 7
8inherit openmoko2 8inherit openmoko2
9 9
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
index 1fa610020d..ff3bfa62a6 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "The OpenMoko Calendar" 1DESCRIPTION = "The Openmoko Calendar"
2SECTION = "openmoko/pim" 2SECTION = "openmoko/pim"
3DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana" 3DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
4RDEPENDS = "libedata-cal" 4RDEPENDS = "libedata-cal"
@@ -15,3 +15,5 @@ EXTRA_OECONF = "--with-frontend=openmoko"
15do_configure_prepend() { 15do_configure_prepend() {
16 touch gtk-doc.make 16 touch gtk-doc.make
17} 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
new file mode 100644
index 0000000000..c6f34f4131
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
@@ -0,0 +1,13 @@
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
new file mode 100644
index 0000000000..72c516f5d6
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
@@ -0,0 +1,15 @@
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
new file mode 100644
index 0000000000..5969726857
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch
@@ -0,0 +1,117 @@
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
index b01d9d3c05..fa76c44a14 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,11 +1,15 @@
1DESCRIPTION = "The OpenMoko Dialer" 1DESCRIPTION = "The Openmoko Dialer"
2SECTION = "openmoko/pim" 2SECTION = "openmoko/pim"
3DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" 3DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
4PV = "0.1.0+svnr${SRCREV}" 4PV = "0.1.0+svnr${SRCREV}"
5PR = "r5" 5PR = "r8"
6PE = "1"
6 7
7inherit openmoko2 8inherit openmoko2
8 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
9EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" 13EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
10 14
11FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" 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
index e443e36075..e145fb2d98 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" 1DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
2SECTION = "openmoko/base" 2SECTION = "openmoko/base"
3PV = "0.1.0+svn${SVNREV}" 3PV = "0.1.0+svnr${SRCREV}"
4PR = "r0" 4PR = "r1"
5 5
6inherit openmoko2 6inherit openmoko2
7 7
diff --git a/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb
new file mode 100644
index 0000000000..79a8163328
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -0,0 +1,25 @@
1DESCRIPTION = "A media player for Openmoko"
2SECTION = "openmoko/tools"
3DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
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
new file mode 100644
index 0000000000..f28f7f8e0a
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb
@@ -0,0 +1,11 @@
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-sample2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb
new file mode 100644
index 0000000000..b944e79b45
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb
@@ -0,0 +1,24 @@
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
index 046f59b3d9..d0c3268e0c 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-session2.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2.bb
@@ -1,33 +1,53 @@
1DESCRIPTION = "Custom MB session files for OpenMoko" 1DESCRIPTION = "Custom Matchbox session files for Openmoko"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" 4RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
5RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" 5RCONFLICTS_${PN} = "openmoko-session matchbox-common"
6RCONFLICTS = "openmoko-session" 6PR = "r69"
7PR = "r29"
8 7
9SRC_URI = "file://etc" 8SRC_URI = "\
10S = ${WORKDIR} 9 file://etc \
10 file://matchbox-session \
11"
12
13S = "${WORKDIR}"
14
15inherit update-alternatives
11 16
12do_install() { 17do_install() {
13 cp -R ${S}/etc ${D}/etc 18 install -d ${D}${bindir}
14 rm -fR ${D}/etc/.svn 19 install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
15 rm -fR ${D}/etc/matchbox/.svn 20 install -d ${D}${sysconfdir}
16 chmod -R 755 ${D}/etc 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}/
17} 25}
18 26
27PACKAGE_ARCH = "all"
28
19pkg_postinst_openmoko-session2 () { 29pkg_postinst_openmoko-session2 () {
20#!/bin/sh -e 30#!/bin/sh -e
21if [ "x$D" != "x" ]; then 31if [ "x$D" != "x" ]; then
22 exit 1 32 exit 1
23fi 33fi
24 34
25gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2 35gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
26gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard 36gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
27gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5" 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
28gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8 40gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
29gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2 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
30 45
31} 46}
32 47
33PACKAGE_ARCH = "all" 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
index 787d9c72ba..732cce9d3f 100755
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -1,11 +1,12 @@
1#!/bin/sh 1#!/bin/sh
2
3SHOWCURSOR="no" 2SHOWCURSOR="no"
4 3
5openmoko-today & 4openmoko-today &
6openmoko-dialer & 5phone-kit &
7 6
8matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & 7matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ &
9 8
10exec matchbox-panel --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar 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 11
12exec neod
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
index 65f1ce72ca..65f1ce72ca 100644..100755
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio
new file mode 100755
index 0000000000..964947376e
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio
@@ -0,0 +1,50 @@
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
new file mode 100644
index 0000000000..7ba07e9784
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session
@@ -0,0 +1,28 @@
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
new file mode 100644
index 0000000000..33cd5648d4
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -0,0 +1,34 @@
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
new file mode 100644
index 0000000000..3096da4813
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -0,0 +1,25 @@
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
new file mode 100644
index 0000000000..f9e813a734
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
@@ -0,0 +1,12 @@
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
new file mode 100644
index 0000000000..f28d1ade99
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
Binary files differ
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
index c76ce709bb..b18c269814 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
@@ -1,14 +1,23 @@
1DESCRIPTION = "The OpenMoko Agenda" 1DESCRIPTION = "The Openmoko Agenda"
2SECTION = "openmoko/pim" 2SECTION = "openmoko/pim"
3DEPENDS = "dbus-glib eds-dbus libmokoui2" 3DEPENDS = "dbus-glib eds-dbus libmokoui2"
4RDEPENDS = "libedata-cal" 4RDEPENDS = "libedata-cal"
5RCONFLICTS = "tasks" 5PV = "0.1.0+svnr${SRCREV}"
6PV = "0.1.0+svn${SVNREV}"
7PR = "r1" 6PR = "r1"
8 7
9inherit openmoko2 8inherit openmoko2
10 9
11SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http" 10SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http \
11 file://openmoko-tasks.desktop \
12 file://openmoko-tasks.png"
12S = "${WORKDIR}/trunk" 13S = "${WORKDIR}/trunk"
13 14
14EXTRA_OECONF = "--enable-omoko --disable-gtk" 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
new file mode 100644
index 0000000000..3a5ef204ff
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -0,0 +1,8 @@
1DESCRIPTION = "The Openmoko Command Line Terminal"
2SECTION = "openmoko/applications"
3DEPENDS = "vala-native vte libmokoui2"
4RDEPENDS = "ttf-liberation-mono"
5PV = "3.0.0+svnr${SRCREV}"
6PR = "r1"
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
index bbeba4420f..d4d23d11d6 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,8 +1,8 @@
1DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" 1DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
2SECTION = "openmoko/base" 2SECTION = "openmoko/base"
3RCONFLICTS = "openmoko-theme-standard" 3RCONFLICTS = "openmoko-theme-standard"
4PV = "0.1.0+svnr${SRCDATE}" 4PV = "0.1.1+svnr${SRCREV}"
5PR = "r2" 5PR = "r5"
6 6
7inherit openmoko2 7inherit openmoko2
8 8
@@ -15,11 +15,7 @@ do_install() {
15 cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/ 15 cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
16 rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/ 16 rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
17 17
18 install -d ${D}${sysconfdir}/gtk-2.0
19 echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
20} 18}
21 19
22CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
23
24PACKAGE_ARCH = "all" 20PACKAGE_ARCH = "all"
25FILES_${PN} = "${datadir} ${sysconfdir}" 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
index ecd28d1b68..4b9f245c3c 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,7 +1,8 @@
1DESCRIPTION = "The OpenMoko Today2 vfolder files" 1DESCRIPTION = "The Openmoko Today2 vfolder files"
2SECTION = "openmoko/misc" 2SECTION = "openmoko/misc"
3PV = "0.1.0+svnr${SRCREV}" 3PV = "0.1.0+svnr${SRCREV}"
4PR = "r1" 4PR = "r3"
5RCONFLICTS_${PN} = "matchbox-common"
5 6
6inherit openmoko2 7inherit openmoko2
7 8
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
index 6b2d1b6ec7..efd281a95e 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "The OpenMoko Application Launcher" 1DESCRIPTION = "The Openmoko Application Launcher"
2SECTION = "openmoko/pim" 2SECTION = "openmoko/pim"
3DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib" 3DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
4RDEPENDS = "libedata-cal openmoko-today2-folders" 4RDEPENDS = "libedata-cal openmoko-today2-folders"
5PV = "0.1.0+svnr${SRCREV}" 5PV = "0.1.0+svnr${SRCREV}"
6PR = "r2" 6PR = "r2"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
new file mode 100644
index 0000000000..5b3956ee23
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
@@ -0,0 +1,6 @@
1DESCRIPTION = "A World-Clock for Openmoko"
2SECTION = "openmoko/tools"
3DEPENDS = "libmokoui2 libjana"
4PV = "0.1.0+svnr${SRCREV}"
5
6inherit openmoko2
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 08:24:06 +0000