diff options
| author | Adam Vandenberg | 2013-06-18 15:41:20 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2013-06-18 15:41:20 -0700 |
| commit | 66361fd6ba4625c63e50531da3e7ba677454fe84 (patch) | |
| tree | dc73f317eb60836afa87cef4d90996cfc269f508 | |
| parent | cd46745ede4e1bc20d35942b441ddecb2a71a892 (diff) | |
| download | homebrew-66361fd6ba4625c63e50531da3e7ba677454fe84.tar.bz2 | |
yarp: fix build against gtkmm
Closes #19599.
| -rw-r--r-- | Library/Formula/yarp.rb | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/Library/Formula/yarp.rb b/Library/Formula/yarp.rb index 4510f4fbf..359f2093e 100644 --- a/Library/Formula/yarp.rb +++ b/Library/Formula/yarp.rb @@ -19,6 +19,12 @@ class Yarp < Formula depends_on 'jpeg' depends_on :x11 + # Fix bad includes with gtkmm-2.24.3 + # Check if this is still needed with new versions of yarp and gtkmm + def patches + DATA + end + def install args = std_cmake_args + %W[ -DCREATE_LIB_MATH=TRUE @@ -44,3 +50,54 @@ class Yarp < Formula system "make install" end end + +__END__ +diff --git a/extern/gtkdataboxmm/gtkdataboxmm/gtkdatabox/gtkdataboxmm/init.cc b/extern/gtkdataboxmm/gtkdataboxmm/gtkdatabox/gtkdataboxmm/init.cc +index 42270cb..e05fa62 100644 +--- a/extern/gtkdataboxmm/gtkdataboxmm/gtkdatabox/gtkdataboxmm/init.cc ++++ b/extern/gtkdataboxmm/gtkdataboxmm/gtkdatabox/gtkdataboxmm/init.cc +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include <glibmm.h> + #include <gtkmm/main.h> + #include <gtkdataboxmmconfig.h> + #include <gtkdataboxmm/wrap_init.h> +diff --git a/src/yarpmanager/gymanager/gymanager.cpp b/src/yarpmanager/gymanager/gymanager.cpp +index c7fee0b..8f68836 100644 +--- a/src/yarpmanager/gymanager/gymanager.cpp ++++ b/src/yarpmanager/gymanager/gymanager.cpp +@@ -13,6 +13,7 @@ + #endif + + #include <iostream> ++#include <glibmm.h> + #include <gtkmm/main.h> + + #include <yarp/os/Network.h> +diff --git a/src/yarpscope/src/main.cpp b/src/yarpscope/src/main.cpp +index 1073ca0..6afd0e2 100644 +--- a/src/yarpscope/src/main.cpp ++++ b/src/yarpscope/src/main.cpp +@@ -11,6 +11,7 @@ + #include <yarp/os/ResourceFinder.h> + #include <yarp/os/Network.h> + ++#include <glibmm.h> + #include <gtkmm/main.h> + + //#include <glibmm/i18n.h> +diff --git a/src/yarpscope/src/Graph.cpp b/src/yarpscope/src/Graph.cpp +index b825c40..8d3dec3 100644 +--- a/src/yarpscope/src/Graph.cpp ++++ b/src/yarpscope/src/Graph.cpp +@@ -10,6 +10,8 @@ + #include "Debug.h" + #include "PortReader.h" + ++#include <glibmm.h> ++ + #include <gtkdataboxmm/lines.h> + #include <gtkdataboxmm/bars.h> + #include <gtkdataboxmm/points.h> |
