Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

8 files changed, 72 insertions, 6 deletions

diff --git a/packages/connman/connman-gnome_0.4.bb b/packages/connman/connman-gnome_0.4.bb
index 0def898f0f..f42cfdcfc2 100644
--- a/packages/connman/connman-gnome_0.4.bb
+++ b/packages/connman/connman-gnome_0.4.bb
@@ -3,11 +3,12 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 SECTION = "libs/network"
 LICENSE = "GPL"
 DEPENDS = "gtk+ dbus"
-PR = "r4"
+PR = "r5"
 
 RRECOMMENDS_${PN} = "connman"
 
-SRC_URI = "ftp://ftp.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz \
+SRC_URI = "http://repo.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz \
+           file://phrase-lenght.diff;patch=1 \
            file://connman-applet.desktop"
 
 inherit autotools gtk-icon-cache
diff --git a/packages/connman/connman_0.10.bb b/packages/connman/connman_0.10.bb
index a20bf24ea5..d8f763a5cd 100644
--- a/packages/connman/connman_0.10.bb
+++ b/packages/connman/connman_0.10.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF += "\
 "
 
 SRC_URI  = "\
-  http://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
+  http://repo.moblin.org/connman/releases/connman-${PV}.tar.gz \
   file://connman \
 "
 
diff --git a/packages/connman/files/phrase-lenght.diff b/packages/connman/files/phrase-lenght.diff
new file mode 100644
index 0000000000..383c86cd3a
--- /dev/null
+++ b/packages/connman/files/phrase-lenght.diff
@@ -0,0 +1,23 @@
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Fri, 30 Jan 2009 14:34:05 +0000 (+0100)
+Subject: Don't limit input field length for passphrases
+X-Git-Url: http://git.moblin.org/cgi-bin/gitweb/gitweb.cgi?p=projects%2Fconnman-gnome.git;a=commitdiff_plain;h=faa1dee0cea9bdf47d91f5665880dab335dd94b4
+
+Don't limit input field length for passphrases
+---
+
+diff --git a/applet/main.c b/applet/main.c
+index cf12a34..434e7c8 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -151,8 +151,8 @@ static void passphrase_dialog(const char *path, const char *name)
+ 				GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ 
+ 	entry = gtk_entry_new();
+-	gtk_entry_set_max_length(GTK_ENTRY(entry), 16);
+-	gtk_entry_set_width_chars(GTK_ENTRY(entry), 16);
++	gtk_entry_set_max_length(GTK_ENTRY(entry), 120);
++	gtk_entry_set_width_chars(GTK_ENTRY(entry), 20);
+ 	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+ 	gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+ 	gtk_container_add(GTK_CONTAINER(vbox), entry);
diff --git a/packages/python/divmod.inc b/packages/python/divmod.inc
new file mode 100644
index 0000000000..20be1b2e38
--- /dev/null
+++ b/packages/python/divmod.inc
@@ -0,0 +1,17 @@
+SRC_URI = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/${REALPN}-${PV}.tar.gz?format=raw"
+
+DEPENDS += "python-twisted-native"
+
+do_unpack2() {
+	cd ${WORKDIR}
+	tar zxvf ${REALPN}-${PV}.tar.gz?format=raw
+}
+
+addtask unpack2 after do_unpack before do_configure
+
+inherit distutils
+
+S = "${WORKDIR}/${REALPN}-${PV}"
+
+
+
diff --git a/packages/python/python-coherence_svn.bb b/packages/python/python-coherence_svn.bb
index c123bcfcbf..15c0b4f14f 100644
--- a/packages/python/python-coherence_svn.bb
+++ b/packages/python/python-coherence_svn.bb
@@ -3,9 +3,8 @@ SECTION = "python/devel"
 LICENSE = "MIT"
 HOMEPAGE = "http://coherence.beebits.net/wiki"
 
-PR = "r0"
+PR = "r3"
 PV = "0.6.0+svnr${SRCREV}"
-DEFAULT_PREFERENCE = "-1"
 
 inherit setuptools
 
@@ -13,6 +12,8 @@ SRC_URI = "svn://coherence.beebits.net/svn/trunk;module=Coherence;proto=https"
 S = "${WORKDIR}/Coherence"
 
 FILES_${PN} += "${datadir}"
-RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules"
+RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \
+	python-configobj python-twisted python-twisted-core python-misc python-zopeinterface \
+	zope python-modules"
 
 
diff --git a/packages/python/python-divmodepsilon_0.5.11.bb b/packages/python/python-divmodepsilon_0.5.11.bb
new file mode 100644
index 0000000000..5184b69252
--- /dev/null
+++ b/packages/python/python-divmodepsilon_0.5.11.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "A small utility package that depends on tools too recent for Twisted "
+LICENSE = "MIT"
+
+REALPN = "Epsilon"
+
+require divmod.inc
+
diff --git a/packages/python/python-nevow_0.9.32.bb b/packages/python/python-nevow_0.9.32.bb
new file mode 100644
index 0000000000..155157c517
--- /dev/null
+++ b/packages/python/python-nevow_0.9.32.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Nevow is a web application construction kit written in Python"
+LICENSE = "MIT"
+
+REALPN = "Nevow"
+
+require divmod.inc
+
+FILES_${PN} += "${datadir}"
+DEPENDS += "python-twisted-native"
+
diff --git a/packages/python/python-twisted-native_8.2.0.bb b/packages/python/python-twisted-native_8.2.0.bb
new file mode 100644
index 0000000000..063f0fdb13
--- /dev/null
+++ b/packages/python/python-twisted-native_8.2.0.bb
@@ -0,0 +1,7 @@
+require python-twisted_${PV}.bb
+
+inherit native
+
+do_stage() {
+	distutils_stage_all
+}