- updated to 2.32.1

- added errno and nonunix patches to allow build for Win32

Changed files:
    crossmingw32-glib2-errno.patch -> 1.1
    crossmingw32-glib2-nonunix.patch -> 1.1
    crossmingw32-glib2.spec -> 1.67

diff --git a/crossmingw32-glib2-errno.patch b/crossmingw32-glib2-errno.patch
new file mode 100644 (file)
index 0000000..98b2c6a
--- /dev/null
+++ b/crossmingw32-glib2-errno.patch
@@ -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);

diff --git a/crossmingw32-glib2-nonunix.patch b/crossmingw32-glib2-nonunix.patch
new file mode 100644 (file)
index 0000000..dacb972
--- /dev/null
+++ b/crossmingw32-glib2-nonunix.patch
@@ -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                \

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index be7287540fc48f40a5c28adc411d45689ca116a8..42da1cd3def5e6e009e551bf99699d4dfd73e8cd 100644 (file)
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -12,13 +12,15 @@ Summary(tr.UTF-8):  Yararlı ufak yordamlar kitaplığı
 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
@@ -134,6 +136,8 @@ Biblioteki DLL glib2 dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig