| diff -ru mypaint-1.1.0-orig/desktop/mypaint.desktop mypaint-1.1.0/desktop/mypaint.desktop |
| --- mypaint-1.1.0-orig/desktop/mypaint.desktop 2012-12-31 21:03:38.000000000 +0400 |
| +++ mypaint-1.1.0/desktop/mypaint.desktop 2013-01-06 15:21:11.468785464 +0400 |
| @@ -1,6 +1,5 @@ |
| [Desktop Entry] |
| Version=1.0 |
| -Encoding=UTF-8 |
| Name=MyPaint |
| TryExec=mypaint |
| Exec=mypaint %f |
| diff -ru mypaint-1.1.0-orig/SConstruct mypaint-1.1.0/SConstruct |
| --- mypaint-1.1.0-orig/SConstruct 2012-12-31 21:03:38.000000000 +0400 |
| +++ mypaint-1.1.0/SConstruct 2013-01-06 15:20:17.640771176 +0400 |
| @@ -1,6 +1,7 @@ |
| import os, sys |
| from os.path import join, basename |
| from SCons.Script.SConscript import SConsEnvironment |
| +from SCons.Util import CLVar |
| |
| EnsureSConsVersion(1, 0) |
| |
| @@ -75,6 +76,14 @@ |
| |
| env.Append(RPATH = env.Literal(os.path.join('\\$$ORIGIN'))) |
| |
| +for key in ['CC', 'CXX']: |
| + if os.environ.has_key(key): |
| + env[key] = os.environ[key] |
| + |
| +for key in ['CFLAGS', 'CXXFLAGS']: |
| + if os.environ.has_key(key): |
| + env[key] += CLVar(os.environ[key]) |
| + |
| # remove libraries produced by earlier versions, which are actually |
| # being used if they keep lying around, leading to mysterious bugs |
| env.Execute('rm -f libmypaint-tests.so libmypaint.so libmypaintlib.so') |
