diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 09:38:40 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 09:58:02 +0100 |
| commit | 13edf58b9e3c12cbadf6071d46b4699a9d63041a (patch) | |
| tree | 86481e31448a8b7cd2b15a3787058160f41cb856 | |
| parent | 936071a8e639208028c154b484ab5ac7d441a788 (diff) | |
libmokoui2: add patches from SHR
| -rw-r--r-- | recipes/openmoko2/libmokoui2/configure.patch | 10 | ||||
| -rw-r--r-- | recipes/openmoko2/libmokoui2/makefile.am.patch | 19 | ||||
| -rw-r--r-- | recipes/openmoko2/libmokoui2_svn.bb | 15 |
3 files changed, 41 insertions, 3 deletions
diff --git a/recipes/openmoko2/libmokoui2/configure.patch b/recipes/openmoko2/libmokoui2/configure.patch new file mode 100644 index 0000000000..174c598fe1 --- /dev/null +++ b/recipes/openmoko2/libmokoui2/configure.patch @@ -0,0 +1,10 @@ +--- libmokoui.old/configure.ac 2009-06-10 12:42:32.000000000 +0200 ++++ libmokoui2/configure.ac 2009-06-10 12:42:43.000000000 +0200 +@@ -28,7 +28,6 @@ + + if test $enable_python != no ; then + AM_PATH_PYTHON(2.3.5) +- PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.10.00) + AC_SUBST(PYGDK_CFLAGS) + AC_SUBST(PYGDK_LIBS) + diff --git a/recipes/openmoko2/libmokoui2/makefile.am.patch b/recipes/openmoko2/libmokoui2/makefile.am.patch new file mode 100644 index 0000000000..79f0a48361 --- /dev/null +++ b/recipes/openmoko2/libmokoui2/makefile.am.patch @@ -0,0 +1,19 @@ +--- libmokoui.old/bindings/python/Makefile.am 2009-06-10 12:42:32.000000000 +0200 ++++ libmokoui2/bindings/python/Makefile.am 2009-06-10 12:51:45.000000000 +0200 +@@ -1,13 +1,12 @@ +- +-PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0` +-PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION} ++PY_DEFS=${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=defsdir pygtk-2.0` ++PYTHON_INCLUDES=-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/python${PYTHON_VERSION} + + CLEANFILES = \ + mokoui.defs \ + mokoui.c + + mokoui.defs: ../../libmokoui/moko-finger-scroll.h +- python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs ++ python ${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=codegendir pygtk-2.0`/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs + + mokoui.c: mokoui.defs mokoui.override + pygtk-codegen-2.0 --prefix mokoui \ diff --git a/recipes/openmoko2/libmokoui2_svn.bb b/recipes/openmoko2/libmokoui2_svn.bb index 58f4b56f27..176f775c8b 100644 --- a/recipes/openmoko2/libmokoui2_svn.bb +++ b/recipes/openmoko2/libmokoui2_svn.bb @@ -1,12 +1,19 @@ SECTION = "openmoko/libs" -DEPENDS = "gtk+" +DEPENDS = "gtk+ python-pygtk" + PV = "0.1.0+svnr${SRCPV}" -PR = "r2" +PR = "r5" inherit openmoko2 +SRC_URI += "\ + file://configure.patch;patch=1 \ + file://makefile.am.patch;patch=1 \ + " LICENSE = "LGPL" +EXTRA_OECONF += " --enable-python" + do_configure_prepend() { touch gtk-doc.make } @@ -14,4 +21,6 @@ do_configure_prepend() { do_stage() { autotools_stage_all } - +FILES_${PN} += "${libdir}/python2.6/site-packages/mokoui.*" +FILES_${PN}-dbg += "${libdir}/python2.6/site-packages/.debug/" +FILES_${PN}-dev += "/usr/share/vala/vapi/" |