rpms/mingw32-glib2/devel glib2-mingw-uih-header-compile-fix.patch, NONE, 1.1 mingw32-glib2.spec, 1.8, 1.9

[epienbro]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5638

Modified Files:
	mingw32-glib2.spec 
Added Files:
	glib2-mingw-uih-header-compile-fix.patch 
Log Message:
MinGW compile fix (upstream GIT commit 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda)


glib2-mingw-uih-header-compile-fix.patch:

--- NEW FILE glib2-mingw-uih-header-compile-fix.patch ---
>From 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Sat, 20 Jun 2009 03:18:09 +0000
Subject: Fix build on mingw

Mingw does not have sys/uio.h. This was reported in bug 585937.

Author:    Matthias Clasen <mclasen at redhat.com>
---
diff --git a/configure.in b/configure.in
index de0d399..d253f60 100644
--- a/configure.in
+++ b/configure.in
@@ -857,6 +857,7 @@ AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h])
 AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h sched.h malloc.h])
 AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h])
 AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h])
+AC_CHECK_HEADERS([sys/uio.h])
 
 # check for structure fields
 AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 0670ee4..151adb5 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -38,7 +38,9 @@
 # include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 
 #include "gsocket.h"
 #include "gcancellable.h"
--
cgit v0.8.2


Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-glib2.spec	22 Jun 2009 11:03:10 -0000	1.8
+++ mingw32-glib2.spec	22 Jun 2009 11:45:37 -0000	1.9
@@ -16,6 +16,9 @@ URL:            http://www.gtk.org
 Source0:        http://download.gnome.org/sources/glib/2.21/glib-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Git commit 854a43a3cd5cb8cc97b66d6f8f661e2a7096acda
+Patch0:         glib2-mingw-uih-header-compile-fix.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 52
@@ -51,6 +54,7 @@ Static version of the MinGW Windows GLib
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1
 
 
 %build