]> git.pld-linux.org Git - packages/crossmingw32-glibmm.git/blame - glibmm-unix.patch
- conditional gio-unix API
[packages/crossmingw32-glibmm.git] / glibmm-unix.patch
CommitLineData
99e76d55
JB
1--- glibmm-2.16.0/gio/giomm/wrap_init.cc.orig 2008-03-10 20:14:47.000000000 +0100
2+++ glibmm-2.16.0/gio/giomm/wrap_init.cc 2008-03-15 14:36:35.732734405 +0100
3@@ -12,8 +12,10 @@
4
5 // #include the widget headers so that we can call the get_type() static methods:
6
7+#ifdef HAVE_GIO_UNIX
8 #include "unixinputstream.h"
9 #include "unixoutputstream.h"
10+#endif
11 #include "desktopappinfo.h"
12 #include "appinfo.h"
13 #include "asyncresult.h"
14@@ -60,7 +62,9 @@ GType g_buffered_output_stream_get_type(
15 GType g_cancellable_get_type(void);
16 GType g_data_input_stream_get_type(void);
17 GType g_data_output_stream_get_type(void);
18+#ifdef HAVE_GIO_UNIX
19 GType g_desktop_app_info_get_type(void);
20+#endif
21 GType g_file_enumerator_get_type(void);
22 GType g_file_icon_get_type(void);
23 GType g_file_info_get_type(void);
24@@ -75,8 +79,10 @@ GType g_memory_input_stream_get_type(voi
25 GType g_mount_operation_get_type(void);
26 GType g_output_stream_get_type(void);
27 GType g_themed_icon_get_type(void);
28+#ifdef HAVE_GIO_UNIX
29 GType g_unix_input_stream_get_type(void);
30 GType g_unix_output_stream_get_type(void);
31+#endif
32 GType g_volume_monitor_get_type(void);
33
34 //Declarations of the *_error_quark() functions:
35@@ -93,7 +99,9 @@ namespace Gio { class BufferedOutputStr
36 namespace Gio { class Cancellable_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
37 namespace Gio { class DataInputStream_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
38 namespace Gio { class DataOutputStream_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
39+#ifdef HAVE_GIO_UNIX
40 namespace Gio { class DesktopAppInfo_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
41+#endif
42 namespace Gio { class FileEnumerator_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
43 namespace Gio { class FileIcon_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
44 namespace Gio { class FileInfo_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
45@@ -108,8 +116,10 @@ namespace Gio { class MemoryInputStream
46 namespace Gio { class MountOperation_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
47 namespace Gio { class OutputStream_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
48 namespace Gio { class ThemedIcon_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
49+#ifdef HAVE_GIO_UNIX
50 namespace Gio { class UnixInputStream_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
51 namespace Gio { class UnixOutputStream_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
52+#endif
53 namespace Gio { class VolumeMonitor_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; }
54
55 namespace Gio {
56@@ -126,7 +136,9 @@ void wrap_init()
57 Glib::wrap_register(g_cancellable_get_type(), &Gio::Cancellable_Class::wrap_new);
58 Glib::wrap_register(g_data_input_stream_get_type(), &Gio::DataInputStream_Class::wrap_new);
59 Glib::wrap_register(g_data_output_stream_get_type(), &Gio::DataOutputStream_Class::wrap_new);
60+#ifdef HAVE_GIO_UNIX
61 Glib::wrap_register(g_desktop_app_info_get_type(), &Gio::DesktopAppInfo_Class::wrap_new);
62+#endif
63 Glib::wrap_register(g_file_enumerator_get_type(), &Gio::FileEnumerator_Class::wrap_new);
64 Glib::wrap_register(g_file_icon_get_type(), &Gio::FileIcon_Class::wrap_new);
65 Glib::wrap_register(g_file_info_get_type(), &Gio::FileInfo_Class::wrap_new);
66@@ -141,8 +153,10 @@ void wrap_init()
67 Glib::wrap_register(g_mount_operation_get_type(), &Gio::MountOperation_Class::wrap_new);
68 Glib::wrap_register(g_output_stream_get_type(), &Gio::OutputStream_Class::wrap_new);
69 Glib::wrap_register(g_themed_icon_get_type(), &Gio::ThemedIcon_Class::wrap_new);
70+#ifdef HAVE_GIO_UNIX
71 Glib::wrap_register(g_unix_input_stream_get_type(), &Gio::UnixInputStream_Class::wrap_new);
72 Glib::wrap_register(g_unix_output_stream_get_type(), &Gio::UnixOutputStream_Class::wrap_new);
73+#endif
74 Glib::wrap_register(g_volume_monitor_get_type(), &Gio::VolumeMonitor_Class::wrap_new);
75
76 // Register the gtkmm gtypes:
77@@ -152,7 +166,9 @@ void wrap_init()
78 Gio::Cancellable::get_type();
79 Gio::DataInputStream::get_type();
80 Gio::DataOutputStream::get_type();
81+#ifdef HAVE_GIO_UNIX
82 Gio::DesktopAppInfo::get_type();
83+#endif
84 Gio::FileEnumerator::get_type();
85 Gio::FileIcon::get_type();
86 Gio::FileInfo::get_type();
87@@ -167,8 +183,10 @@ void wrap_init()
88 Gio::MountOperation::get_type();
89 Gio::OutputStream::get_type();
90 Gio::ThemedIcon::get_type();
91+#ifdef HAVE_GIO_UNIX
92 Gio::UnixInputStream::get_type();
93 Gio::UnixOutputStream::get_type();
94+#endif
95 Gio::VolumeMonitor::get_type();
96
97 } // wrap_init()
98--- glibmm-2.16.0/configure.in.orig 2008-03-10 19:25:53.000000000 +0100
99+++ glibmm-2.16.0/configure.in 2008-03-15 14:33:47.763167393 +0100
100@@ -143,6 +143,7 @@ if test x"$os_win32" = xyes; then
101 PKG_CHECK_MODULES(GIOMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version} gio-2.0 >= ${gtkmm_min_glib_version})
102 else
103 PKG_CHECK_MODULES(GIOMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version} gio-2.0 >= ${gtkmm_min_glib_version} gio-unix-2.0 >= ${gtkmm_min_glib_version})
104+ AC_DEFINE([HAVE_GIO_UNIX], [1], [gio-unix exists])
105 fi
106 AC_SUBST(GIOMM_CFLAGS)
107 AC_SUBST(GIOMM_LIBS)
This page took 0.17882 seconds and 4 git commands to generate.