[gimp-macos-build] Disable itstool workaround
- From: Alex Samorukov <asamorukov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-macos-build] Disable itstool workaround
- Date: Sat, 26 Oct 2019 22:42:15 +0000 (UTC)
commit 493e70b84ee760e08e8d500f5411ea2d62280cdd
Author: Oleksii Samorukov <oleksii_samorukov mckinsey com>
Date: Sun Oct 27 00:42:09 2019 +0200
Disable itstool workaround
.circleci/config.yml | 16 ++++++++--------
jhbuildrc-gtk-osx-gimp | 4 ----
2 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc12ca8..afa46b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,12 +20,12 @@ jobs:
hdiutil mount gfortran-8.2-Mojave.dmg
sudo installer -pkg /Volumes/gfortran-8.2-Mojave/gfortran-8.2-Mojave/gfortran.pkg -target /
hdiutil unmount /Volumes/gfortran-8.2-Mojave
-# - run:
-# name: Setup Python3
-# command: |
-# cd ~/
-# curl -L 'https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg' >
python-3.6.8-macosx10.9.pkg
-# sudo installer -pkg python-3.6.8-macosx10.9.pkg -target /
+ - run:
+ name: Setup Python3
+ command: |
+ cd ~/
+ curl -L 'https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg' >
python-3.6.8-macosx10.9.pkg
+ sudo installer -pkg python-3.6.8-macosx10.9.pkg -target /
- run:
name: Setup 10.9 SDK
command: |
@@ -35,7 +35,7 @@ jobs:
echo 'export MACOSX_DEPLOYMENT_TARGET=10.9' >> ~/.profile
- restore_cache:
keys:
- - jhbuild-v7
+ - jhbuild-v8
- run:
name: Setup jhbuild
command: |
@@ -54,7 +54,7 @@ jobs:
- ~/.new_local
- ~/gtk
- ~/.config
- key: jhbuild-v7
+ key: jhbuild-v8
- run:
name: Setup gtk-mac-bundler
command: |
diff --git a/jhbuildrc-gtk-osx-gimp b/jhbuildrc-gtk-osx-gimp
index 2f80e02..a936c64 100644
--- a/jhbuildrc-gtk-osx-gimp
+++ b/jhbuildrc-gtk-osx-gimp
@@ -157,10 +157,6 @@ environ_prepend('OBJCFLAGS', "-O3")
# use our modulset
moduleset = 'https://gitlab.gnome.org/samm-git/gtk-osx/raw/fork-test/modulesets-stable/gtk-osx.modules'
-# Fix Python detection
-module_extra_env['itstool'] = { "PYTHON": os.path.expanduser("~/gtk/inst/bin/python") }
-
-
# And more...
class _cmd_bootstrap_gtk_osx_gimp(jhbuild.commands.base.cmd_build):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]