diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2017-12-07 08:33:08 +0100 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2017-12-07 08:33:08 +0100 |
| commit | f49c186f4f4e7e6be4894518d80b1601adceb2e6 (patch) | |
| tree | a13ac81c5c4e576653f9780564a6fb213f3127d4 | |
| parent | 05b10ce967c4755c77640746bc9fe8b5ac815329 (diff) | |
| download | spack-f49c186f4f4e7e6be4894518d80b1601adceb2e6.tar.gz spack-f49c186f4f4e7e6be4894518d80b1601adceb2e6.tar.bz2 spack-f49c186f4f4e7e6be4894518d80b1601adceb2e6.tar.xz spack-f49c186f4f4e7e6be4894518d80b1601adceb2e6.zip | |
wxWidgets: Fix builds (#6560)
- depends on GTK+ with X enabled
(btw, non-X backends are deprecated/removed in GTK+)
- patch for 3.0.1-3.0.2: missing include caused multiple
`error: call of overloaded ‘abs(XYPOSITION)’ is ambiguous`
(seen in GCC 6.3.0); fixed in 3.0.3+
| -rw-r--r-- | var/spack/repos/builtin/packages/wx/math_include.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/wx/package.py | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/wx/math_include.patch b/var/spack/repos/builtin/packages/wx/math_include.patch new file mode 100644 index 0000000000..152f095d18 --- /dev/null +++ b/var/spack/repos/builtin/packages/wx/math_include.patch @@ -0,0 +1,12 @@ +diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx +index cd72953ae7..8c19154313 100644 +--- a/src/stc/scintilla/src/Editor.cxx ++++ b/src/stc/scintilla/src/Editor.cxx +@@ -10,6 +10,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <assert.h> ++#include <math.h> + + #include <string> + #include <vector> diff --git a/var/spack/repos/builtin/packages/wx/package.py b/var/spack/repos/builtin/packages/wx/package.py index 082e608bfc..4aa1e2f16a 100644 --- a/var/spack/repos/builtin/packages/wx/package.py +++ b/var/spack/repos/builtin/packages/wx/package.py @@ -44,8 +44,10 @@ class Wx(AutotoolsPackage): version('develop', git='https://github.com/wxWidgets/wxWidgets.git', branch='master') + patch('math_include.patch', when='@3.0.1:3.0.2') + depends_on('pkgconfig', type='build') - depends_on('gtkplus') + depends_on('gtkplus+X') @when('@:3.0.2') def build(self, spec, prefix): |