- updated to 2.40.0

- removed obsolete stacktest,cross patches
- updated win32 patch; needs mingw32 with rand_s() function

diff --git a/crossmingw32-glib2-stacktest.patch b/crossmingw32-glib2-stacktest.patch
deleted file mode 100644 (file)
index ae154da..0000000
--- a/crossmingw32-glib2-stacktest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glib-2.12.9/configure.ac.orig      2007-01-17 00:24:39.000000000 +0100
-+++ glib-2.12.9/configure.ac   2007-03-06 11:44:09.683703523 +0100
-@@ -629,7 +629,9 @@
-       glib_cv_stack_grows=no
-         ,
-       glib_cv_stack_grows=yes
--        ,)
-+        ,[
-+      glib_cv_stack_grows=no
-+      AC_MSG_WARN([cross-compiling, assuming no growing stack])])
- ])
- 
- dnl AC_C_INLINE is useless to us since it bails out too early, we need to

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index 4eec4eaa6b5a6ccdba8329d939f09f4077000297..3ae12db649568c72bf0f9e90e69b8520c07022c5 100644 (file)
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -12,15 +12,13 @@ Summary(tr.UTF-8):  Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 %define                realname   glib
 Name:          crossmingw32-glib2
-Version:       2.38.2
+Version:       2.40.0
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.38/glib-%{version}.tar.xz
-# Source0-md5: 26d1d08e478fc48c181ca8be44f5b69f
-Patch0:                %{name}-stacktest.patch
-Patch1:                glib2-cross.patch
-Patch2:                glib2-win32.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.40/glib-%{version}.tar.xz
+# Source0-md5: 05fb7cb17eacbc718e90366a1eae60d9
+Patch0:                glib2-win32.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11
@@ -29,10 +27,12 @@ BuildRequires:      crossmingw32-gettext
 BuildRequires: crossmingw32-libffi >= 3.0.0
 BuildRequires: crossmingw32-libiconv
 BuildRequires: crossmingw32-pcre >= 8.13
+# rand_s()
+BuildRequires: crossmingw32-runtime >= 1:4.0.3-2
 BuildRequires: crossmingw32-zlib
 # host glib-genmarshall and glib-compile-schemas are needed for cross-compiling
 BuildRequires: glib2 >= 1:2.32.0
-BuildRequires: gtk-doc >= 1.15
+BuildRequires: gtk-doc >= 1.20
 BuildRequires: libtool >= 2:2.2
 BuildRequires: pkgconfig >= 1:0.16
 BuildRequires: python >= 1:2.5
@@ -139,8 +139,6 @@ 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

diff --git a/glib2-cross.patch b/glib2-cross.patch
deleted file mode 100644 (file)
index 608829e..0000000
--- a/glib2-cross.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- glib-2.32.2/configure.ac.orig      2012-05-07 18:14:09.061606437 +0200
-+++ glib-2.32.2/configure.ac   2012-05-07 18:56:32.524886758 +0200
-@@ -452,6 +452,7 @@
- 
- AC_MSG_RESULT($enable_iconv_cache)
- 
-+AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
- 
- dnl
- dnl zlib support
-@@ -921,7 +922,6 @@
- 
- # Checks for libcharset
- AM_LANGINFO_CODESET
--AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
- AC_CHECK_FUNCS(setlocale)
- 
- # check additional type sizes

diff --git a/glib2-win32.patch b/glib2-win32.patch
index a82281854169b50f857dbc8e83fe6aa5bd349dc0..5b82cc4db6deee7077b5c2404bdba2d0426e9c49 100644 (file)
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -1,14 +1,3 @@
---- glib-2.32.4/gio/gcontenttype.c.orig        2012-07-14 22:33:18.000000000 +0200
-+++ glib-2.32.4/gio/gcontenttype.c     2012-07-24 16:48:52.400116342 +0200
-@@ -332,7 +332,7 @@
- 
-   /* our test suite and potentially other code used -1 in the past, which is
-    * not documented and not allowed; guard against that */
--  g_return_val_if_fail (data_size != (gsize) -1, g_strdup (XDG_MIME_TYPE_UNKNOWN));
-+  g_return_val_if_fail (data_size != (gsize) -1, g_strdup ("*"));
- 
-   if (filename)
-     {
 --- glib-2.34.0/gio/gregistrysettingsbackend.c.orig    2012-08-19 16:39:53.000000000 +0200
 +++ glib-2.34.0/gio/gregistrysettingsbackend.c 2012-09-26 17:54:44.204962755 +0200
 @@ -233,7 +233,7 @@
@@ -20,3 +9,13 @@
  };
  
  
+--- glib-2.40.0/glib/grand.c.orig      2014-02-22 16:29:07.000000000 +0100
++++ glib-2.40.0/glib/grand.c   2014-03-25 18:45:39.693348981 +0100
+@@ -55,6 +55,7 @@
+ #endif
+ 
+ #ifdef G_OS_WIN32
++#include <windows.h>
+ #include <stdlib.h>
+ #endif
+