[mingw-glibmm24: 22/40] fix compilation
epienbro
epienbro at fedoraproject.org
Wed Mar 7 17:15:45 UTC 2012
commit fe60fa4bd804a8ffc8d7ecd391f0403af57a993e
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Tue Dec 7 16:42:06 2010 +0100
fix compilation
glibmm-2.27.4-mingwnowrap.patch | 54 +++++++++++++++++++++++++++++++++++++++
mingw32-glibmm24.spec | 8 ++++++
2 files changed, 62 insertions(+), 0 deletions(-)
---
diff --git a/glibmm-2.27.4-mingwnowrap.patch b/glibmm-2.27.4-mingwnowrap.patch
new file mode 100644
index 0000000..e857db2
--- /dev/null
+++ b/glibmm-2.27.4-mingwnowrap.patch
@@ -0,0 +1,54 @@
+--- glibmm-2.27.4/gio/src/unixcredentialsmessage.hg.mingw 2010-12-06 19:51:54.176020531 +0100
++++ glibmm-2.27.4/gio/src/unixcredentialsmessage.hg 2010-12-06 19:52:32.209833734 +0100
+@@ -42,6 +42,7 @@
+ class UnixCredentialsMessage : public SocketControlMessage
+ {
+ _CLASS_GOBJECT(UnixCredentialsMessage, GUnixCredentialsMessage, G_UNIX_CREDENTIALS_MESSAGE, Gio::SocketControlMessage, GSocketControlMessage)
++ _GTKMMPROC_WIN32_NO_WRAP
+
+ protected:
+ _CTOR_DEFAULT
+--- glibmm-2.27.4/gio/src/unixfdmessage.hg.mingw 2010-12-06 19:51:49.066314134 +0100
++++ glibmm-2.27.4/gio/src/unixfdmessage.hg 2010-12-06 19:52:38.669462379 +0100
+@@ -42,6 +42,7 @@
+ class UnixFDMessage : public SocketControlMessage
+ {
+ _CLASS_GOBJECT(UnixFDMessage, GUnixFDMessage, G_UNIX_FD_MESSAGE, Gio::SocketControlMessage, GSocketControlMessage)
++ _GTKMMPROC_WIN32_NO_WRAP
+
+ protected:
+ _CTOR_DEFAULT
+--- glibmm-2.27.4/gio/src/unixsocketaddress.hg.mingw 2010-12-06 19:52:00.584651782 +0100
++++ glibmm-2.27.4/gio/src/unixsocketaddress.hg 2010-12-06 19:52:28.015074885 +0100
+@@ -48,6 +48,7 @@
+ : public SocketAddress
+ {
+ _CLASS_GOBJECT(UnixSocketAddress, GUnixSocketAddress, G_UNIX_SOCKET_ADDRESS, SocketAddress, GSocketAddress)
++ _GTKMMPROC_WIN32_NO_WRAP
+
+ protected:
+ _WRAP_CTOR(UnixSocketAddress(const std::string& path), g_unix_socket_address_new)
+--- glibmm-2.27.4/gio/src/unixfdlist.hg.nowrap 2010-12-07 16:09:47.098111641 +0100
++++ glibmm-2.27.4/gio/src/unixfdlist.hg 2010-12-07 16:10:12.483645769 +0100
+@@ -39,6 +39,7 @@
+ class UnixFDList : public Glib::Object
+ {
+ _CLASS_GOBJECT(UnixFDList, GUnixFDList, G_UNIX_FD_LIST, Glib::Object, GObject)
++ _GTKMMPROC_WIN32_NO_WRAP
+
+ protected:
+ _CTOR_DEFAULT
+--- glibmm-2.27.4/gio/src/filelist.am.mingw 2010-12-07 14:24:35.135994241 +0100
++++ glibmm-2.27.4/gio/src/filelist.am 2010-12-07 14:25:00.873508506 +0100
+@@ -102,11 +102,7 @@
+ unixoutputstream.hg \
+ unixsocketaddress.hg
+
+-if HOST_WINDOWS_NATIVE
+ giomm_files_arch_hg =
+-else
+-giomm_files_arch_hg = $(giomm_files_posix_hg)
+-endif
+ giomm_files_used_hg = $(giomm_files_any_hg) $(giomm_files_arch_hg)
+
+ giomm_files_hg = $(giomm_files_any_hg) $(giomm_files_posix_hg)
diff --git a/mingw32-glibmm24.spec b/mingw32-glibmm24.spec
index 2d2dc82..b2c7d87 100644
--- a/mingw32-glibmm24.spec
+++ b/mingw32-glibmm24.spec
@@ -28,6 +28,8 @@ BuildRequires: pkgconfig
Requires: pkgconfig
+Patch1: glibmm-2.27.4-mingwnowrap.patch
+
%description
glibmm provides a C++ interface to the GTK+ GLib low-level core
@@ -41,9 +43,15 @@ freely combined to quickly create complex user interfaces.
%prep
%setup -q -n glibmm-%{version}
+%patch1 -p1 -b .nowrap
%build
%{_mingw32_configure} --disable-static
+# rebuild wrap_init.cc
+pushd gio/src
+rm ../giomm/wrap_init.cc
+make ../giomm/wrap_init.cc
+popd
make %{?_smp_mflags}
More information about the scm-commits
mailing list