[gnome-builder] xdg-app: use pycairo instead of py2cairo



commit 2f5ec62199c39d7eaf4d2b222d8b703a0259c822
Author: Christian Hergert <chergert redhat com>
Date:   Tue Oct 27 14:08:40 2015 -0700

    xdg-app: use pycairo instead of py2cairo
    
    py2cairo is meant for python2, and pycairo is meant for python3.

 build/xdg-app/gnome-builder.def |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/build/xdg-app/gnome-builder.def b/build/xdg-app/gnome-builder.def
index fc201aa..e8a6713 100644
--- a/build/xdg-app/gnome-builder.def
+++ b/build/xdg-app/gnome-builder.def
@@ -8,7 +8,7 @@ TALK="ca.desrt.dconf org.gnome.CodeAssist.v1.*"
 
 BRANCHES[libgit2]="v0.23.3"
 
-CACHEPOINTS="jedi py2cairo pygobject libpeas libgit2 libgit2-glib gtksourceview devhelp"
+CACHEPOINTS="jedi pycairo pygobject libpeas libgit2 libgit2-glib gtksourceview devhelp"
 
 CLEANUP_FILES="/app/bin/pygobject-codegen-2.0 /app/bin/peas-demo /app/lib/peas-demo"
 
@@ -17,6 +17,7 @@ CONFIGURE[libpeas]="--disable-documentation"
 CUSTOM_PREPARE[jedi]="PYTHONPATH=/app/lib/python3.3/site-packages python3 setup.py install --prefix=/app"
 CUSTOM_PREPARE[libgit2]="cmake -DCMAKE_INSTALL_PREFIX:PATH=/app . && make -j`nproc` && make install"
 CUSTOM_PREPARE[pip]="PYTHONPATH=/app/lib/python3.3/site-packages python3 setup.py install --prefix=/app"
+CUSTOM_PREPARE[pycairo]="PYTHON=/usr/bin/python3 python3 ./waf configure --nopyc --nopyo --prefix=/app && 
PYTHON=/usr/bin/python3 python3 ./waf build && PYTHON=/usr/bin/python3 python3 ./waf install"
 CUSTOM_PREPARE[setuptools]="mkdir -p /app/lib/python3.3/site-packages && 
PYTHONPATH=/app/lib/python3.3/site-packages python3 setup.py install --prefix=/app"
 
 FINISH_ARGS="--env=PYTHONPATH=/app/lib/python3.3/site-packages:"
@@ -24,10 +25,10 @@ FINISH_ARGS="--env=PYTHONPATH=/app/lib/python3.3/site-packages:"
 OPTS[jedi]=nohelper
 OPTS[libgit2]=nohelper
 OPTS[pip]=nohelper
-OPTS[py2cairo]=force
+OPTS[pycairo]=nohelper
 OPTS[setuptools]=nohelper
 
-MODULES="setuptools pip jedi py2cairo pygobject libpeas libssh2 libgit2 libgit2-glib gtksourceview devhelp 
gnome-builder"
+MODULES="setuptools pip jedi pycairo pygobject libpeas libssh2 libgit2 libgit2-glib gtksourceview devhelp 
gnome-builder"
 
 SOURCES[devhelp]="http://ftp.acc.umu.se/pub/GNOME/sources/devhelp/3.18/devhelp-3.18.1.tar.xz";
 SOURCES[gnome-builder]="../../../gnome-builder-3.19.0.tar.xz"
@@ -38,6 +39,6 @@ SOURCES[libgit2]="git://github.com/libgit2/libgit2"
 SOURCES[libpeas]="http://ftp.gnome.org/pub/GNOME/sources/libpeas/1.16/libpeas-1.16.0.tar.xz";
 SOURCES[libssh2]="https://github.com/libssh2/libssh2/releases/download/libssh2-1.6.0/libssh2-1.6.0.tar.gz";
 SOURCES[pip]="https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz";
-SOURCES[py2cairo]="http://cairographics.org/releases/py2cairo-1.10.0.tar.bz2";
+SOURCES[pycairo]="http://cairographics.org/releases/pycairo-1.10.0.tar.bz2";
 SOURCES[pygobject]="git://git.gnome.org/pygobject"
 SOURCES[setuptools]="https://pypi.python.org/packages/source/s/setuptools/setuptools-18.4.tar.gz";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]