summaryrefslogtreecommitdiff
path: root/packages/openmoko2
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/openmoko2
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/openmoko2')
-rw-r--r--packages/openmoko2/libjana/clockpatch.patch31
-rw-r--r--packages/openmoko2/libjana_svn.bb31
-rw-r--r--packages/openmoko2/libmokogsmd2_svn.bb11
-rw-r--r--packages/openmoko2/libmokojournal2_svn.bb15
-rw-r--r--packages/openmoko2/libmokopanelui2_svn.bb10
-rw-r--r--packages/openmoko2/libmokoui2_svn.bb17
-rw-r--r--packages/openmoko2/moko-gtk-engine_svn.bb14
-rw-r--r--packages/openmoko2/neod/htc.patch32
-rw-r--r--packages/openmoko2/neod/ipaq.patch32
-rw-r--r--packages/openmoko2/neod_svn.bb25
-rw-r--r--packages/openmoko2/openmoko-alsa-scenarios.bb21
-rw-r--r--packages/openmoko2/openmoko-appearance_svn.bb8
-rw-r--r--packages/openmoko2/openmoko-appmanager2_svn.bb9
-rw-r--r--packages/openmoko2/openmoko-asu-om20072-support.bb27
-rw-r--r--packages/openmoko2/openmoko-browser2/fingerscroll.diff13
-rw-r--r--packages/openmoko2/openmoko-browser2/webkit-update.patch99
-rw-r--r--packages/openmoko2/openmoko-browser2_svn.bb17
-rw-r--r--packages/openmoko2/openmoko-calculator2/openmoko-calculator.pngbin14278 -> 0 bytes
-rw-r--r--packages/openmoko2/openmoko-calculator2_svn.bb14
-rw-r--r--packages/openmoko2/openmoko-common2_svn.bb26
-rw-r--r--packages/openmoko2/openmoko-contacts2_svn.bb13
-rw-r--r--packages/openmoko2/openmoko-dates2_svn.bb17
-rw-r--r--packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch13
-rw-r--r--packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch15
-rw-r--r--packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch117
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb15
-rw-r--r--packages/openmoko2/openmoko-feedreader2_svn.bb7
-rw-r--r--packages/openmoko2/openmoko-firststart2_svn.bb9
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb57
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2_svn.bb18
-rw-r--r--packages/openmoko2/openmoko-mediaplayer2_svn.bb25
-rw-r--r--packages/openmoko2/openmoko-messages2_svn.bb11
-rw-r--r--packages/openmoko2/openmoko-sample2_svn.bb24
-rw-r--r--packages/openmoko2/openmoko-session2.bb53
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session12
-rwxr-xr-xpackages/openmoko2/openmoko-session2/matchbox-session24
-rwxr-xr-xpackages/openmoko2/openmoko-sound-system2/pulseaudio50
-rw-r--r--packages/openmoko2/openmoko-sound-system2/session27
-rw-r--r--packages/openmoko2/openmoko-sound-system2_0.1.0.bb34
-rw-r--r--packages/openmoko2/openmoko-sound-theme-standard2_svn.bb25
-rw-r--r--packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop12
-rw-r--r--packages/openmoko2/openmoko-tasks2/openmoko-tasks.pngbin14517 -> 0 bytes
-rw-r--r--packages/openmoko2/openmoko-tasks2_svn.bb23
-rw-r--r--packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb26
-rw-r--r--packages/openmoko2/openmoko-theme-standard2_svn.bb21
-rw-r--r--packages/openmoko2/openmoko-today2-folders_svn.bb9
-rw-r--r--packages/openmoko2/openmoko-today2_svn.bb8
-rw-r--r--packages/openmoko2/openmoko-worldclock2_svn.bb6
-rw-r--r--packages/openmoko2/settingsgui_0.8.bb10
49 files changed, 0 insertions, 1133 deletions
diff --git a/packages/openmoko2/libjana/clockpatch.patch b/packages/openmoko2/libjana/clockpatch.patch
deleted file mode 100644
index 7b20222239..0000000000
--- a/packages/openmoko2/libjana/clockpatch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: jana/libjana-gtk/jana-gtk-clock.c
-===================================================================
---- jana.orig/libjana-gtk/jana-gtk-clock.c
-+++ jana/libjana-gtk/jana-gtk-clock.c
-@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock,
- cairo_fill (cr);
-
- /* Draw dark outline frame */
-- thickness = width/20;
-+ thickness = width/40;
- cairo_new_path (cr);
- cairo_rectangle (cr, thickness/2, thickness/2,
- width - thickness, height - thickness);
-@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock,
- cairo_set_source_rgb (cr, base_color[0]/2,
- base_color[1]/2, base_color[2]/2);
- cairo_stroke (cr);
--
-+#if 0
- /* Draw main outline frame */
- cairo_new_path (cr);
- cairo_rectangle (cr, thickness, thickness,
-@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock,
- base_color[1]/1.5, base_color[2]/1.5);
- cairo_set_line_width (cr, thickness/2);
- cairo_stroke (cr);
--
-+#endif
- cairo_identity_matrix (cr);
- }
-
diff --git a/packages/openmoko2/libjana_svn.bb b/packages/openmoko2/libjana_svn.bb
deleted file mode 100644
index 48779e50fe..0000000000
--- a/packages/openmoko2/libjana_svn.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "O-Hand Jana Library"
-DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
-
-inherit autotools pkgconfig lib_package
-
-SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http"
-S = "${WORKDIR}/trunk/"
-
-EXTRA_OECONF = "--enable-examples "
-
-do_configure_prepend() {
- touch gtk-doc.make
-}
-
-do_stage() {
- autotools_stage_all
-}
-
-PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
- libjana-gtk libjana-gtk-dbg \
- "
-
-LEAD_SONAME = "libjana.so"
-
-FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
-FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*"
-FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
-FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*"
-FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png "
diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
deleted file mode 100644
index 5625bf809d..0000000000
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-
-inherit openmoko2
-
-do_stage() {
- autotools_stage_all
-}
-
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
deleted file mode 100644
index 354b8e3f26..0000000000
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "eds-dbus"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-
-inherit openmoko2 lib_package
-
-do_configure_prepend() {
- touch gtk-doc.make
-}
-
-do_stage() {
- autotools_stage_all
-}
-
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
deleted file mode 100644
index 0813111821..0000000000
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "gtk+ matchbox-panel-2"
-PV = "0.3.0+svnr${SRCREV}"
-PR = "r0"
-
-inherit openmoko2
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
deleted file mode 100644
index d52b24737f..0000000000
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "gtk+"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-
-inherit openmoko2
-
-LICENSE = "LGPL"
-
-do_configure_prepend() {
- touch gtk-doc.make
-}
-
-do_stage() {
- autotools_stage_all
-}
-
diff --git a/packages/openmoko2/moko-gtk-engine_svn.bb b/packages/openmoko2/moko-gtk-engine_svn.bb
deleted file mode 100644
index 027b3cb22b..0000000000
--- a/packages/openmoko2/moko-gtk-engine_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Moko GTK+ theme engine"
-SECTION = "openmoko/libs"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
-
-inherit openmoko2
-
-PACKAGES += "moko-gtk-theme"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_moko-gtk-theme = "${datadir}/themes"
-RDEPENDS_${PN} = "moko-gtk-theme"
-
diff --git a/packages/openmoko2/neod/htc.patch b/packages/openmoko2/neod/htc.patch
deleted file mode 100644
index 0ced894a45..0000000000
--- a/packages/openmoko2/neod/htc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: neod/configure.ac
-===================================================================
---- neod.orig/configure.ac 2007-09-15 23:01:30.000000000 +0200
-+++ neod/configure.ac 2007-09-15 23:02:01.000000000 +0200
-@@ -32,6 +32,10 @@
- NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
- fi
-
-+if test x"$neod_platform" = x"htc"; then
-+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
-+fi
-+
- CFLAGS=$NEOD_CFLAGS
-
- AC_OUTPUT([
-Index: neod/src/buttonactions.c
-===================================================================
---- neod.orig/src/buttonactions.c 2007-09-15 23:02:15.000000000 +0200
-+++ neod/src/buttonactions.c 2007-09-15 23:04:16.000000000 +0200
-@@ -63,6 +63,12 @@
- #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
- #endif
-
-+#ifdef NEOD_PLATFORM_HTC
-+ #define AUX_BUTTON_KEYCODE 0xd4 /* camera */
-+ #define POWER_BUTTON_KEYCODE 0x74 /* power */
-+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
-+#endif
-+
- #define HEADPHONE_INSERTION_SWITCHCODE 0x02
-
- GPollFD input_fd[10];
diff --git a/packages/openmoko2/neod/ipaq.patch b/packages/openmoko2/neod/ipaq.patch
deleted file mode 100644
index 19b61ab1f5..0000000000
--- a/packages/openmoko2/neod/ipaq.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: neod/src/buttonactions.c
-===================================================================
---- neod.orig/src/buttonactions.c 2007-09-29 17:24:43.000000000 +0200
-+++ neod/src/buttonactions.c 2007-09-29 17:24:49.000000000 +0200
-@@ -69,6 +69,12 @@
- #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
- #endif
-
-+#ifdef NEOD_PLATFORM_IPAQ
-+ #define AUX_BUTTON_KEYCODE 89 /* _KEY_RECORD */
-+ #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
-+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
-+#endif
-+
- #define HEADPHONE_INSERTION_SWITCHCODE 0x02
-
- GPollFD input_fd[10];
-Index: neod/configure.ac
-===================================================================
---- neod.orig/configure.ac 2007-09-29 17:25:12.000000000 +0200
-+++ neod/configure.ac 2007-09-29 17:25:48.000000000 +0200
-@@ -36,6 +36,10 @@
- NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
- fi
-
-+if test x"$neod_platform" = x"ipaq"; then
-+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
-+fi
-+
- CFLAGS=$NEOD_CFLAGS
-
- AC_OUTPUT([
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
deleted file mode 100644
index 00fc49fdf9..0000000000
--- a/packages/openmoko2/neod_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
-SECTION = "openmoko/daemons"
-DEPENDS = "gtk+ pulseaudio apmd"
-RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r6"
-
-inherit openmoko2 gconf
-
-SRC_URI += "file://htc.patch;patch=1;maxrev=3348 \
- file://ipaq.patch;patch=1;maxrev=3348"
-
-EXTRA_OECONF_om-gta01 = "--with-platform=neo1973"
-EXTRA_OECONF_om-gta02 = "--with-platform=neo1973"
-EXTRA_OECONF_a780 = "--with-platform=ezx"
-EXTRA_OECONF_a1200 = "--with-platform=ezx"
-EXTRA_OECONF_e680 = "--with-platform=ezx"
-EXTRA_OECONF_rokre2 = "--with-platform=ezx"
-EXTRA_OECONF_rokre6 = "--with-platform=ezx"
-EXTRA_OECONF_magician = "--with-platform=htc"
-EXTRA_OECONF_hx4700 = "--with-platform=ipaq"
-EXTRA_OECONF_htcuniversal = "--with-platform=htc"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/packages/openmoko2/openmoko-alsa-scenarios.bb b/packages/openmoko2/openmoko-alsa-scenarios.bb
deleted file mode 100644
index 08531e898e..0000000000
--- a/packages/openmoko2/openmoko-alsa-scenarios.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Package for the different scenarios used by Openmoko"
-SECTION = "openmoko/base"
-PV = "1.0+svnr${SRCREV}"
-PR = "r1"
-
-COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
-
-SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
-
-S = "${WORKDIR}/${MACHINE_ARCH}"
-
-do_install() {
- install -d ${D}${datadir}/openmoko/scenarios/
- install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
- install -d ${D}${sysconfdir}/
- install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
-}
-
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
-
-FILES_${PN} += "${datadir}/openmoko"
diff --git a/packages/openmoko2/openmoko-appearance_svn.bb b/packages/openmoko2/openmoko-appearance_svn.bb
deleted file mode 100644
index a6f5c11171..0000000000
--- a/packages/openmoko2/openmoko-appearance_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "The Openmoko Appearance Editor"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 gconf gtk+"
-RDEPENDS = "libedata-cal openmoko-today2-folders"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
-
-inherit openmoko2 gtk-icon-cache
diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb
deleted file mode 100644
index fe5e227d8f..0000000000
--- a/packages/openmoko2/openmoko-appmanager2_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Openmoko Application Manager"
-SECTION = "openmoko/applications"
-DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm opkg"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
-
-inherit openmoko2
-
-FILES_${PN} += "/usr/share/openmoko-appmanager"
diff --git a/packages/openmoko2/openmoko-asu-om20072-support.bb b/packages/openmoko2/openmoko-asu-om20072-support.bb
deleted file mode 100644
index 9b0847f55c..0000000000
--- a/packages/openmoko2/openmoko-asu-om20072-support.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Theme support and defaults to integrate OM2007.2 in the April Software Update"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "openmoko-common2"
-
-ALLOW_EMPTY_${PN} = "1"
-PACKAGE_ARCH = "all"
-
-pkg_postinst_${PN} () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
- exit 1
-fi
-
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
-# gstreamer audio settings
-#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
-#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
-
-}
-
diff --git a/packages/openmoko2/openmoko-browser2/fingerscroll.diff b/packages/openmoko2/openmoko-browser2/fingerscroll.diff
deleted file mode 100644
index 89f79496a0..0000000000
--- a/packages/openmoko2/openmoko-browser2/fingerscroll.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/current-page.c
-===================================================================
---- openmoko-browser2/src/current-page.c (revision 3249)
-+++ openmoko-browser2/src/current-page.c (working copy)
-@@ -129,7 +129,7 @@
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8);
-
-
-- data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new ();
-+ data->currentFingerScroll = moko_finger_scroll_new ();
- gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0);
- }
-
diff --git a/packages/openmoko2/openmoko-browser2/webkit-update.patch b/packages/openmoko2/openmoko-browser2/webkit-update.patch
deleted file mode 100644
index 18e8a88e25..0000000000
--- a/packages/openmoko2/openmoko-browser2/webkit-update.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac
---- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200
-+++ openmoko-browser2/configure.ac 2008-03-05 12:12:32.954623867 +0100
-@@ -40,7 +40,7 @@
- # base deps
- PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0)
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0 )
--PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
-+PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
-
- # glib-genmarshal
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h
---- openmoko-browser2.orig/src/browser-data.h 2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/browser-data.h 2008-03-05 12:12:50.497959252 +0100
-@@ -27,7 +27,7 @@
- #ifndef OPENMOKO_BROWSER_DATA_H
- #define OPENMOKO_BROWSER_DATA_H
-
--#include "webkitwebview.h"
-+#include <webkit/webkitwebview.h>
-
- #include <glib.h>
- #include <gtk/gtk.h>
-diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c
---- openmoko-browser2.orig/src/current-page.c 2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/current-page.c 2008-03-05 12:13:56.032884030 +0100
-@@ -28,8 +28,8 @@
- #include "current-page.h"
-
- #include <moko-finger-scroll.h>
--#include <webkitwebframe.h>
--#include <webkitwebview.h>
-+#include <webkit/webkitwebframe.h>
-+#include <webkit/webkitwebview.h>
-
- /*
- * From a list of BrowserPage's in BrowserData::currentPage show
-@@ -42,7 +42,7 @@
- static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
- {
- g_return_if_fail (data->currentPage);
-- webkit_web_view_go_backward(data->currentPage->webKitPage);
-+ webkit_web_view_go_back(data->currentPage->webKitPage);
- }
-
- static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
-@@ -66,7 +66,7 @@
- g_assert (page == data->currentPage->webKitPage);
-
- if (prog == 100) {
-- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
-+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
- }
-@@ -176,7 +176,7 @@
- * Update the GtkToolItems
- */
- /* XXX ### FIXME TODO check if we should show stop/reload */
-- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
-+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage));
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL);
- gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
-diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c
---- openmoko-browser2.orig/src/main.c 2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/main.c 2008-03-05 12:14:46.337942098 +0100
-@@ -33,7 +33,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
-
--#include <webkit.h>
-+#include <webkit/webkit.h>
-
- #include <moko-finger-scroll.h>
- #include <moko-stock.h>
-@@ -55,7 +55,6 @@
- gdk_threads_init ();
- gdk_threads_enter ();
- gtk_init (&argc, &argv);
-- webkit_init ();
- moko_stock_register ();
- g_set_application_name (_("Browser"));
-
-diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c
---- openmoko-browser2.orig/src/open-pages-page.c 2007-12-12 20:31:07.000000000 +0100
-+++ openmoko-browser2/src/open-pages-page.c 2008-03-05 12:13:37.671282983 +0100
-@@ -28,8 +28,8 @@
- #include "open-pages-page.h"
- #include "current-page.h"
-
--#include <webkitwebframe.h>
--#include <webkitwebview.h>
-+#include <webkit/webkitwebframe.h>
-+#include <webkit/webkitwebview.h>
- #include <moko-finger-scroll.h>
-
- #include <glib/gi18n.h>
diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
deleted file mode 100644
index c6cd49ae87..0000000000
--- a/packages/openmoko2/openmoko-browser2_svn.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Om Webbrowser using webkit."
-SECTION = "openmoko/apps"
-DEPENDS += "intltool libmokoui2 check webkit-gtk"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r2"
-
-inherit openmoko2
-LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
-
-SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
-
-#SRC_URI += "file://fingerscroll.diff;patch=1"
-
-do_compile_prepend() {
- find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
-}
-
diff --git a/packages/openmoko2/openmoko-calculator2/openmoko-calculator.png b/packages/openmoko2/openmoko-calculator2/openmoko-calculator.png
deleted file mode 100644
index 2811364f83..0000000000
--- a/packages/openmoko2/openmoko-calculator2/openmoko-calculator.png
+++ /dev/null
Binary files differ
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
deleted file mode 100644
index 13e6948be9..0000000000
--- a/packages/openmoko2/openmoko-calculator2_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Legacy Om calculator application."
-SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
-
-inherit openmoko2
-LICENSE = "GPL"
-SRC_URI += " file://openmoko-calculator.png "
-
-do_install_append_openmoko() {
- install -d ${D}/${datadir}/pixmaps/
- install ${WORKDIR}//openmoko-calculator.png ${D}/${datadir}/pixmaps/openmoko-calculator.png
-}
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
deleted file mode 100644
index 0ea381437c..0000000000
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Common files for the Openmoko framework"
-SECTION = "openmoko/base"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r0"
-
-inherit openmoko2
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
-S = "${WORKDIR}"
-
-ALLOW_EMPTY = "1"
-
-dirs = "pixmaps"
-
-do_install() {
- find . -name .svn | xargs rm -rf
- install -d ${D}${datadir}
- for i in ${dirs}; do
- cp -fR $i ${D}${datadir}/$i;
- done
- # moved to xserver-kdrive-common
- rm -f ${D}${datadir}/pixmaps/xsplash*
-}
-
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir}"
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
deleted file mode 100644
index 65e104e09b..0000000000
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Legacy Om address book application."
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
-RDEPENDS = "libedata-book"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r6"
-
-inherit openmoko2
-
-SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
-S = "${WORKDIR}/hito/"
-
-EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
deleted file mode 100644
index a3da1716b3..0000000000
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Legacy Om calendar application."
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
-RDEPENDS = "libedata-cal"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r3"
-
-inherit openmoko2 pkgconfig
-