Revision: 105610 https://trac.macports.org/changeset/105610 Author: devans@macports.org Date: 2013-04-27 12:47:04 -0700 (Sat, 27 Apr 2013) Log Message: ----------- Fix build failures of dependents (e.g. inkscape) using proposed upstream patches (https://bugzilla.gnome.org/show_bug.cgi?id=697835), closes #38886. Modified Paths: -------------- trunk/dports/x11/gtkmm/Portfile Added Paths: ----------- trunk/dports/x11/gtkmm/files/ trunk/dports/x11/gtkmm/files/patch-additional-glibmm-includes.diff trunk/dports/x11/gtkmm/files/patch-bz697835.diff trunk/dports/x11/gtkmm/files/patch-gtk-src-widget.hg.diff Modified: trunk/dports/x11/gtkmm/Portfile =================================================================== --- trunk/dports/x11/gtkmm/Portfile 2013-04-27 19:43:01 UTC (rev 105609) +++ trunk/dports/x11/gtkmm/Portfile 2013-04-27 19:47:04 UTC (rev 105610) @@ -5,6 +5,7 @@ name gtkmm version 2.24.3 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] description C++ interface to GTK+ version 2. long_description \ @@ -21,7 +22,12 @@ checksums rmd160 73ce5dd1787403dc85a8412a32b5215bab27e5ae \ sha256 c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39 -depends_build port:pkgconfig +depends_build port:pkgconfig \ + port:autoconf \ + port:libtool \ + port:mm-common \ + path:bin/dot:graphviz \ + port:doxygen depends_lib port:gtk2 \ port:glibmm \ @@ -29,5 +35,16 @@ port:pangomm \ port:atkmm +# +# fix build failures of dependents (e.g. inkscape) using +# proposed upstream patches (https://bugzilla.gnome.org/show_bug.cgi?id=697835) (#38886) +# + +patchfiles patch-bz697835.diff \ + patch-additional-glibmm-includes.diff \ + patch-gtk-src-widget.hg.diff + +configure.cmd ./autogen.sh + livecheck.type gnome livecheck.regex {LATEST-IS-(2\.[0-8]*[02468](?:\.\d+)*)} Added: trunk/dports/x11/gtkmm/files/patch-additional-glibmm-includes.diff =================================================================== --- trunk/dports/x11/gtkmm/files/patch-additional-glibmm-includes.diff (rev 0) +++ trunk/dports/x11/gtkmm/files/patch-additional-glibmm-includes.diff 2013-04-27 19:47:04 UTC (rev 105610) @@ -0,0 +1,30 @@ +--- gdk/src/rectangle.hg.orig 2013-04-25 15:45:02.000000000 -0700 ++++ gdk/src/rectangle.hg 2013-04-25 15:46:40.000000000 -0700 +@@ -19,6 +19,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include <glibmm/value.h> + #include <gdk/gdk.h> + + _DEFS(gdkmm,gdk) +--- gtk/src/treemodel.hg.orig 2013-04-26 07:38:52.000000000 -0700 ++++ gtk/src/treemodel.hg 2013-04-26 07:40:22.000000000 -0700 +@@ -17,6 +17,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include <glibmm/arrayhandle.h> + #include <glibmm/interface.h> + #include <gtkmm/treeiter.h> + +--- gtk/src/enums.hg.orig 2013-04-26 10:47:13.000000000 -0700 ++++ gtk/src/enums.hg 2013-04-26 10:48:47.000000000 -0700 +@@ -19,6 +19,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include <glibmm/value.h> + #include <gtkmmconfig.h> //For GTKMM_MAEMO_EXTENSIONS_ENABLED + + _DEFS(gtkmm,gtk) Added: trunk/dports/x11/gtkmm/files/patch-bz697835.diff =================================================================== --- trunk/dports/x11/gtkmm/files/patch-bz697835.diff (rev 0) +++ trunk/dports/x11/gtkmm/files/patch-bz697835.diff 2013-04-27 19:47:04 UTC (rev 105610) @@ -0,0 +1,86 @@ +--- gdk/gdkmm/rgb.cc ++++ gdk/gdkmm/rgb.cc +@@ -18,7 +18,6 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include <glibmm/listhandle.h> + #include <gdkmm/rgb.h> + #include <gdk/gdk.h> + +--- gdk/src/color.hg ++++ gdk/src/color.hg +@@ -23,6 +23,9 @@ _CONFIGINCLUDE(gdkmmconfig.h) + + _DEFS(gdkmm,gdk) + ++#include <glibmm/value.h> ++#include <glibmm/arrayhandle.h> ++ + namespace Gdk + { + +--- gdk/src/pixbufanimationiter.hg ++++ gdk/src/pixbufanimationiter.hg +@@ -20,6 +20,7 @@ + */ + + #include <glibmm/object.h> ++#include <glibmm/timeval.h> + #include <gdkmm/pixbuf.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + +--- gdk/src/screen.hg ++++ gdk/src/screen.hg +@@ -21,6 +21,7 @@ + + //#include <gdkmm/visual.h> + //#include <gdkmm/window.h> ++#include <glibmm/listhandle.h> + #include <gdkmm/region.h> //Just to solve GDK_DISABLE_DEPRECATED problems when this header is included from elsewhere. + #include <gdkmm/rectangle.h> + #include <glibmm/object.h> +--- gdk/src/types.hg ++++ gdk/src/types.hg +@@ -22,6 +22,9 @@ _DEFS(gdkmm,gdk) + #include <gdk/gdk.h> + #include <gdkmmconfig.h> + ++#include <glibmm/listhandle.h> ++#include <glibmm/arrayhandle.h> ++ + /* Shadow ERROR macro (from wingdi.h). + */ + #if defined(ERROR) && !defined(GTKMM_MACRO_SHADOW_ERROR) +--- gtk/gtkmm/selectiondata_private.cc ++++ gtk/gtkmm/selectiondata_private.cc +@@ -19,7 +19,6 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include <glibmm/listhandle.h> + #include <gtkmm/selectiondata_private.h> + + namespace Gtk +--- gtk/src/main.hg ++++ gtk/src/main.hg +@@ -22,6 +22,7 @@ + + #include <sigc++/sigc++.h> + #include <gdkmm/types.h> //For GdkEventKey ++#include <glibmm/optioncontext.h> + + _DEFS(gtkmm,gtk) + +diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg +index a04d924..67720af 100644 +--- gtk/src/treemodel.hg ++++ gtk/src/treemodel.hg +@@ -26,7 +26,6 @@ _PINCLUDE(glibmm/private/interface_p.h) + #m4 _PUSH(SECTION_CC_PRE_INCLUDES) + //Include this before the other headers, such as treeiter.h, + //so that the undef in GdkRegion is used. +-#include <glibmm/listhandle.h> + #include <gtkmm/treepath.h> + #m4 _POP() + Added: trunk/dports/x11/gtkmm/files/patch-gtk-src-widget.hg.diff =================================================================== --- trunk/dports/x11/gtkmm/files/patch-gtk-src-widget.hg.diff (rev 0) +++ trunk/dports/x11/gtkmm/files/patch-gtk-src-widget.hg.diff 2013-04-27 19:47:04 UTC (rev 105610) @@ -0,0 +1,16 @@ +--- gtk/src/widget.hg.orig 2013-04-04 17:12:52.367412258 +0100 ++++ gtk/src/widget.hg 2013-04-24 13:55:14.851758189 +0100 +@@ -986,11 +986,10 @@ dnl + */ + _WRAP_SIGNAL(void drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time), "drag_data_received") + +- //Note that the deprecated keyword has no effect on _WRAP_SIGNAL() yet. + //It doesn't seem like a good idea to put virtual functions in #ifdefs, because that would change the size of the class instances. + /** @deprecated This should never have been in the API. It was never meaningful. + */ +- _WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn, deprecated) ++ _WRAP_SIGNAL(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", ifdef GTKMM_ATKMM_ENABLED, refreturn) + + _WRAP_SIGNAL(void screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen), "screen_changed") + +nged")