summaryrefslogtreecommitdiff
path: root/packages/openmoko2
diff options
context:
space:
mode:
Diffstat (limited to 'packages/openmoko2')
-rw-r--r--packages/openmoko2/neod_svn.bb8
-rw-r--r--packages/openmoko2/openmoko-browser2/.mtn2git_empty0
-rw-r--r--packages/openmoko2/openmoko-browser2/fingerscroll.diff13
-rw-r--r--packages/openmoko2/openmoko-browser2_svn.bb4
-rw-r--r--packages/openmoko2/openmoko-worldclock2_svn.bb2
5 files changed, 22 insertions, 5 deletions
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index 7e662de73a..8a2e354349 100644
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -1,14 +1,14 @@
DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
SECTION = "openmoko/daemons"
DEPENDS = "gtk+ pulseaudio"
-RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm"
+RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
inherit openmoko2 gconf
-SRC_URI += "file://htc.patch;patch=1 \
- file://ipaq.patch;patch=1"
+SRC_URI += "file://htc.patch;patch=1;maxrev=3348 \
+ file://ipaq.patch;patch=1;maxrev=3348"
EXTRA_OECONF_fic-gta01 = "--with-platform=neo1973"
EXTRA_OECONF_fic-gta02 = "--with-platform=neo1973"
diff --git a/packages/openmoko2/openmoko-browser2/.mtn2git_empty b/packages/openmoko2/openmoko-browser2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-browser2/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-browser2/fingerscroll.diff b/packages/openmoko2/openmoko-browser2/fingerscroll.diff
new file mode 100644
index 0000000000..89f79496a0
--- /dev/null
+++ b/packages/openmoko2/openmoko-browser2/fingerscroll.diff
@@ -0,0 +1,13 @@
+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_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb
index 431e40769c..b9c7efed02 100644
--- a/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/packages/openmoko2/openmoko-browser2_svn.bb
@@ -5,3 +5,7 @@ PV = "0.0.1+svnr${SRCREV}"
PR = "r1"
inherit openmoko2
+
+#SRC_URI += "file://fingerscroll.diff;patch=1"
+
+
diff --git a/packages/openmoko2/openmoko-worldclock2_svn.bb b/packages/openmoko2/openmoko-worldclock2_svn.bb
index bb849accfb..5857dde982 100644
--- a/packages/openmoko2/openmoko-worldclock2_svn.bb
+++ b/packages/openmoko2/openmoko-worldclock2_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "A World-Clock for OpenMoko"
SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 openmoko-dates2 libnotify"
+DEPENDS = "libmokoui2 libjana"
PV = "0.1.0+svnr${SRCREV}"
inherit openmoko2