diff options
48 files changed, 83 insertions, 49 deletions
diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index 872dd4915c..ef734e4311 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -29,5 +29,5 @@ S = "${WORKDIR}/${PN}" FILES_${PN} += "${datadir}/icons" -# SVNREV = "r${SRCREV}" -SVNREV = "${SRCDATE}" +SVNREV = "r${SRCREV}" +#SVNREV = "${SRCDATE}" diff --git a/conf/sanity.conf b/conf/sanity.conf index 163b63195e..fe1e2282e4 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.8.5" +BB_MIN_VERSION = "1.8.8" INHERIT += "sanity" diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb index 6f2e050569..9be5b92979 100644 --- a/packages/dfu-util/dfu-util_svn.bb +++ b/packages/dfu-util/dfu-util_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" SECTION = "devel" AUTHOR = "Harald Welte" LICENSE = "GPL" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" DEPENDS = "libusb" diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb index e27b2fbe6c..7426dfe853 100644 --- a/packages/ezx/opentapi_svn.bb +++ b/packages/ezx/opentapi_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" SECTION = "devel" AUTHOR = "Daniel Willmann" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r3" SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \ diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index e40d151acb..c84a8a2121 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -1,8 +1,8 @@ require gnuradio.inc -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "1" -PV = "3.0.4+svn${SRCDATE}" +PV = "3.0.4+svnr${SRCREV}" PR = "r2" SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 5862ea6d48..914520ad8a 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.openmoko.org" LICENSE = "GPL LGPL" SECTION = "libs/gsm" PROVIDES += "gsmd" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r22" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ diff --git a/packages/gtk-webcore/osb-browser_svn.bb b/packages/gtk-webcore/osb-browser_svn.bb index cbeebbcdc3..912215cfbd 100644 --- a/packages/gtk-webcore/osb-browser_svn.bb +++ b/packages/gtk-webcore/osb-browser_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" -PV = "0.5.0+svn${SRCDATE}" +PV = "0.5.0+svnr${SRCREV}" PR = "r0" inherit autotools diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb index 51597b0908..a504be42fa 100644 --- a/packages/gtk-webcore/osb-jscore_svn.bb +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" DEFAULT_PREFERENCE = "-1" -PV = "0.5.2+svn${SRCDATE}" +PV = "0.5.2+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index 78f3af7b6f..2cab1101ca 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -4,7 +4,7 @@ LICENSE = "nokia" PRIORITY = "optional" SECTION = "gpe" -PV = "0.5.2+svn${SRCDATE}" +PV = "0.5.2+svnr${SRCREV}" PR = "r0" DEPENDS = "curl librsvg osb-nrcore pango" diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index b9af57ad52..402638d28e 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -2,7 +2,7 @@ require osb-nrcore.inc DEFAULT_PREFERENCE = "-1" -PV = "0.5.2+svn${SRCDATE}" +PV = "0.5.2+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ diff --git a/packages/images/angstrom-minimal-image-with-mtd-utils.bb b/packages/images/angstrom-minimal-image-with-mtd-utils.bb index 635833af4e..740c39126c 100644 --- a/packages/images/angstrom-minimal-image-with-mtd-utils.bb +++ b/packages/images/angstrom-minimal-image-with-mtd-utils.bb @@ -5,3 +5,5 @@ require angstrom-minimal-image.bb RDEPENDS += "mtd-utils" +export IMAGE_BASENAME = "minimalist-image-mtdutils" + diff --git a/packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty b/packages/maemo3/hildon-1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty +++ b/packages/maemo3/hildon-1/.mtn2git_empty diff --git a/packages/maemo3/hildon-1/buttonbox.patch b/packages/maemo3/hildon-1/buttonbox.patch new file mode 100644 index 0000000000..cfea60d000 --- /dev/null +++ b/packages/maemo3/hildon-1/buttonbox.patch @@ -0,0 +1,11 @@ +--- /tmp/hildon-code-dialog.c 2007-08-07 11:46:03.000000000 +0200 ++++ hildon-1/src/hildon-code-dialog.c 2007-08-07 11:46:16.468400000 +0200 +@@ -277,7 +277,7 @@ + gtk_container_add (GTK_CONTAINER (priv->buttons[3][2]), image1); + dialog_action_area1 = GTK_DIALOG (dialog)->action_area; + gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), +- GTK_BUTTONBOX_CENTER); ++ GTK_BUTTONBOX_DEFAULT); + + okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK, + GTK_RESPONSE_OK); diff --git a/packages/maemo3/hildon-1_svn.bb b/packages/maemo3/hildon-1_svn.bb new file mode 100644 index 0000000000..c5c01792ca --- /dev/null +++ b/packages/maemo3/hildon-1_svn.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Hildon widget library" +LICENSE = "LGPL" + +DEPENDS = "gconf-dbus esound gtk+" + +PV = "1.0.12+svnr${SRCREV}" + +SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \ + file://buttonbox.patch;patch=1 " +S = "${WORKDIR}/hildon-1" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "--with-maemo-gtk=no" + + +do_stage() { + autotools_stage_all +} + diff --git a/packages/maemo3/libosso_1.20.bb b/packages/maemo3/libosso_1.20.bb index 13daf0b10c..d5489c7e95 100644 --- a/packages/maemo3/libosso_1.20.bb +++ b/packages/maemo3/libosso_1.20.bb @@ -1,10 +1,13 @@ LICENSE = "LGPL" +DESCRIPTION = "Nokia osso library" -DEPENDS = "dbus-glib glib-2.0 outo" +DEPENDS = "hildon-1 dbus-glib glib-2.0 outo" + +PR = "r1" SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz" -inherit autotools pkgconfig +inherit autotools pkgconfig lib_package do_configure_prepend() { diff --git a/packages/mono/mono-1.2.5/.mtn2git_empty b/packages/mono/mono-1.2.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mono/mono-1.2.5/.mtn2git_empty diff --git a/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch b/packages/mono/mono-1.2.5/configure.patch index 1553115c0e..1553115c0e 100644 --- a/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch +++ b/packages/mono/mono-1.2.5/configure.patch diff --git a/packages/mono/mono-native_1.2.5pre5.bb b/packages/mono/mono-native_1.2.5.bb index 4664cf8310..0f1391cd25 100644 --- a/packages/mono/mono-native_1.2.5pre5.bb +++ b/packages/mono/mono-native_1.2.5.bb @@ -1,4 +1,4 @@ -require mono_1.2.5pre5.inc +require mono_1.2.5.inc PR = "r2" DEPENDS = "glib-2.0-native" diff --git a/packages/mono/mono_1.2.5pre5.bb b/packages/mono/mono_1.2.5.bb index 3ba24e9a5a..c0a4cfb223 100644 --- a/packages/mono/mono_1.2.5pre5.bb +++ b/packages/mono/mono_1.2.5.bb @@ -1,4 +1,4 @@ -require mono_1.2.5pre5.inc +require mono_1.2.5.inc #DEPENDS = "mono-native glib-2.0" # for now, we skip the mono-native build -- just install @@ -8,7 +8,7 @@ require mono_1.2.5pre5.inc # installed DEPENDS = "glib-2.0" -PR = "r3" +PR = "r0" SRC_URI += "file://configure.patch;patch=1" diff --git a/packages/mono/mono_1.2.5pre5.inc b/packages/mono/mono_1.2.5.inc index 802e64156a..0e0df1caf2 100644 --- a/packages/mono/mono_1.2.5pre5.inc +++ b/packages/mono/mono_1.2.5.inc @@ -2,12 +2,10 @@ DESCRIPTION = "Mono Programming Language" SECTION = "devel/mono" LICENSE = "GPL LGPL X11" -PV = "1.2.4+1.2.5pre5" - # the md5 sum check is required because Novell does not version their pre release versions of mono # if the md5sum check fails, contact cbrake on #oe # checksums are stored in conf/checksums.ini -SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.5.tar.bz2" +SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.5.tar.bz2" S = "${WORKDIR}/mono-1.2.5" diff --git a/packages/openmoko-apps/openmoko-appmanager_svn.bb b/packages/openmoko-apps/openmoko-appmanager_svn.bb index d7a708b85c..a38341016b 100644 --- a/packages/openmoko-apps/openmoko-appmanager_svn.bb +++ b/packages/openmoko-apps/openmoko-appmanager_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Application Manager" SECTION = "openmoko/applications" DEPENDS += "ipkg" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-calculator_svn.bb b/packages/openmoko-apps/openmoko-calculator_svn.bb index 19f3ed9e45..4650af0da0 100644 --- a/packages/openmoko-apps/openmoko-calculator_svn.bb +++ b/packages/openmoko-apps/openmoko-calculator_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The OpenMoko Calculator Application" SECTION = "openmoko/applications" AUTHOR = "Rodolphe Ortalo <rodolphe.ortalo@free.fr>" -PV = "0.0.3+svn${SRCDATE}" +PV = "0.0.3+svnr${SRCREV}" PR = "r0" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-dialer_svn.bb b/packages/openmoko-apps/openmoko-dialer_svn.bb index 75abce2274..04baaba393 100644 --- a/packages/openmoko-apps/openmoko-dialer_svn.bb +++ b/packages/openmoko-apps/openmoko-dialer_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-footer_svn.bb b/packages/openmoko-apps/openmoko-footer_svn.bb index fed6f99455..c606bb6be8 100644 --- a/packages/openmoko-apps/openmoko-footer_svn.bb +++ b/packages/openmoko-apps/openmoko-footer_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Footer" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index 948560bd52..729cd4df80 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Messaging Application" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r2" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb index 0d1456541d..2378c8ce44 100644 --- a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb +++ b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Media Player" SECTION = "openmoko/applications" DEPENDS += "alsa-lib dbus-glib id3lib libvorbis" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r1" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-taskmanager_svn.bb b/packages/openmoko-apps/openmoko-taskmanager_svn.bb index 5f313f170e..f81bae1c88 100644 --- a/packages/openmoko-apps/openmoko-taskmanager_svn.bb +++ b/packages/openmoko-apps/openmoko-taskmanager_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Task Manager" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-base/openmoko-common_svn.bb b/packages/openmoko-base/openmoko-common_svn.bb index e72d325bb9..8dc1cae549 100644 --- a/packages/openmoko-base/openmoko-common_svn.bb +++ b/packages/openmoko-base/openmoko-common_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Common files for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r1" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb index a7f62b31c0..e98d0076c8 100644 --- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r1" inherit openmoko-base autotools diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index a7b5387a99..d3dbeb0e1f 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based app SECTION = "openmoko/libs" LICENSE = "LGPL" DEPENDS += "gtk+ eds-dbus libgsmd libxosd" -PV = "0.4+svn${SRCDATE}" +PV = "0.4+svnr${SRCREV}" PR = "r0" inherit openmoko diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 7acc8fae1c..128473eae3 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb index 39b1e8d143..f521fe1de6 100644 --- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard sound theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" inherit openmoko-base autotools diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb index 44c296f258..0c2c8da9a8 100644 --- a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r0" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb index 8bf59ac707..542e80fc7e 100644 --- a/packages/openmoko-base/openmoko-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r5" inherit openmoko-base diff --git a/packages/openmoko-examples/openmoko-finger-demo_svn.bb b/packages/openmoko-examples/openmoko-finger-demo_svn.bb index e54f8c06bc..7d0af4c04f 100644 --- a/packages/openmoko-examples/openmoko-finger-demo_svn.bb +++ b/packages/openmoko-examples/openmoko-finger-demo_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An example finger application for OpenMoko" SECTION = "openmoko/examples" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb index 9f80fbf7dc..0df3a1968a 100644 --- a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb +++ b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A simple example panel plugin for OpenMoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r1" diff --git a/packages/openmoko-examples/openmoko-panel-demo_svn.bb b/packages/openmoko-examples/openmoko-panel-demo_svn.bb index 6121bcccbc..5c346f8bb9 100644 --- a/packages/openmoko-examples/openmoko-panel-demo_svn.bb +++ b/packages/openmoko-examples/openmoko-panel-demo_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An example panel plugin for OpenMoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb index 1ba2f95072..8701cc18e8 100644 --- a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb +++ b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A simple stylus application example for OpenMoko" SECTION = "openmoko/examples" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb index a0ec4721c2..6ba32215a5 100644 --- a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb +++ b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An example stylus application for OpenMoko" SECTION = "openmoko/examples" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb index 58f25ab0b6..2231e22db1 100644 --- a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb +++ b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" SECTION = "openmoko/inputmethods" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r1" inherit openmoko autotools pkgconfig gettext diff --git a/packages/openmoko-pim/openmoko-contacts_svn.bb b/packages/openmoko-pim/openmoko-contacts_svn.bb index 0ee27ef73c..bdcbeaf519 100644 --- a/packages/openmoko-pim/openmoko-contacts_svn.bb +++ b/packages/openmoko-pim/openmoko-contacts_svn.bb @@ -4,7 +4,7 @@ SECTION = "openmoko/pim" DEPENDS += "glib-2.0 gtk+ libglade eds-dbus gnome-vfs openmoko-libs" RDEPENDS = "gnome-vfs-plugin-file libedata-book" RRECOMMENDS = "gnome-vfs-plugin-http" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r3" inherit openmoko diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index 5d52871ecd..7bfd42c3b6 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r9" inherit gnome autotools pkgconfig gtk-icon-cache diff --git a/packages/openmoko-pim/openmoko-tasks_svn.bb b/packages/openmoko-pim/openmoko-tasks_svn.bb index b3c627e621..ca2385ff78 100644 --- a/packages/openmoko-pim/openmoko-tasks_svn.bb +++ b/packages/openmoko-pim/openmoko-tasks_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" inherit gnome autotools pkgconfig gtk-icon-cache diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb index da5a961671..4e2b2ef374 100644 --- a/packages/openmoko-pim/openmoko-today_svn.bb +++ b/packages/openmoko-pim/openmoko-today_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko Today application." SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "openmoko-libs eds-dbus startup-notification" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" inherit autotools pkgconfig gtk-icon-cache openmoko diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 509caeab64..b35e71374d 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.scummvm.org" SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r2" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index f75cf3d450..f3e3ee8456 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 = "r7" +PR = "r8" inherit task @@ -21,7 +21,6 @@ RDEPENDS_task-openmoko-feed = "\ python-pygtk \ python-pyserial \ ruby \ - scummvm \ timezones \ tor \ vnc \ diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 8607c571b2..d19c986a7d 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PV = "${UCLIBC_BASE}+svn${SRCDATE}" +PV = "${UCLIBC_BASE}+svnr${SRCREV}" PR = "r5" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 112c45c1e3..7ec07c3816 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,7 +1,8 @@ DEPENDS = "flex-native gperf-native gperf perl-native curl icu libxml2 sqlite3 cairo libxslt libidn gnutls gtk+" +SRCREV_FORMAT = "webcore-rwebkit" # Yes, this is wrong... -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r1" inherit qmake2 pkgconfig |