diff options
| author | Philip Balister <philip@balister.org> | 2008-11-09 17:49:58 -0700 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2008-11-09 17:49:58 -0700 |
| commit | f214c817b75a34178104af79623bb7e8fa22210d (patch) | |
| tree | 02539e5b89fff6efc46985f9a33907fedada381c /packages/gnome | |
| parent | e67cecc8dd2e8ed8289d478c3f1a72a1999f6328 (diff) | |
| parent | 0bf971196e727b52b84bf2c60d28ec7719ff23e0 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/gnome')
| -rw-r--r-- | packages/gnome/gnome-python-desktop_2.23.0.bb | 7 | ||||
| -rw-r--r-- | packages/gnome/gnome-python_2.22.1.bb | 6 | ||||
| -rw-r--r-- | packages/gnome/pyorbit_2.24.0.bb | 25 |
3 files changed, 35 insertions, 3 deletions
diff --git a/packages/gnome/gnome-python-desktop_2.23.0.bb b/packages/gnome/gnome-python-desktop_2.23.0.bb index c489da124a..140c0a8dbf 100644 --- a/packages/gnome/gnome-python-desktop_2.23.0.bb +++ b/packages/gnome/gnome-python-desktop_2.23.0.bb @@ -1,7 +1,7 @@ LICENSE = "GPL/LGPL" DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui" -PR = "r2" +PR = "r3" inherit gnome distutils-base @@ -14,7 +14,10 @@ do_configure_prepend() { } do_configure_prepend() { - sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes\":g \ + ${S}/configure.ac } AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/packages/gnome/gnome-python_2.22.1.bb b/packages/gnome/gnome-python_2.22.1.bb index 5ea7cba83a..0507cba010 100644 --- a/packages/gnome/gnome-python_2.22.1.bb +++ b/packages/gnome/gnome-python_2.22.1.bb @@ -3,15 +3,19 @@ LICENSE = "LGPL" DEPENDS = "libgnomeui pyorbit python-pygtk" RDEPENDS = "pyorbit" -PR = "r0" +PR = "r1" inherit gnome distutils-base pkgconfig FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" do_configure() { + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac export HOST_SYS=${HOST_SYS} export BUILD_SYS=${BUILD_SYS} autotools_do_configure } +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/pyorbit_2.24.0.bb b/packages/gnome/pyorbit_2.24.0.bb new file mode 100644 index 0000000000..fe6e2d1b0b --- /dev/null +++ b/packages/gnome/pyorbit_2.24.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Python Orbit bindings" +LICENSE = "LGPL" + +PR = "r0" + +inherit gnome distutils-base pkgconfig + +SRC_URI += "file://acinclude.m4" + +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" +EXTRA_OEMAKE = "-e" + +do_configure() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} + export CC=${TARGET_PREFIX}gcc + autotools_do_configure +} + +do_stage() { + install -d ${STAGING_INCDIR}/pyorbit-2 + install -m 0644 src/pyorbit.h ${STAGING_INCDIR}/pyorbit-2 + autotools_stage_all +} |