packages: crossmingw32-glib2/crossmingw32-glib2.spec, crossmingw32-glib2/cr...

[qboosh]

Author: qboosh                       Date: Sun Apr 15 06:13:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.32.1
- added errno and nonunix patches to allow build for Win32

---- Files affected:
packages/crossmingw32-glib2:
   crossmingw32-glib2.spec (1.66 -> 1.67) , crossmingw32-glib2-errno.patch (NONE -> 1.1)  (NEW), crossmingw32-glib2-nonunix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/crossmingw32-glib2/crossmingw32-glib2.spec
diff -u packages/crossmingw32-glib2/crossmingw32-glib2.spec:1.66 packages/crossmingw32-glib2/crossmingw32-glib2.spec:1.67
--- packages/crossmingw32-glib2/crossmingw32-glib2.spec:1.66	Tue Mar 27 18:07:00 2012
+++ packages/crossmingw32-glib2/crossmingw32-glib2.spec	Sun Apr 15 08:13:14 2012
@@ -13,13 +13,15 @@
 Summary(zh_CN.UTF-8):	实用工具函数库
 %define		realname   glib
 Name:		crossmingw32-glib2
-Version:	2.32.0
+Version:	2.32.1
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-%{version}.tar.xz
-# Source0-md5:	c5fa76fbf9184d20dfb04af66b598190
+# Source0-md5:	032c7cf9868c9aa186b490b155a41144
 Patch0:		%{name}-stacktest.patch
+Patch1:		%{name}-errno.patch
+Patch2:		%{name}-nonunix.patch
 URL:		http://www.gtk.org/
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.11
@@ -135,6 +137,8 @@
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -224,6 +228,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2012/04/15 06:13:14  qboosh
+- updated to 2.32.1
+- added errno and nonunix patches to allow build for Win32
+
 Revision 1.66  2012/03/27 16:07:00  qboosh
 - updated to 2.32.0
 

================================================================
Index: packages/crossmingw32-glib2/crossmingw32-glib2-errno.patch
diff -u /dev/null packages/crossmingw32-glib2/crossmingw32-glib2-errno.patch:1.1
--- /dev/null	Sun Apr 15 08:13:20 2012
+++ packages/crossmingw32-glib2/crossmingw32-glib2-errno.patch	Sun Apr 15 08:13:14 2012
@@ -0,0 +1,16 @@
+--- glib-2.32.1/glib/tests/fileutils.c.orig	2012-04-08 16:24:51.000000000 +0200
++++ glib-2.32.1/glib/tests/fileutils.c	2012-04-15 07:46:15.370145071 +0200
+@@ -541,9 +541,13 @@
+   g_assert (g_file_error_from_errno (ENXIO) == G_FILE_ERROR_NXIO);
+   g_assert (g_file_error_from_errno (ENODEV) == G_FILE_ERROR_NODEV);
+   g_assert (g_file_error_from_errno (EROFS) == G_FILE_ERROR_ROFS);
++#ifdef ETXTBSY
+   g_assert (g_file_error_from_errno (ETXTBSY) == G_FILE_ERROR_TXTBSY);
++#endif
+   g_assert (g_file_error_from_errno (EFAULT) == G_FILE_ERROR_FAULT);
++#ifdef ELOOP
+   g_assert (g_file_error_from_errno (ELOOP) == G_FILE_ERROR_LOOP);
++#endif
+   g_assert (g_file_error_from_errno (ENOSPC) == G_FILE_ERROR_NOSPC);
+   g_assert (g_file_error_from_errno (ENOMEM) == G_FILE_ERROR_NOMEM);
+   g_assert (g_file_error_from_errno (EMFILE) == G_FILE_ERROR_MFILE);

================================================================
Index: packages/crossmingw32-glib2/crossmingw32-glib2-nonunix.patch
diff -u /dev/null packages/crossmingw32-glib2/crossmingw32-glib2-nonunix.patch:1.1
--- /dev/null	Sun Apr 15 08:13:20 2012
+++ packages/crossmingw32-glib2/crossmingw32-glib2-nonunix.patch	Sun Apr 15 08:13:14 2012
@@ -0,0 +1,18 @@
+--- glib-2.32.1/gio/tests/Makefile.am.orig	2012-04-08 16:24:50.000000000 +0200
++++ glib-2.32.1/gio/tests/Makefile.am	2012-04-15 08:00:49.506793518 +0200
+@@ -58,7 +58,6 @@
+ 	vfs			\
+ 	network-monitor		\
+ 	fileattributematcher	\
+-	gmenumodel		\
+ 	resources		\
+ 	$(NULL)
+ 
+@@ -82,6 +81,7 @@
+ 	gdbus-exit-on-close	\
+ 	gdbus-non-socket	\
+ 	gdbus-bz627724		\
++	gmenumodel		\
+ 	appinfo			\
+ 	contenttype		\
+ 	mimeapps		\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/crossmingw32-glib2/crossmingw32-glib2.spec?r1=1.66&r2=1.67