From a16fce7c7f504d139dd14c67ac6d42b82f4a168d Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 3 Jul 2013 12:16:18 -0500 Subject: [PATCH] gtkmm 2.24.4 Closes Homebrew/homebrew#20992. --- Formula/gobby.rb | 29 +------ Formula/gtkmm.rb | 4 +- Formula/inkscape.rb | 184 ------------------------------------------ Formula/libglademm.rb | 33 -------- Formula/yarp.rb | 57 ------------- 5 files changed, 3 insertions(+), 304 deletions(-) diff --git a/Formula/gobby.rb b/Formula/gobby.rb index acc7c1733a..6953ad8d3c 100644 --- a/Formula/gobby.rb +++ b/Formula/gobby.rb @@ -22,7 +22,7 @@ class Gobby < Formula def patches { :p0 => [ # Fix compilation on clang per MacPorts "https://trac.macports.org/export/101720/trunk/dports/x11/gobby/files/patch-code-util-config.hpp.diff" - ], :p1 => DATA } # Fix gtkmm issues + ]} end def install @@ -31,30 +31,3 @@ class Gobby < Formula system "make install" end end - -__END__ -diff --git a/code/util/config.hpp b/code/util/config.hpp -index 61c0cf4..7fcfe46 100644 ---- a/code/util/config.hpp -+++ b/code/util/config.hpp -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/code/util/color.hpp b/code/util/color.hpp -index 476a26c..8fad8b1 100644 ---- a/code/util/color.hpp -+++ b/code/util/color.hpp -@@ -18,7 +18,7 @@ - - #ifndef _GOBBY_COLORUTIL_HPP_ - #define _GOBBY_COLORUTIL_HPP_ -- -+#include - #include - - namespace Gobby diff --git a/Formula/gtkmm.rb b/Formula/gtkmm.rb index 67a6dd394d..b55ae0c7f4 100644 --- a/Formula/gtkmm.rb +++ b/Formula/gtkmm.rb @@ -2,8 +2,8 @@ require 'formula' class Gtkmm < Formula homepage 'http://www.gtkmm.org/' - url 'http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.3.tar.xz' - sha256 'c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39' + url 'http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.4.tar.xz' + sha256 '443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee' depends_on 'xz' => :build depends_on 'pkg-config' => :build diff --git a/Formula/inkscape.rb b/Formula/inkscape.rb index 23dee7aa46..81d6a7e5c9 100644 --- a/Formula/inkscape.rb +++ b/Formula/inkscape.rb @@ -5,8 +5,6 @@ class Inkscape < Formula url 'http://downloads.sourceforge.net/project/inkscape/inkscape/0.48.4/inkscape-0.48.4.tar.gz' sha1 'ce453cc9aff56c81d3b716020cd8cc7fa1531da0' - option 'with-poppler' - depends_on 'pkg-config' => :build depends_on 'intltool' => :build depends_on 'boost-build' => :build @@ -25,10 +23,6 @@ class Inkscape < Formula fails_with :clang - # Fix bad includes with gtkmm-2.24.3 - # Check if this is still needed with new versions of inkscape and gtkmm - def patches; DATA end - def install args = [ "--disable-dependency-tracking", "--prefix=#{prefix}", @@ -43,181 +37,3 @@ class Inkscape < Formula system "#{bin}/inkscape", "-V" end end - -__END__ -diff -ru inkscape-0.48.4/src/application/application.cpp inkscape-FToU/inkscape-0.48.4/src/application/application.cpp ---- inkscape-0.48.4/src/application/application.cpp 2011-07-08 14:25:09.000000000 -0400 -+++ inkscape-FToU/inkscape-0.48.4/src/application/application.cpp 2013-05-02 15:39:57.000000000 -0400 -@@ -14,6 +14,7 @@ - # include - #endif - -+#include - #include - - #include "preferences.h" -diff -ru inkscape-0.48.4/src/color-profile.cpp inkscape-FToU/inkscape-0.48.4/src/color-profile.cpp ---- inkscape-0.48.4/src/color-profile.cpp 2012-02-18 20:41:36.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/color-profile.cpp 2013-05-02 13:55:48.000000000 -0400 -@@ -6,6 +6,7 @@ - - #include - #include -+#include - #include - #include - -diff -ru inkscape-0.48.4/src/device-manager.cpp inkscape-FToU/inkscape-0.48.4/src/device-manager.cpp ---- inkscape-0.48.4/src/device-manager.cpp 2011-07-08 14:25:09.000000000 -0400 -+++ inkscape-FToU/inkscape-0.48.4/src/device-manager.cpp 2013-05-02 13:56:15.000000000 -0400 -@@ -8,6 +8,7 @@ - */ - - #include -+#include - #include - #include - #include -diff -ru inkscape-0.48.4/src/dropper-context.cpp inkscape-FToU/inkscape-0.48.4/src/dropper-context.cpp ---- inkscape-0.48.4/src/dropper-context.cpp 2012-12-13 12:00:46.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/dropper-context.cpp 2013-05-02 13:57:05.000000000 -0400 -@@ -16,6 +16,7 @@ - # include - #endif - -+#include - #include - #include - #include -diff -ru inkscape-0.48.4/src/extension/implementation/implementation.h inkscape-FToU/inkscape-0.48.4/src/extension/implementation/implementation.h ---- inkscape-0.48.4/src/extension/implementation/implementation.h 2011-07-08 14:25:09.000000000 -0400 -+++ inkscape-FToU/inkscape-0.48.4/src/extension/implementation/implementation.h 2013-05-02 15:48:27.000000000 -0400 -@@ -12,6 +12,7 @@ - #ifndef __INKSCAPE_EXTENSION_IMPLEMENTATION_H__ - #define __INKSCAPE_EXTENSION_IMPLEMENTATION_H__ - -+#include - #include - #include - #include -diff -ru inkscape-0.48.4/src/inkview.cpp inkscape-FToU/inkscape-0.48.4/src/inkview.cpp ---- inkscape-0.48.4/src/inkview.cpp 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/inkview.cpp 2013-05-02 15:52:30.000000000 -0400 -@@ -48,6 +48,7 @@ - #include - #include - -+#include - #include - - #include "gc-core.h" -diff -ru inkscape-0.48.4/src/live_effects/parameter/array.h inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/array.h ---- inkscape-0.48.4/src/live_effects/parameter/array.h 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/array.h 2013-05-02 15:56:45.000000000 -0400 -@@ -13,6 +13,7 @@ - - #include - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -ru inkscape-0.48.4/src/live_effects/parameter/path.h inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/path.h ---- inkscape-0.48.4/src/live_effects/parameter/path.h 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/path.h 2013-05-02 15:55:09.000000000 -0400 -@@ -12,6 +12,7 @@ - #include - #include <2geom/path.h> - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -ru inkscape-0.48.4/src/live_effects/parameter/point.h inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/point.h ---- inkscape-0.48.4/src/live_effects/parameter/point.h 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/point.h 2013-05-02 15:56:23.000000000 -0400 -@@ -12,6 +12,7 @@ - #include - #include <2geom/point.h> - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -ru inkscape-0.48.4/src/live_effects/parameter/vector.h inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/vector.h ---- inkscape-0.48.4/src/live_effects/parameter/vector.h 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/live_effects/parameter/vector.h 2013-05-02 15:55:57.000000000 -0400 -@@ -12,6 +12,7 @@ - #include - #include <2geom/point.h> - -+#include - #include - - #include "live_effects/parameter/parameter.h" -diff -ru inkscape-0.48.4/src/selection-chemistry.cpp inkscape-FToU/inkscape-0.48.4/src/selection-chemistry.cpp ---- inkscape-0.48.4/src/selection-chemistry.cpp 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/selection-chemistry.cpp 2013-05-02 15:22:30.000000000 -0400 -@@ -26,6 +26,7 @@ - SPCycleType SP_CYCLING = SP_CYCLE_FOCUS; - - -+#include - #include - - #include "svg/svg.h" -diff -ru inkscape-0.48.4/src/text-context.cpp inkscape-FToU/inkscape-0.48.4/src/text-context.cpp ---- inkscape-0.48.4/src/text-context.cpp 2011-07-08 14:25:09.000000000 -0400 -+++ inkscape-FToU/inkscape-0.48.4/src/text-context.cpp 2013-05-02 15:38:35.000000000 -0400 -@@ -17,6 +17,7 @@ - # include - #endif - -+#include - #include - #include - #include -diff -ru inkscape-0.48.4/src/ui/clipboard.cpp inkscape-FToU/inkscape-0.48.4/src/ui/clipboard.cpp ---- inkscape-0.48.4/src/ui/clipboard.cpp 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/ui/clipboard.cpp 2013-05-02 15:58:50.000000000 -0400 -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - #include -diff -ru inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp inkscape-FToU/inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp ---- inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp 2012-12-13 12:00:46.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/ui/dialog/inkscape-preferences.cpp 2013-05-02 15:59:56.000000000 -0400 -@@ -17,6 +17,7 @@ - # include - #endif - -+#include - #include - #include - #include -diff -ru inkscape-0.48.4/src/ui/dialog/memory.cpp inkscape-FToU/inkscape-0.48.4/src/ui/dialog/memory.cpp ---- inkscape-0.48.4/src/ui/dialog/memory.cpp 2011-07-08 14:25:09.000000000 -0400 -+++ inkscape-FToU/inkscape-0.48.4/src/ui/dialog/memory.cpp 2013-05-02 16:02:24.000000000 -0400 -@@ -13,6 +13,7 @@ - # include - #endif - -+#include - #include - #include - #include -diff -ru inkscape-0.48.4/src/ui/tool/control-point.cpp inkscape-FToU/inkscape-0.48.4/src/ui/tool/control-point.cpp ---- inkscape-0.48.4/src/ui/tool/control-point.cpp 2012-02-13 22:22:17.000000000 -0500 -+++ inkscape-FToU/inkscape-0.48.4/src/ui/tool/control-point.cpp 2013-05-02 16:03:07.000000000 -0400 -@@ -9,6 +9,7 @@ - */ - - #include -+#include - #include - #include - #include <2geom/point.h> diff --git a/Formula/libglademm.rb b/Formula/libglademm.rb index 3782628248..c8427182f3 100644 --- a/Formula/libglademm.rb +++ b/Formula/libglademm.rb @@ -10,12 +10,6 @@ class Libglademm < Formula depends_on 'libglade' depends_on :x11 - def patches - # fixes build against gtkmm-2.24.3 - # libglademm hasn't changed upstream since 2008 - DATA - end - def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", @@ -23,30 +17,3 @@ class Libglademm < Formula system "make install" end end - -__END__ -diff --git a/examples/derived/main.cc b/examples/derived/main.cc -index 5a72f63..38afc96 100644 ---- a/examples/derived/main.cc -+++ b/examples/derived/main.cc -@@ -16,6 +16,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include - #include "deriveddialog.h" - #include - -diff --git a/examples/variablesmap/main.cc b/examples/variablesmap/main.cc -index 145c93d..0c41840 100644 ---- a/examples/variablesmap/main.cc -+++ b/examples/variablesmap/main.cc -@@ -16,7 +16,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include - #include "examplewindow.h" - - int main (int argc, char *argv[]) diff --git a/Formula/yarp.rb b/Formula/yarp.rb index 359f2093e6..4510f4fbf0 100644 --- a/Formula/yarp.rb +++ b/Formula/yarp.rb @@ -19,12 +19,6 @@ 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 @@ -50,54 +44,3 @@ 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 . - */ - -+#include - #include - #include - #include -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 -+#include - #include - - #include -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 - #include - -+#include - #include - - //#include -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 -+ - #include - #include - #include