From 54f46b061b1f9748d2db8284f43856d7ad956b5b Mon Sep 17 00:00:00 2001 From: Brien Dieterle Date: Fri, 6 Jul 2018 15:53:06 -0700 Subject: [PATCH] briend git sources --- windows/msys2-build.sh | 5 +++-- windows/styrene/mypaint.cfg | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/windows/msys2-build.sh b/windows/msys2-build.sh index ada793e9a..13e1954b6 100755 --- a/windows/msys2-build.sh +++ b/windows/msys2-build.sh @@ -60,7 +60,7 @@ export MINGW_INSTALLS SRC_ROOT="${SRC_ROOT:-/tmp/src}" SRC_PROJECT="mingw" SRC_DIR="${SRC_ROOT}/${SRC_PROJECT}" -SRC_CLONEURI="https://github.com/Alexpux/MINGW-packages.git" +SRC_CLONEURI="https://github.com/briend/MINGW-packages.git" # Output location for build artefacts. OUTPUT_ROOT="${OUTPUT_ROOT:-$TOPDIR/out}" @@ -88,8 +88,8 @@ install_dependencies() { ${PKG_PREFIX}-pygobject-devel \ ${PKG_PREFIX}-python2-gobject \ ${PKG_PREFIX}-python2-numpy \ - ${PKG_PREFIX}-python2-colorspacious \ ${PKG_PREFIX}-python2-scipy \ + ${PKG_PREFIX}-python2-six \ ${PKG_PREFIX}-hicolor-icon-theme \ ${PKG_PREFIX}-librsvg \ ${PKG_PREFIX}-gobject-introspection \ @@ -313,6 +313,7 @@ case "$1" in install_dependencies update_mingw_src build_pkg "libmypaint-git" true + build_pkg "python-colour-science-git" true ;; build) build_for_testing diff --git a/windows/styrene/mypaint.cfg b/windows/styrene/mypaint.cfg index 27543d121..007aa6cde 100644 --- a/windows/styrene/mypaint.cfg +++ b/windows/styrene/mypaint.cfg @@ -2,7 +2,7 @@ [bundle] -packages = {pkg_prefix}mypaint-git {pkg_prefix}libmypaint-git {pkg_prefix}mesa {pkg_prefix}python2-colorspacious {pkg_prefix}python2-scipy +packages = {pkg_prefix}mypaint-git {pkg_prefix}libmypaint-git {pkg_prefix}mesa {pkg_prefix}python2-colour-science-git {pkg_prefix}python2-scipy {pkg_prefix}python2-six assume_installed = {pkg_prefix}python3 {pkg_prefix}tk