Dominique Leuenberger
14fb5e84d1
Fix the headers of gtkmm2 - this fix manages to fix inkscape building... go figure OBS-URL: https://build.opensuse.org/request/show/172585 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtkmm2?expand=0&rev=71
120 lines
4.2 KiB
Diff
120 lines
4.2 KiB
Diff
Index: gtkmm-2.24.3/gdk/gdkmm/rgb.cc
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gdk/gdkmm/rgb.cc
|
|
+++ gtkmm-2.24.3/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>
|
|
|
|
Index: gtkmm-2.24.3/gdk/src/color.hg
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gdk/src/color.hg
|
|
+++ gtkmm-2.24.3/gdk/src/color.hg
|
|
@@ -23,6 +23,9 @@ _CONFIGINCLUDE(gdkmmconfig.h)
|
|
|
|
_DEFS(gdkmm,gdk)
|
|
|
|
+#include <glibmm/value.h>
|
|
+#include <glibmm/arrayhandle.h>
|
|
+
|
|
namespace Gdk
|
|
{
|
|
|
|
Index: gtkmm-2.24.3/gdk/src/pixbufanimationiter.hg
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gdk/src/pixbufanimationiter.hg
|
|
+++ gtkmm-2.24.3/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>
|
|
|
|
Index: gtkmm-2.24.3/gdk/src/screen.hg
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gdk/src/screen.hg
|
|
+++ gtkmm-2.24.3/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>
|
|
Index: gtkmm-2.24.3/gdk/src/types.hg
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gdk/src/types.hg
|
|
+++ gtkmm-2.24.3/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)
|
|
Index: gtkmm-2.24.3/gtk/gtkmm/selectiondata_private.cc
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gtk/gtkmm/selectiondata_private.cc
|
|
+++ gtkmm-2.24.3/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
|
|
Index: gtkmm-2.24.3/gtk/src/main.hg
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gtk/src/main.hg
|
|
+++ gtkmm-2.24.3/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)
|
|
|
|
Index: gtkmm-2.24.3/gtk/src/treemodel.hg
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gtk/src/treemodel.hg
|
|
+++ gtkmm-2.24.3/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()
|
|
|
|
Index: gtkmm-2.24.3/gtk/src/widget.hg
|
|
===================================================================
|
|
--- gtkmm-2.24.3.orig/gtk/src/widget.hg
|
|
+++ gtkmm-2.24.3/gtk/src/widget.hg
|
|
@@ -986,11 +986,13 @@ 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")
|
|
|
|
+#ifndef GTKMM_DISABLE_DEPRECATED
|
|
//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)
|
|
+#endif // GTKMM_DISABLE_DEPRECATED
|
|
|
|
_WRAP_SIGNAL(void screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen), "screen_changed")
|
|
|