[oe-commits] org.oe.dev merge of '5afb82396b9f0ccbe4e10d1ddc30d5b64679639d'
xora commit
openembedded-commits at lists.openembedded.org
Wed Oct 24 09:57:02 UTC 2007
merge of '5afb82396b9f0ccbe4e10d1ddc30d5b64679639d'
and 'a79d90fb0466aeb7b196175fb36831acfe94c694'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 978814b6112fa21afb021154c869d766d3db1175
ViewMTN: http://monotone.openembedded.org/revision/info/978814b6112fa21afb021154c869d766d3db1175
Files:
1
packages/openmoko2/libjana
packages/openmoko2/libjana/clockpatch.patch
packages/openmoko2/libjana_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/mdk/files/cross-compile.diff
packages/mdk/mdk2_v36.bb
packages/mdk/mdk3_v2.bb
Diffs:
#
# mt diff -r5afb82396b9f0ccbe4e10d1ddc30d5b64679639d -r978814b6112fa21afb021154c869d766d3db1175
#
#
#
# add_dir "packages/openmoko2/libjana"
#
# add_file "packages/openmoko2/libjana/clockpatch.patch"
# content [ec20e543844603240791a4425d47c46b8d39ac75]
#
# patch "packages/openmoko2/libjana_svn.bb"
# from [b12471bf13475d2be894d51e78d8c5c82369ba08]
# to [b2186d3fd749e166dc82acf1684f1bbd0dc23c2b]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [348fb600361ca189638aa5f630ea59dd39c5cb85]
# to [9b29d38583ef7d185640dabf6d55da8fb198f056]
#
============================================================
--- packages/openmoko2/libjana/clockpatch.patch ec20e543844603240791a4425d47c46b8d39ac75
+++ packages/openmoko2/libjana/clockpatch.patch ec20e543844603240791a4425d47c46b8d39ac75
@@ -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);
+ }
+
============================================================
--- packages/openmoko2/libjana_svn.bb b12471bf13475d2be894d51e78d8c5c82369ba08
+++ packages/openmoko2/libjana_svn.bb b2186d3fd749e166dc82acf1684f1bbd0dc23c2b
@@ -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 @@ PACKAGES = "libjana-ecal libjana-ecal-db
}
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-dbg = "${libdir}/.debug/li
FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
FILES_libjana = "${libdir}/libjana.so.*"
FILES_libjana-dbg = "${libdir}/.debug/libjana.so.*"
-
============================================================
--- packages/openmoko2/openmoko-session2.bb 348fb600361ca189638aa5f630ea59dd39c5cb85
+++ packages/openmoko2/openmoko-session2.bb 9b29d38583ef7d185640dabf6d55da8fb198f056
@@ -1,10 +1,10 @@ RCONFLICTS = "openmoko-session"
DESCRIPTION = "Custom Matchbox session files for OpenMoko"
LICENSE = "GPL"
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${sys
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
#
# mt diff -ra79d90fb0466aeb7b196175fb36831acfe94c694 -r978814b6112fa21afb021154c869d766d3db1175
#
#
#
# add_file "packages/mdk/files/cross-compile.diff"
# content [18df370bed405b68bbf131241c7f76f9eba019bc]
#
# add_file "packages/mdk/mdk2_v36.bb"
# content [eaeef09ad56efd72468bd93e7b83295a550dee8a]
#
# add_file "packages/mdk/mdk3_v2.bb"
# content [7580a3ad6e3ab684a89a1422706b15baaedd670e]
#
============================================================
--- packages/mdk/files/cross-compile.diff 18df370bed405b68bbf131241c7f76f9eba019bc
+++ packages/mdk/files/cross-compile.diff 18df370bed405b68bbf131241c7f76f9eba019bc
@@ -0,0 +1,14 @@
+diff -ur mdk3-v1-orig/osdep/common.mak mdk3-v1-xcompile/osdep/common.mak
+--- mdk3-v1-orig/osdep/common.mak 2007-04-23 03:25:15.000000000 -0400
++++ mdk3-v1-xcompile/osdep/common.mak 2007-05-22 14:43:51.000000000 -0400
+@@ -9,10 +9,6 @@
+ PIC = -fPIC
+ endif
+
+-CC = $(TOOL_PREFIX)gcc
+-RANLIB = $(TOOL_PREFIX)ranlib
+-AR = $(TOOL_PREFIX)ar
+-
+ REVISION = mdk3
+ REVFLAGS = -D_REVISION=$(REVISION)
+
============================================================
--- packages/mdk/mdk2_v36.bb eaeef09ad56efd72468bd93e7b83295a550dee8a
+++ packages/mdk/mdk2_v36.bb eaeef09ad56efd72468bd93e7b83295a550dee8a
@@ -0,0 +1,11 @@
+SECTION = "console/network"
+DESCRIPTION = "Proof of concept 802.11 attack tool"
+HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/mdk2-${PV}.tar.bz2"
+
+do_install() {
+ install -d ${D}/${sbindir}
+ install -m 0755 mdk2 ${D}/${sbindir}
+}
============================================================
--- packages/mdk/mdk3_v2.bb 7580a3ad6e3ab684a89a1422706b15baaedd670e
+++ packages/mdk/mdk3_v2.bb 7580a3ad6e3ab684a89a1422706b15baaedd670e
@@ -0,0 +1,12 @@
+SECTION = "console/network"
+DESCRIPTION = "Proof of concept 802.11 attack tool"
+HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://www.tu-darmstadt.de/~p_larbig/wlan/mdk3-${PV}.tar.bz2 \
+ file://cross-compile.diff;patch=1"
+
+do_install() {
+ install -d ${D}/${sbindir}
+ install -m 0755 mdk3 ${D}/${sbindir}
+}
More information about the Openembedded-commits
mailing list