From f49c186f4f4e7e6be4894518d80b1601adceb2e6 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 7 Dec 2017 08:33:08 +0100 Subject: wxWidgets: Fix builds (#6560) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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+ --- var/spack/repos/builtin/packages/wx/math_include.patch | 12 ++++++++++++ var/spack/repos/builtin/packages/wx/package.py | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/wx/math_include.patch (limited to 'var') 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 + #include + #include ++#include + + #include + #include 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): -- cgit v1.2.3-60-g2f50