[mingw-glibmm24: 28/40] Backported an upstream patch to avoid including unixfdlist.h on win32
epienbro
epienbro at fedoraproject.org
Wed Mar 7 17:16:15 UTC 2012
commit d2d6ecb3e3c79da0080c84dae3afb46d13795863
Author: Kalev Lember <kalev at smartlink.ee>
Date: Mon May 2 18:30:31 2011 +0300
Backported an upstream patch to avoid including unixfdlist.h on win32
mingw32-glibmm24-unixfdlist.patch | 28 ++++++++++++++++++++++++++++
mingw32-glibmm24.spec | 9 ++++++++-
2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/mingw32-glibmm24-unixfdlist.patch b/mingw32-glibmm24-unixfdlist.patch
new file mode 100644
index 0000000..3af6dc4
--- /dev/null
+++ b/mingw32-glibmm24-unixfdlist.patch
@@ -0,0 +1,28 @@
+diff -up glibmm-2.28.0/gio/giomm/dbusmessage.h.unixfdlist glibmm-2.28.0/gio/giomm/dbusmessage.h
+--- glibmm-2.28.0/gio/giomm/dbusmessage.h.unixfdlist 2011-03-30 10:19:20.000000000 +0300
++++ glibmm-2.28.0/gio/giomm/dbusmessage.h 2011-05-02 18:29:01.898878388 +0300
+@@ -28,7 +28,9 @@
+ #include <glibmm/object.h>
+ #include <glibmm/variant.h>
+ #include <glibmm/utility.h>
+-#include <giomm/unixfdlist.h>
++#ifdef G_OS_UNIX
++# include <giomm/unixfdlist.h>
++#endif
+
+
+ #ifndef DOXYGEN_SHOULD_SKIP_THIS
+diff -up glibmm-2.28.0/gio/src/dbusmessage.hg.unixfdlist glibmm-2.28.0/gio/src/dbusmessage.hg
+--- glibmm-2.28.0/gio/src/dbusmessage.hg.unixfdlist 2011-03-24 11:29:48.000000000 +0200
++++ glibmm-2.28.0/gio/src/dbusmessage.hg 2011-05-02 18:29:01.899878398 +0300
+@@ -20,7 +20,9 @@
+ #include <glibmm/object.h>
+ #include <glibmm/variant.h>
+ #include <glibmm/utility.h>
+-#include <giomm/unixfdlist.h>
++#ifdef G_OS_UNIX
++# include <giomm/unixfdlist.h>
++#endif
+
+ _DEFS(giomm,gio)
+ _PINCLUDE(glibmm/private/object_p.h)
diff --git a/mingw32-glibmm24.spec b/mingw32-glibmm24.spec
index f32bf4f..4f07192 100644
--- a/mingw32-glibmm24.spec
+++ b/mingw32-glibmm24.spec
@@ -10,13 +10,16 @@
Name: mingw32-glibmm24
Version: 2.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows C++ interface for GTK2 (a GUI library for X)
License: LGPLv2+
Group: Development/Libraries
URL: http://gtkmm.sourceforge.net/
Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.bz2
+# Don't include unixfdlist.h on win32
+# https://bugzilla.gnome.org/show_bug.cgi?id=649168
+Patch0: mingw32-glibmm24-unixfdlist.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -44,6 +47,7 @@ freely combined to quickly create complex user interfaces.
%prep
%setup -q -n glibmm-%{version}
+%patch0 -p1 -b .unixfdlist
%build
%{_mingw32_configure} --disable-static
@@ -94,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 02 2011 Kalev Lember <kalev at smartlink.ee> - 2.28.0-2
+- Backported an upstream patch to avoid including unixfdlist.h on win32
+
* Thu Apr 28 2011 Kalev Lember <kalev at smartlink.ee> - 2.28.0-1
- Update to 2.28.0
- Use macro for calculating two digit version in download url
More information about the scm-commits
mailing list