[gnome-continuous] Use the new pycairo repository
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Use the new pycairo repository
- Date: Thu, 20 Apr 2017 09:17:34 +0000 (UTC)
commit ebb8e14cb6cd3ae8e6786b0691ad5220b2a6d0ca
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Apr 20 10:15:55 2017 +0100
Use the new pycairo repository
PyCairo has Python 2 and 3 support, which means we get to build it
twice.
manifest.json | 5 ++-
patches/py2cairo-autogen.patch | 25 -----------------------
patches/py2cairo-buildsys.patch | 42 +++++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 27 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 6ada02f..889564f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1104,8 +1104,9 @@
{"src": "gnome:orca"},
- {"src": "fd:py2cairo",
- "patches": ["py2cairo-autogen.patch"]},
+ {"src": "git:https://github.com/pygobject/pycairo.git",
+ "name": "pycairo-python2",
+ "patches": ["py2cairo-buildsys.patch"]},
{"src": "gnome:pygobject",
"name": "pygobject-python2",
diff --git a/patches/py2cairo-buildsys.patch b/patches/py2cairo-buildsys.patch
new file mode 100644
index 0000000..2ac351b
--- /dev/null
+++ b/patches/py2cairo-buildsys.patch
@@ -0,0 +1,42 @@
+From 44fba8edf45b25a807dc229b57b7a26797a6148e Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Thu, 20 Apr 2017 10:14:36 +0100
+Subject: [PATCH] Implement build-api wrapper
+
+See: https://github.com/cgwalters/build-api/
+---
+ Makefile | 10 ++++++++++
+ configure | 4 ++++
+ 2 files changed, 14 insertions(+)
+ create mode 100644 Makefile
+ create mode 100755 configure
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..1463d08
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,10 @@
++# Override this so that we don't get the distutils compiler, which was
++# cross built for yocto, but we want self-hosting builds.
++CC ?= gcc
++
++all:
++ env CC=$(CC) python2 setup.py build
++
++install:
++ python2 setup.py install --root=$(DESTDIR)
++
+diff --git a/configure b/configure
+new file mode 100755
+index 0000000..04d1432
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,4 @@
++#!/bin/bash
++# http://people.gnome.org/~walters/docs/build-api.txt
++#buildapi-variable-no-builddir
++exec true
+--
+2.12.2
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]