diff options
Diffstat (limited to 'meta')
6 files changed, 74 insertions, 54 deletions
diff --git a/meta/packages/python/python-pygobject-native_2.12.3.bb b/meta/packages/python/python-pygobject-native_2.12.3.bb deleted file mode 100644 index cb879fdeb1..0000000000 --- a/meta/packages/python/python-pygobject-native_2.12.3.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require python-pygobject_${PV}.bb | ||
2 | |||
3 | DEPENDS = "python-native glib-2.0-native" | ||
4 | |||
5 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 " | ||
6 | |||
7 | inherit native | ||
diff --git a/meta/packages/python/python-pygobject-native_2.16.0.bb b/meta/packages/python/python-pygobject-native_2.16.0.bb new file mode 100644 index 0000000000..a1c733334c --- /dev/null +++ b/meta/packages/python/python-pygobject-native_2.16.0.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require python-pygobject_${PV}.bb | ||
2 | |||
3 | DEPENDS = "python-native glib-2.0-native" | ||
4 | PR = "r1" | ||
5 | |||
6 | PARALLEL_MAKE = "" | ||
7 | |||
8 | inherit native | ||
9 | |||
10 | SRC_URI = "\ | ||
11 | ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \ | ||
12 | # file://python-path.patch;patch=1 \ | ||
13 | " | ||
14 | |||
15 | do_stage_append() { | ||
16 | install -d ${STAGING_BINDIR} | ||
17 | install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants | ||
18 | } | ||
diff --git a/meta/packages/python/python-pygobject/generate-constants.patch b/meta/packages/python/python-pygobject/generate-constants.patch new file mode 100644 index 0000000000..57a9380620 --- /dev/null +++ b/meta/packages/python/python-pygobject/generate-constants.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: pygobject-2.14.2/gobject/Makefile.am | ||
2 | =================================================================== | ||
3 | --- pygobject-2.14.2.orig/gobject/Makefile.am | ||
4 | +++ pygobject-2.14.2/gobject/Makefile.am | ||
5 | @@ -21,11 +21,11 @@ if PLATFORM_WIN32 | ||
6 | common_ldflags += -no-undefined | ||
7 | endif | ||
8 | |||
9 | -constants.py: generate-constants$(EXEEXT) constants.py.in | ||
10 | +constants.py: constants.py.in | ||
11 | rm -f constants.py | ||
12 | cp $(srcdir)/constants.py.in constants.py | ||
13 | chmod 644 constants.py | ||
14 | - $(top_builddir)/gobject/generate-constants$(EXEEXT) >> constants.py | ||
15 | + gobject-generate-constants$(EXEEXT) >> constants.py | ||
16 | chmod 444 constants.py | ||
17 | |||
18 | generate_constants_CFLAGS = $(GLIB_CFLAGS) | ||
diff --git a/meta/packages/python/python-pygobject/python-path.patch b/meta/packages/python/python-pygobject/python-path.patch deleted file mode 100644 index 2ab7bdce6e..0000000000 --- a/meta/packages/python/python-pygobject/python-path.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Index: pygobject-2.12.3/m4/python.m4 | ||
2 | =================================================================== | ||
3 | --- pygobject-2.12.3.orig/m4/python.m4 2007-03-02 15:00:20.945635455 +0100 | ||
4 | +++ pygobject-2.12.3/m4/python.m4 2007-03-02 15:00:43.532189734 +0100 | ||
5 | @@ -43,12 +43,18 @@ | ||
6 | [AC_REQUIRE([AM_PATH_PYTHON]) | ||
7 | AC_MSG_CHECKING(for headers required to compile python extensions) | ||
8 | dnl deduce PYTHON_INCLUDES | ||
9 | +AC_ARG_WITH(python-includes, | ||
10 | + [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) | ||
11 | +if test x$py_exec_prefix != x; then | ||
12 | +PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
13 | +else | ||
14 | py_prefix=`$PYTHON -c "import sys; print sys.prefix"` | ||
15 | py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` | ||
16 | PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" | ||
17 | if test "$py_prefix" != "$py_exec_prefix"; then | ||
18 | PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" | ||
19 | fi | ||
20 | +fi | ||
21 | AC_SUBST(PYTHON_INCLUDES) | ||
22 | dnl check if the headers exist: | ||
23 | save_CPPFLAGS="$CPPFLAGS" | ||
diff --git a/meta/packages/python/python-pygobject_2.12.3.bb b/meta/packages/python/python-pygobject_2.12.3.bb deleted file mode 100644 index bfd04d569d..0000000000 --- a/meta/packages/python/python-pygobject_2.12.3.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | DESCRIPTION = "Python GObject bindings" | ||
2 | SECTION = "devel/python" | ||
3 | LICENSE = "LGPL" | ||
4 | DEPENDS = "python-pygobject-native" | ||
5 | PR = "r3" | ||
6 | |||
7 | SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \ | ||
8 | file://python-path.patch;patch=1" | ||
9 | S = "${WORKDIR}/pygobject-${PV}" | ||
10 | |||
11 | inherit autotools distutils-base pkgconfig | ||
12 | |||
13 | EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" | ||
14 | |||
15 | do_stage() { | ||
16 | autotools_stage_all | ||
17 | install -d ${STAGING_LIBDIR}/../share/pygobject/ | ||
18 | cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/ | ||
19 | install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ | ||
20 | cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ | ||
21 | } | ||
22 | |||
23 | FILES_${PN} = "${libdir}/python*" | ||
24 | FILES_${PN}-dev += "${datadir}/pygobject/xsl" | ||
diff --git a/meta/packages/python/python-pygobject_2.16.0.bb b/meta/packages/python/python-pygobject_2.16.0.bb new file mode 100644 index 0000000000..d7bd1c041f --- /dev/null +++ b/meta/packages/python/python-pygobject_2.16.0.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | DESCRIPTION = "Python GObject bindings" | ||
2 | SECTION = "devel/python" | ||
3 | LICENSE = "LGPL" | ||
4 | DEPENDS = "python-pygobject-native-${PV}" | ||
5 | PR = "ml2" | ||
6 | |||
7 | MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | ||
8 | |||
9 | SRC_URI = "\ | ||
10 | ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \ | ||
11 | file://generate-constants.patch;patch=1 \ | ||
12 | " | ||
13 | S = "${WORKDIR}/pygobject-${PV}" | ||
14 | |||
15 | FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files" | ||
16 | |||
17 | inherit autotools distutils-base pkgconfig | ||
18 | |||
19 | # necessary to let the call for python-config succeed | ||
20 | export BUILD_SYS | ||
21 | export HOST_SYS | ||
22 | |||
23 | do_stage() { | ||
24 | autotools_stage_all | ||
25 | install -d ${STAGING_LIBDIR}/../share/pygobject/ | ||
26 | cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/ | ||
27 | install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ | ||
28 | cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/ | ||
29 | } | ||
30 | |||
31 | PACKAGES += "${PN}-lib" | ||
32 | |||
33 | RDEPENDS_${PN} += "python-textutils" | ||
34 | |||
35 | FILES_${PN} = "${libdir}/python*" | ||
36 | FILES_${PN}-lib = "${libdir}/lib*.so.*" | ||
37 | FILES_${PN}-dev += "${bindir} ${datadir}" | ||
38 | FILES_${PN}-dbg += "${libdir}/.debug" | ||