python-pycairo: generate pycairo.pc ourselves (fixes QA issue)

diff --git a/packages/python/python-pycairo/.mtn2git_empty b/packages/python/python-pycairo/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/python/python-pycairo/fix-setup-py.patch b/packages/python/python-pycairo/fix-setup-py.patch
new file mode 100644 (file)
index 0000000..6165184
--- /dev/null
+++ b/packages/python/python-pycairo/fix-setup-py.patch
@@ -0,0 +1,24 @@
+diff -urN pycairo-1.4.0.orig/setup.py pycairo-1.4.0/setup.py
+--- pycairo-1.4.0.orig/setup.py        2007-03-14 10:53:30.000000000 +0100
++++ pycairo-1.4.0/setup.py     2008-09-23 18:55:25.000000000 +0200
+@@ -37,20 +37,6 @@
+     runtime_library_dirs = pkg_config_parse('--libs-only-L', 'cairo')
+ 
+ pkgconfig_file='pycairo.pc'
+-print 'creating %s' % pkgconfig_file
+-fo = open (pkgconfig_file, 'w')
+-fo.write ("""\
+-prefix=%s
+-
+-Name: Pycairo
+-Description: Python bindings for cairo
+-Version: %s
+-Requires: cairo
+-Cflags: -I${prefix}/include/pycairo
+-Libs:
+-""" % (sys.prefix, pycairo_version)
+-          )
+-fo.close()
+ 
+ cairo = dic.Extension(
+     name = 'cairo._cairo',

diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb
index 9bb2fdf..bd3c1a7 100644 (file)
--- a/packages/python/python-pycairo_1.4.0.bb
+++ b/packages/python/python-pycairo_1.4.0.bb
@@ -3,17 +3,19 @@ SECTION = "python-devel"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 DEPENDS = "cairo"
-PR = "ml1"
+PR = "ml2"
 
-SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz"
+SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
+           file://fix-setup-py.patch;patch=1"
 S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
 
+do_configure_append() {
+       sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc
+}
+
 do_stage() {
        install -d ${STAGING_INCDIR}
        install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
-
-    # nasty pkgconfig fix necessary here
-    sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc
 }