summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-26 21:40:08 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-26 21:40:08 +0000
commitfefd270da781d5d8ac82be5b80c3051e1e9155db (patch)
tree0a2c7b699225371ac049f49e80bae5626e77cb84
parent98290973671e07db54847e8be389e70f5f8e752f (diff)
parent78711962558d481026c9ea2d728a93d780bfa6bd (diff)
merge of 7da66fdac38a59d4284a8123c0234669c472a79d
and 80f57797ca269f48cd6cff1da033d972ac4f1d02
-rw-r--r--packages/meta/task-python-everything_20060425.bb (renamed from packages/meta/task-python-everything_1.0.0.bb)4
-rw-r--r--packages/python/python-egenix-mx-base_2.0.6.bb4
-rw-r--r--packages/python/python-pygtk_0.6.12.bb (renamed from packages/python/python-pygtk-0_0.6.12.bb)14
3 files changed, 11 insertions, 11 deletions
diff --git a/packages/meta/task-python-everything_1.0.0.bb b/packages/meta/task-python-everything_20060425.bb
index c98b3231f3..1095f3e941 100644
--- a/packages/meta/task-python-everything_1.0.0.bb
+++ b/packages/meta/task-python-everything_20060425.bb
@@ -4,13 +4,15 @@ HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
PR = "ml3"
+BROKEN_BECAUSE_GCC4 = "\
+ python-egenix-mx-base"
+
RDEPENDS = "\
python-ao \
python-pybluez \
python-constraint \
python-crypto \
python-dialog \
- python-egenix-mx-base \
python-pycurl \
python-fnorb \
python-fpconst \
diff --git a/packages/python/python-egenix-mx-base_2.0.6.bb b/packages/python/python-egenix-mx-base_2.0.6.bb
index 84bf7e2e3c..49a61c97b0 100644
--- a/packages/python/python-egenix-mx-base_2.0.6.bb
+++ b/packages/python/python-egenix-mx-base_2.0.6.bb
@@ -6,8 +6,10 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "EGENIX"
SRCNAME = "egenix-mx-base"
+PR = "r1"
-SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz"
+SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz \
+ file://gcc4.patch;patch=1"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
diff --git a/packages/python/python-pygtk-0_0.6.12.bb b/packages/python/python-pygtk_0.6.12.bb
index 3c9dc3a895..d01918bf05 100644
--- a/packages/python/python-pygtk-0_0.6.12.bb
+++ b/packages/python/python-pygtk_0.6.12.bb
@@ -1,15 +1,12 @@
-LICENSE = "LGPL"
DESCRIPTION = "Python GTK+ 1.2 Bindings"
+HOMEPAGE = "http://www.gtk.org"
SECTION = "devel/python"
-PRIORITY = "optional"
+LICENSE = "LGPL"
MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
-DEPENDS = "gtk+-1.2 python"
-RDEPENDS = "python-core python-shell python-re"
+DEPENDS = "gtk+-1.2"
+RDEPENDS = "python-shell python-re"
SRCNAME = "pygtk"
-PR = "r4"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/python-pygtk-${PV}"
-
+PR = "r0"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
file://remove-imlib-et-al;patch=1"
@@ -27,4 +24,3 @@ do_configure_prepend() {
do_stage() {
autotools_stage_includes
}
-