merge of '8be6702870d00e547e81f68f3feffa5ba236e7ac'

     and 'cbec50f53eb6e573a76ee660b0607c64d3e95d99'

4 files changed, 42 insertions, 11 deletions

diff --git a/packages/openmoko2/libjana/.mtn2git_empty b/packages/openmoko2/libjana/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/libjana/.mtn2git_empty
diff --git a/packages/openmoko2/libjana/clockpatch.patch b/packages/openmoko2/libjana/clockpatch.patch
new file mode 100644
index 0000000000..7b20222239
--- /dev/null
+++ b/packages/openmoko2/libjana/clockpatch.patch
@@ -0,0 +1,31 @@
+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
index 22b592da84..ca33f08e84 100644
--- a/packages/openmoko2/libjana_svn.bb
+++ b/packages/openmoko2/libjana_svn.bb
@@ -1,14 +1,14 @@
-DESCRIPTION = "Jana Calendar lib"
-DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus" 
+DESCRIPTION = "O-Hand Jana Library"
+DEPENDS = "libmokojournal2 gtk+ eds-dbus" 
 PV = "0.1.0+svnr${SRCREV}"
+PR = "r3"
 
-inherit  autotools pkgconfig lib_package
+inherit autotools pkgconfig lib_package
 
-SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http \
+           file://clockpatch.patch;patch=1"
 S = "${WORKDIR}/jana/"
 
-EXTRA_OECONF = "--with-frontend=openmoko"
-
 do_configure_prepend() {
 	touch gtk-doc.make
 }
@@ -18,9 +18,9 @@ do_stage() {
 }
 
 PACKAGES = "libjana-ecal libjana-ecal-dbg \
-            libjana-gtk libjana-gtk-dbg \  
-	    libjana libjana-dbg libjana-dev\
-	    "
+            libjana-gtk libjana-gtk-dbg \ 
+            libjana libjana-dbg libjana-dev \
+"
 
 FILES_libjana-ecal = "${libdir}/libjana.so.*"
 FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*"
@@ -28,4 +28,3 @@ FILES_libjana-gtk = "${libdir}/libjana-gtk.so.*"
 FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
 FILES_libjana = "${libdir}/libjana.so.*"
 FILES_libjana-dbg = "${libdir}/.debug/libjana.so.*"
-
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index b769b83002..b71d35528d 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r36"
+PR = "r37"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
@@ -27,6 +27,7 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire
 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