From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 24 Sep 2013 18:29:01 +0000 (+0200)
Subject: - updated to 2.30.0
X-Git-Tag: auto/th/crossmingw32-gdk-pixbuf2-2.30.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=4f72799d0022b729ff7bdaf303380a25f79ff57c;p=packages%2Fcrossmingw32-gdk-pixbuf2.git

- updated to 2.30.0
- added win32 patch (disable unix-specific resource limits when compiling on win32)
---

diff --git a/crossmingw32-gdk-pixbuf2.spec b/crossmingw32-gdk-pixbuf2.spec
index 217c40a..4da764b 100644
--- a/crossmingw32-gdk-pixbuf2.spec
+++ b/crossmingw32-gdk-pixbuf2.spec
@@ -5,19 +5,20 @@
 Summary:	An image loading and scaling library - cross MinGW32 version
 Summary(pl.UTF-8):	Biblioteka ładująca i skalująca obrazki - wersja skrośna MinGW32
 Name:		crossmingw32-gdk-pixbuf2
-Version:	2.28.2
+Version:	2.30.0
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.28/gdk-pixbuf-%{version}.tar.xz
-# Source0-md5:	04c04e5042acd85cff6c439aba1995f1
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-%{version}.tar.xz
+# Source0-md5:	d1e32c91597f8f2fa6ead4201216dd05
 Patch0:		gdk-pixbuf2-png-nodep.patch
 Patch1:		gdk-pixbuf2-gdip.patch
+Patch2:		gdk-pixbuf2-win32.patch
 URL:		http://developer.gnome.org/gdk-pixbuf/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-gcc
-BuildRequires:	crossmingw32-glib2 >= 2.34.0
+BuildRequires:	crossmingw32-glib2 >= 2.37.2
 BuildRequires:	crossmingw32-jasper
 BuildRequires:	crossmingw32-libpng
 BuildRequires:	gettext-devel >= 0.17
@@ -30,7 +31,7 @@ BuildRequires:	xz
 BuildRequires:	crossmingw32-libjpeg
 BuildRequires:	crossmingw32-libtiff
 %endif
-Requires:	crossmingw32-glib2 >= 2.34.0
+Requires:	crossmingw32-glib2 >= 2.37.2
 Conflicts:	crossmingw32-gtk+2 < 2.22.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,7 +79,7 @@ Ten pakiet zawiera wersję skrośną dla Win32.
 Summary:	DLL gdk-pixbuf libraries for Windows
 Summary(pl.UTF-8):	Biblioteki DLL gdk-pixbuf dla Windows
 Group:		Applications/Emulators
-Requires:	crossmingw32-glib2-dll >= 2.34.0
+Requires:	crossmingw32-glib2-dll >= 2.37.2
 Requires:	wine
 Conflicts:	crossmingw32-gtk+2-dll < 2.22.0
 
@@ -92,6 +93,7 @@ Biblioteki DLL gdk-pixbuf dla Windows.
 %setup -q -n gdk-pixbuf-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
diff --git a/gdk-pixbuf2-win32.patch b/gdk-pixbuf2-win32.patch
new file mode 100644
index 0000000..a8f4c5d
--- /dev/null
+++ b/gdk-pixbuf2-win32.patch
@@ -0,0 +1,27 @@
+--- gdk-pixbuf-2.30.0/tests/pixbuf-randomly-modified.c.orig	2013-09-23 15:06:17.000000000 +0200
++++ gdk-pixbuf-2.30.0/tests/pixbuf-randomly-modified.c	2013-09-24 20:19:45.937337489 +0200
+@@ -26,7 +26,9 @@
+ #include <time.h>
+ #include <string.h>
+ #include <sys/time.h>
++#ifndef __WIN32__
+ #include <sys/resource.h>
++#endif
+ 
+ static void
+ disaster (const char *what)
+@@ -104,12 +106,14 @@
+   gboolean got_seed = FALSE;
+   GPtrArray *files = g_ptr_array_new ();
+   int l, iterations;
++#ifndef __WIN32__
+   struct rlimit max_mem_size;
+ 
+   max_mem_size.rlim_cur = 100 * 1024 * 1024; /* 100M */
+   max_mem_size.rlim_max = max_mem_size.rlim_cur;
+   setrlimit (RLIMIT_DATA, &max_mem_size);
+   setrlimit (RLIMIT_AS, &max_mem_size);
++#endif
+ 
+   g_test_init (&argc, &argv, NULL);
+