[oe-commits] Julien 'Ainulindale' Cassignol : libmokoui2: Enabled python bindings by default.

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 467b27af75af10398bc77be5a1bfa8946af7a85f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=467b27af75af10398bc77be5a1bfa8946af7a85f

Author: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>
Date:   Wed Jun 10 13:02:38 2009 +0200

libmokoui2: Enabled python bindings by default.
Added patch to handle proper PKG_CONFIG_SYSROOT for python bindings.
Added patch to remove unecessary gnome-python dependency in configure.ac
Thanks to Phil Blundell for the helpful piece of advice.
Signed-off-by: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>

---

 recipes/openmoko2/libmokoui2/configure.patch   |   10 ++++++++++
 recipes/openmoko2/libmokoui2/makefile.am.patch |   19 +++++++++++++++++++
 recipes/openmoko2/libmokoui2_svn.bb            |   13 ++++++++-----
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/recipes/openmoko2/libmokoui2/configure.patch b/recipes/openmoko2/libmokoui2/configure.patch
new file mode 100644
index 0000000..174c598
--- /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 0000000..79f0a48
--- /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 3830374..a4215a1 100644
--- a/recipes/openmoko2/libmokoui2_svn.bb
+++ b/recipes/openmoko2/libmokoui2_svn.bb
@@ -1,13 +1,16 @@
 SECTION = "openmoko/libs"
-DEPENDS = "gtk+"
-DEPENDS_shr += " gnome-python"
+DEPENDS = "gtk+ python-pygtk"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 inherit openmoko2
 
+SRC_URI += "\
+	file://configure.patch;patch=1 \
+	file://makefile.am.patch;patch=1 \
+	"
 LICENSE = "LGPL"
-EXTRA_OECONF_shr += " --enable-python"
+EXTRA_OECONF += " --enable-python"
 do_configure_prepend() {
         touch gtk-doc.make
 }
@@ -15,4 +18,4 @@ do_configure_prepend() {
 do_stage() {
         autotools_stage_all
 }
-
+FILES_${PN} += "${libdir}/python2.6/site-packages/mokoui.*"