From f06aa6a145a479d3ce9d5b03a218c7ffc9822c83 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:25:44 +0000 Subject: sane-srcrevs.inc : bump some openmoko stuff --- conf/distro/include/sane-srcrevs.inc | 60 ++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9d27dea55a..fc111e03fe 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -17,8 +17,8 @@ SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" -SRCREV_pn-dfu-util ?= "2866" -SRCREV_pn-dfu-util-native ?= "2866" +SRCREV_pn-dfu-util ?= "4160" +SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "127" SRCREV_pn-diversity-nav ?= "238" SRCREV_pn-eds-dbus ?= "659" @@ -43,13 +43,13 @@ SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libfakekey ?= "1455" -SRCREV_pn-libgsmd ?= "3684" +SRCREV_pn-libgsmd ?= "4216" SRCREV_pn-libgsmd-devel ?= "3293" -SRCREV_pn-libjana ?= "700" +SRCREV_pn-libjana ?= "704" SRCREV_pn-libmokogsmd2 ?= "3663" -SRCREV_pn-libmokojournal2 ?= "3217" +SRCREV_pn-libmokojournal2 ?= "3473" SRCREV_pn-libmokopanelui2 ?= "3349" -SRCREV_pn-libmokoui2 ?= "3688" +SRCREV_pn-libmokoui2 ?= "3976" SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" @@ -57,7 +57,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1039" -SRCREV_pn-linux-openmoko ?= "4102" +SRCREV_pn-linux-openmoko ?= "4194-r4165" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -66,11 +66,11 @@ SRCREV_pn-matchbox-keyboard ?= "1739" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-moko-gtk-engine ?= "3405" +SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "24587" SRCREV_pn-multitap-pad ?= "337" -SRCREV_pn-neod ?= "3421" +SRCREV_pn-neod ?= "4219" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-networkmanager ?= "2887" SRCREV_pn-networkmanager-applet ?= "200" @@ -79,39 +79,39 @@ SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" -SRCREV_pn-openmoko-appearance ?= "3239" +SRCREV_pn-openmoko-appearance ?= "3262" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" -SRCREV_pn-openmoko-browser2 ?= "3646" +SRCREV_pn-openmoko-browser2 ?= "4172" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "3655" SRCREV_pn-openmoko-common ?= "397" SRCREV_pn-openmoko-common2 ?= "3259" SRCREV_pn-openmoko-contacts ?= "2298" -SRCREV_pn-openmoko-contacts2 ?= "387" +SRCREV_pn-openmoko-contacts2 ?= "412" SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "673" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3689" +SRCREV_pn-openmoko-dialer2 ?= "4224" SRCREV_pn-openmoko-feedreader2 ?= "3645" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" -SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "4225" +SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4225" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "4173" SRCREV_pn-openmoko-messages ?= "2276" -SRCREV_pn-openmoko-messages2 ?= "3712" +SRCREV_pn-openmoko-messages2 ?= "4182" SRCREV_pn-openmoko-panel-battery ?= "3360" -SRCREV_pn-openmoko-panel-bt ?= "3149" +SRCREV_pn-openmoko-panel-bt ?= "4197" SRCREV_pn-openmoko-panel-clock ?= "2567" SRCREV_pn-openmoko-panel-demo ?= "1622" SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "2900" -SRCREV_pn-openmoko-panel-gsm ?= "3664" +SRCREV_pn-openmoko-panel-gsm ?= "4191" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-memory ?= "3903" SRCREV_pn-openmoko-panel-usb ?= "3360" @@ -124,21 +124,21 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324" SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" SRCREV_pn-openmoko-tasks ?= "320" -SRCREV_pn-openmoko-tasks2 ?= "361" -SRCREV_pn-openmoko-terminal2 ?= "3764" -SRCREV_pn-openmoko-theme-standard ?= "2370" -SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" +SRCREV_pn-openmoko-tasks2 ?= "398" +SRCREV_pn-openmoko-terminal2 ?= "4039" +SRCREV_pn-openmoko-theme-standard ?= "4167" +SRCREV_pn-openmoko-theme-standard-qvga ?= "4167" SRCREV_pn-openmoko-theme-standard2 ?= "3425" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" -SRCREV_pn-openmoko-today2 ?= "3609" -SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-today2 ?= "4168" +SRCREV_pn-openmoko-today2-folders ?= "3704" SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" -SRCREV_pn-openocd ?= "206" -SRCREV_pn-openocd-native ?= "206" -SRCREV_pn-opkg ?= "4209" -SRCREV_pn-opkg-native ?= "4209" +SRCREV_pn-openocd ?= "517" +SRCREV_pn-openocd-native ?= "517" +SRCREV_pn-opkg ?= "4210" +SRCREV_pn-opkg-native ?= "4210" SRCREV_pn-opkg-sdk ?= "4209" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" @@ -154,8 +154,8 @@ SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "4138" -SRCREV_pn-usbpath ?= "3108" -SRCREV_pn-usbpath-native ?= "3108" +SRCREV_pn-usbpath ?= "3172" +SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-webkit-gtk ?= "30762" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" -- cgit v1.2.3 From 52447b47d98e992fbce148ea3cf201338b17e164 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:28:23 +0000 Subject: edbus_cvs.bb : add a PV from OM mtn --- packages/efl1/edbus_cvs.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb index 28bcbb1816..d9c2b83b79 100644 --- a/packages/efl1/edbus_cvs.bb +++ b/packages/efl1/edbus_cvs.bb @@ -1,6 +1,7 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore" LICENSE = "MIT BSD" +PV = "0.1.0.042+cvs${SRCDATE}" PR = "r2" inherit efl_library -- cgit v1.2.3 From 819aca718d6edd471b9d98e25745908c1c652b4d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:28:55 +0000 Subject: exml_cvs.bb : add a PV from OM mtn --- packages/efl1/exml_cvs.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb index add3053a02..b94af05833 100644 --- a/packages/efl1/exml_cvs.bb +++ b/packages/efl1/exml_cvs.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Exml is a generic XML parser wrapper." LICENSE = "MIT" DEPENDS = "libxml2 libxslt ecore" +PV = "0.1.1+cvs${SRCDATE}" inherit efl_library -- cgit v1.2.3 From 39f7b8288c71823f5fada0f7c5a329700c7fc51e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:29:43 +0000 Subject: geoclue_git.bb : add staging from OM mtn --- packages/geoclue/geoclue_git.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb index bd6778213a..b4a0cbda3a 100644 --- a/packages/geoclue/geoclue_git.bb +++ b/packages/geoclue/geoclue_git.bb @@ -20,6 +20,10 @@ EXTRA_OECONF = " --enable-applet=no \ --enable-gpsd \ --enable-system-bus" +do_stage() { + autotools_stage_all +} + do_install_append() { mkdir -p ${D}/usr/share/ cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share -- cgit v1.2.3 From 3fc6802a4545035460e527a8b25f5d9c5e42c008 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:30:41 +0000 Subject: gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop : improve desktop file for gpsdrive from OM mtn --- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop index 70af29dcad..96e8155861 100644 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop @@ -1,9 +1,10 @@ [Desktop Entry] +Encoding=UTF-8 Name=GPSDrive Comment=GPS map software Exec=gpsdrive -M pda -1 +Icon=gpsicon Terminal=false Type=Application -Icon=gpsicon -Categories=Graphics;Network;Geography; -StartupNotify=false +Categories=Graphics;Network;Geography;Application;Other +StartupNotify=true -- cgit v1.2.3 From ad2d152114a6b2f831ca52d18d20263de624016d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:32:00 +0000 Subject: openmoko-minimal-image.bb : add minimal image and make neccessary changes to openmoko-image from OM mtn --- packages/images/openmoko-image.bb | 13 ++++--------- packages/images/openmoko-minimal-image.bb | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 packages/images/openmoko-minimal-image.bb diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 1e8b36318c..6600d8436c 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -2,11 +2,9 @@ # OpenMoko Image Recipe #------------------------------------------------------ -IMAGE_LINGUAS = "" +require openmoko-minimal-image.bb -IMAGE_INSTALL = "\ - ${MACHINE_TASK_PROVIDER} \ - task-openmoko-linux \ +IMAGE_INSTALL += "\ task-openmoko-net \ task-openmoko-ui \ task-openmoko-base \ @@ -15,12 +13,9 @@ IMAGE_INSTALL = "\ task-openmoko-pim \ " -DEPENDS = "\ - ${MACHINE_TASK_PROVIDER} \ +DEPENDS += "\ task-openmoko \ -" - + " inherit image -ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb new file mode 100644 index 0000000000..15506c42e3 --- /dev/null +++ b/packages/images/openmoko-minimal-image.bb @@ -0,0 +1,21 @@ +#------------------------------------------------------ +# OpenMoko Minimal Image Recipe +# other openmoko images should include this. +# ----------------------------------------------------- + +IMAGE_LINGUAS = "" + +IMAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + task-openmoko-linux \ + " + +DEPENDS = "\ + ${MACHINE_TASK_PROVIDER} \ + task-openmoko-linux \ + " + + +inherit image + +ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' -- cgit v1.2.3 From 512a25795279a4f0bf4b05586fcefc6a87f4a420 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:32:51 +0000 Subject: assassin_svn.bb : fix DEPENDS from OM mtn --- packages/openmoko-projects/assassin_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb index 83927c1d2a..987d44070d 100644 --- a/packages/openmoko-projects/assassin_svn.bb +++ b/packages/openmoko-projects/assassin_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Action GUI for Installer" HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit" +DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus" PV = "0.2+svn${SRCREV}" -PR = "r2" +PR = "r4" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" -- cgit v1.2.3 From fb1b2482105dd56bdd3c1bde74adab7c5c4a923e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:33:21 +0000 Subject: diversity-daemon_svn.bb : fix DEPENDS and RDEPENDS from OM mtn --- packages/openmoko-projects/diversity-daemon_svn.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb index 6ea4f54a92..dd582490fb 100644 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ b/packages/openmoko-projects/diversity-daemon_svn.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Diveristy Daemon" HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "net/misc" LICENSE = "GPL" -DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl" -RDEPENDS = "eds-dbus gypsy openmoko-dialer2" +DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" +RDEPENDS_${PN} = "eds-dbus openmoko-dialer2" PV = "0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https" @@ -13,7 +13,7 @@ S = "${WORKDIR}/diversity-daemon" inherit autotools pkgconfig -EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus" +EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus" FILES_${PN} += "${datadir}/dbus-1/" FILES_${PN} += "${sysconfdir}/dbus-1/" -- cgit v1.2.3 From bdca047d9d3ff254814f0d52671094173ee45b4f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:34:00 +0000 Subject: diversity-nav_svn.bb : fix DEPENDS and RDEPENDS from OM mtn --- packages/openmoko-projects/diversity-nav_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb index 58090e9baf..4e8dbdbceb 100644 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ b/packages/openmoko-projects/diversity-nav_svn.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "evas edje ecore edbus" -RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png" +RDEPENDS_${PN} = "diversity-daemon" PV = "0.0.1+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https" -- cgit v1.2.3 From 822e5e217e7907ddea83a9e99980e566147f2055 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:38:03 +0000 Subject: openmoko-session2.bb : fix RDEPENDS from OM mtn --- packages/openmoko2/openmoko-session2.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 02489f5621..f9db990e83 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Custom Matchbox session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" -RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" +RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r64" +PR = "r65" SRC_URI = "\ file://etc \ -- cgit v1.2.3 From 49c283f8e1d64bffaf6e1a44c4e034f1cc1c6de6 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:39:10 +0000 Subject: packagekit_git.bb : fix DEPENDS and REDEPENDS from OM mtn --- packages/packagekit/packagekit_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index d4055ead63..8f1644cd25 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -2,10 +2,10 @@ DESCRIPTION = "PackageKit package management abstraction" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool" -RDEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 opkg" +DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS_${PN} = "opkg" PV = "0.1+git${SRCREV}" -PR = "r7" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \ file://disable-docbook2man.patch;patch=1" @@ -25,3 +25,4 @@ do_stage () { } FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so " -- cgit v1.2.3 From 612d3778dce93f1932fbbd768989b52950b51198 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:40:13 +0000 Subject: swt3.4-gtk_3.3+3.4M3.bb : fix include path problems if JAVA_HOME is set from OM mtn --- packages/swt/files/make_linux-fix.patch | 22 ++++++++++++++++++++++ packages/swt/swt3.4-gtk_3.3+3.4M3.bb | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 packages/swt/files/make_linux-fix.patch diff --git a/packages/swt/files/make_linux-fix.patch b/packages/swt/files/make_linux-fix.patch new file mode 100644 index 0000000000..1c98f5cad2 --- /dev/null +++ b/packages/swt/files/make_linux-fix.patch @@ -0,0 +1,22 @@ +Index: swt-source/make_linux.mak +=================================================================== +--- swt-source.orig/make_linux.mak 2008-01-23 15:08:02.000000000 +0800 ++++ swt-source/make_linux.mak 2008-01-23 15:08:21.000000000 +0800 +@@ -74,8 +74,6 @@ + -Wno-non-virtual-dtor \ + -fPIC \ + -I. \ +- -I$(JAVA_HOME)/include \ +- -I$(JAVA_HOME)/include/linux \ + ${SWT_PTR_CFLAGS} + MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic + MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup +@@ -96,8 +94,6 @@ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + -DLINUX -DGTK \ +- -I$(JAVA_HOME)/include \ +- -I$(JAVA_HOME)/include/linux \ + -fPIC \ + ${SWT_PTR_CFLAGS} + LIBS = -shared -fPIC diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb index 5d411f1be6..701339d374 100644 --- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb +++ b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb @@ -1,7 +1,8 @@ require swt-gtk.inc SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \ - file://Makefile" + file://Makefile \ + file://make_linux-fix.patch;patch=1" # A number which is used by SWT to mark the shared libraries. SWTVERSION = "3416" -- cgit v1.2.3 From a9005106398b6a79899a194d17e161ea2a4f45aa Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:40:51 +0000 Subject: task-openmoko-feed.bb : add more stuff to feed from OM mtn --- packages/tasks/task-openmoko-feed.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index ee8cdf8e6b..beb72cd4b0 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r20" +PR = "r26" inherit task @@ -35,5 +35,15 @@ RDEPENDS_task-openmoko-feed = "\ vnc \ wxwidgets \ x11vnc \ + libswt3.4-gtk-java \ + cacao \ + gpsdrive \ + asterisk \ + qtopia-phone \ + gnash \ + mono \ + diversity-daemon \ + diversity-nav \ + assassin \ + tangogps \ " - -- cgit v1.2.3 From d1d22d307ab9bbd7810f0550ffeaed67ea872ae8 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:41:31 +0000 Subject: u-boot-openmoko_1.3.1+git+svn.bb : update revision --- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb index 1fb9be4f43..d8a51ea824 100644 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e" +UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8" UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5" SRCREV_FORMAT = "+gitupstream+svnpatchset" -- cgit v1.2.3 From e57deabf8300007ce2a9a8d50636e7d4bcb1e326 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:42:16 +0000 Subject: xserver-kdrive-glamo_1.3.0.0+git.bb : update revision --- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index 9f38760234..8310db18df 100644 --- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -9,9 +9,9 @@ DEPENDS += "libxkbfile libxcalibrate" RDEPENDS_${PN} = "xserver-kdrive" PROVIDES = "virtual/xserver" PE = "1" -PR = "r0" +PR = "r1" -XGLAMO_GIT_REV = "d96175a2db993ef4bc7d9d910e0b47ec7ff20561" +XGLAMO_GIT_REV = "0d2605edeb50a4b118ac00ae1f00abd085477323" SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \ file://kmode.patch;patch=1 \ -- cgit v1.2.3 From a0e2d9d479491353d0bbd7ed7a1a862bd63b3dfd Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:43:14 +0000 Subject: intltool_0.37.1.bb, intltool-native_0.37.1.bb : new versions from OM mtn --- packages/intltool/intltool-native_0.37.1.bb | 7 +++++++ packages/intltool/intltool_0.37.1.bb | 1 + 2 files changed, 8 insertions(+) create mode 100644 packages/intltool/intltool-native_0.37.1.bb create mode 100644 packages/intltool/intltool_0.37.1.bb diff --git a/packages/intltool/intltool-native_0.37.1.bb b/packages/intltool/intltool-native_0.37.1.bb new file mode 100644 index 0000000000..bac5378113 --- /dev/null +++ b/packages/intltool/intltool-native_0.37.1.bb @@ -0,0 +1,7 @@ +require intltool_${PV}.bb + +inherit native +DEPENDS = "libxml-parser-perl-native" + +export PERL = "/usr/bin/env perl" +SRC_URI_append = " file://intltool-nowarn.patch;patch=1" diff --git a/packages/intltool/intltool_0.37.1.bb b/packages/intltool/intltool_0.37.1.bb new file mode 100644 index 0000000000..e48262574b --- /dev/null +++ b/packages/intltool/intltool_0.37.1.bb @@ -0,0 +1 @@ +require intltool.inc -- cgit v1.2.3