diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-12-19 11:25:31 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-12-19 11:25:31 +0000 |
| commit | 791f4e9f0b2bd1b417bc9707d9610618afd4df00 (patch) | |
| tree | b7feb2c127a298e925cbabe79f6c4896f2d0813e /graphics/mypaint | |
| parent | 666545fd4cf031a6d054b7ea698fcc48c1b5c6b9 (diff) | |
| download | pkgsrc-791f4e9f0b2bd1b417bc9707d9610618afd4df00.tar.gz | |
Fix build on SmartOS/gcc 4.7.
* Fix rpath problem, respect LDFLAGS
* Fix build with gcc 4.7
Diffstat (limited to 'graphics/mypaint')
| -rw-r--r-- | graphics/mypaint/distinfo | 5 | ||||
| -rw-r--r-- | graphics/mypaint/patches/patch-SConstruct | 25 | ||||
| -rw-r--r-- | graphics/mypaint/patches/patch-lib_colorchanger__crossed__bowl.hpp | 24 |
3 files changed, 49 insertions, 5 deletions
diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo index 1085300fb98..b3e4c691268 100644 --- a/graphics/mypaint/distinfo +++ b/graphics/mypaint/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2011/11/23 11:00:55 ryoon Exp $ +$NetBSD: distinfo,v 1.5 2012/12/19 11:25:31 ryoon Exp $ SHA1 (mypaint-1.0.0.tar.bz2) = 5f9221304bb8becd642b00d94af947edf1e18844 RMD160 (mypaint-1.0.0.tar.bz2) = 6d3ff0f5c16e18b006f6449e9591067bd29ed3c5 Size (mypaint-1.0.0.tar.bz2) = 36748957 bytes -SHA1 (patch-SConstruct) = d524789a7053976d06d3d4389869b82c456522bf +SHA1 (patch-SConstruct) = 374416991833fd3cb4f99f66cefee96e45e45161 +SHA1 (patch-lib_colorchanger__crossed__bowl.hpp) = b64b8695fe8b787df94ddc588a714b991954084b diff --git a/graphics/mypaint/patches/patch-SConstruct b/graphics/mypaint/patches/patch-SConstruct index 7b43b15265a..07f667a8a71 100644 --- a/graphics/mypaint/patches/patch-SConstruct +++ b/graphics/mypaint/patches/patch-SConstruct @@ -1,8 +1,27 @@ -$NetBSD: patch-SConstruct,v 1.1 2011/05/04 11:16:23 ryoon Exp $ +$NetBSD: patch-SConstruct,v 1.2 2012/12/19 11:25:31 ryoon Exp $ ---- SConstruct.orig 2011-03-04 14:44:59.000000000 +0000 +* Set python interpreter +* From http://dev.gentoo.org/~vapier/scons-blows.txt, to respect LDFLAGS + +--- SConstruct.orig 2011-11-22 20:27:03.000000000 +0000 +++ SConstruct -@@ -84,7 +84,7 @@ if sys.platform == "win32": +@@ -1,4 +1,5 @@ + import os, sys ++import SCons.Util + from os.path import join, basename + from SCons.Script.SConscript import SConsEnvironment + +@@ -72,6 +73,9 @@ if env['debug']: + env.Append(CPPDEFINES='HEAVY_DEBUG') + env.Append(CCFLAGS='-O0', LINKFLAGS='-O0') + ++if os.environ.has_key('LDFLAGS'): ++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) ++ + #env.Append(CCFLAGS='-fno-inline', LINKFLAGS='-fno-inline') + + Export('env', 'python') +@@ -81,7 +85,7 @@ languages = SConscript('po/SConscript') def burn_python_version(target, source, env): # make sure we run the python version that we built the extension modules for diff --git a/graphics/mypaint/patches/patch-lib_colorchanger__crossed__bowl.hpp b/graphics/mypaint/patches/patch-lib_colorchanger__crossed__bowl.hpp new file mode 100644 index 00000000000..8955748908d --- /dev/null +++ b/graphics/mypaint/patches/patch-lib_colorchanger__crossed__bowl.hpp @@ -0,0 +1,24 @@ +$NetBSD: patch-lib_colorchanger__crossed__bowl.hpp,v 1.1 2012/12/19 11:25:31 ryoon Exp $ + +* Fix build with gcc 4.7 + +--- lib/colorchanger_crossed_bowl.hpp.orig 2011-11-22 20:27:03.000000000 +0000 ++++ lib/colorchanger_crossed_bowl.hpp +@@ -79,7 +79,7 @@ public: + + int dx = x-width/2; + int dy = y-height/2; +- int diag = sqrt(2)*ccdb_size/2; ++ int diag = sqrt((double) 2)*ccdb_size/2; + + int dxs, dys; + if (dx > 0) +@@ -91,7 +91,7 @@ public: + else + dys = dy + stripe_width; + +- float r = sqrt(SQR(dxs)+SQR(dys)); ++ float r = sqrt((double) (SQR(dxs)+SQR(dys))); + + // hue + if (r < s_radius) { |