packages: crossmingw32-cairo/cairo-mingw32.patch, crossmingw32-cairo/crossm...

[qboosh]

Author: qboosh                       Date: Mon May  7 19:11:05 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.12.2
- updated mingw32 patch

---- Files affected:
packages/crossmingw32-cairo:
   cairo-mingw32.patch (1.1 -> 1.2) , crossmingw32-cairo.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/crossmingw32-cairo/cairo-mingw32.patch
diff -u packages/crossmingw32-cairo/cairo-mingw32.patch:1.1 packages/crossmingw32-cairo/cairo-mingw32.patch:1.2
--- packages/crossmingw32-cairo/cairo-mingw32.patch:1.1	Sun Mar 25 17:27:53 2012
+++ packages/crossmingw32-cairo/cairo-mingw32.patch	Mon May  7 21:11:00 2012
@@ -9,87 +9,3 @@
  #define WIN32_LEAN_AND_MEAN
  #include <windows.h>
  
---- cairo-1.12.0/test/any2ppm.c.orig	2012-02-29 13:10:30.000000000 +0100
-+++ cairo-1.12.0/test/any2ppm.c	2012-03-25 13:20:49.717047188 +0200
-@@ -120,7 +120,7 @@
- }
- 
- static int
--_write (int fd,
-+_cairo_write (int fd,
- 	char *buf, int maxlen, int buflen,
- 	const unsigned char *src, int srclen)
- {
-@@ -204,7 +204,7 @@
- 
- 	switch ((int) format) {
- 	case CAIRO_FORMAT_ARGB32:
--	    len = _write (fd,
-+	    len = _cairo_write (fd,
- 			  buf, sizeof (buf), len,
- 			  (unsigned char *) row, 4 * width);
- 	    break;
-@@ -215,13 +215,13 @@
- 		rgb[0] = (p & 0xff0000) >> 16;
- 		rgb[1] = (p & 0x00ff00) >> 8;
- 		rgb[2] = (p & 0x0000ff) >> 0;
--		len = _write (fd,
-+		len = _cairo_write (fd,
- 			      buf, sizeof (buf), len,
- 			      rgb, 3);
- 	    }
- 	    break;
- 	case CAIRO_FORMAT_A8:
--	    len = _write (fd,
-+	    len = _cairo_write (fd,
- 			  buf, sizeof (buf), len,
- 			  (unsigned char *) row, width);
- 	    break;
---- cairo-1.12.0/boilerplate/cairo-boilerplate-win32-printing.c.orig	2012-02-29 13:10:30.000000000 +0100
-+++ cairo-1.12.0/boilerplate/cairo-boilerplate-win32-printing.c	2012-03-25 17:00:32.410822070 +0200
-@@ -41,6 +41,7 @@
- #include <cairo-win32.h>
- #include <cairo-paginated-surface-private.h>
- 
-+#include <wchar.h>
- #include <windows.h>
- 
- #if !defined(POSTSCRIPT_IDENTIFY)
-@@ -59,8 +60,35 @@
- # define FEATURESETTING_PSLEVEL 0x0002
- #endif
- 
--cairo_status_t
--_cairo_win32_print_gdi_error (const char *context);
-+/* private function copied from cairo-win32-surface.c */
-+static cairo_status_t
-+_cairo_win32_print_gdi_error (const char *context)
-+{
-+    void *lpMsgBuf;
-+    DWORD last_error = GetLastError ();
-+
-+    if (!FormatMessageW (FORMAT_MESSAGE_ALLOCATE_BUFFER |
-+			 FORMAT_MESSAGE_FROM_SYSTEM,
-+			 NULL,
-+			 last_error,
-+			 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-+			 (LPWSTR) &lpMsgBuf,
-+			 0, NULL)) {
-+	fprintf (stderr, "%s: Unknown GDI error", context);
-+    } else {
-+	fprintf (stderr, "%s: %S", context, (wchar_t *)lpMsgBuf);
-+
-+	LocalFree (lpMsgBuf);
-+    }
-+
-+    fflush (stderr);
-+
-+    /* We should switch off of last_status, but we'd either return
-+     * CAIRO_STATUS_NO_MEMORY or CAIRO_STATUS_UNKNOWN_ERROR and there
-+     * is no CAIRO_STATUS_UNKNOWN_ERROR.
-+     */
-+    return CAIRO_STATUS_NO_MEMORY;
-+}
- 
- static cairo_user_data_key_t win32_closure_key;
- 

================================================================
Index: packages/crossmingw32-cairo/crossmingw32-cairo.spec
diff -u packages/crossmingw32-cairo/crossmingw32-cairo.spec:1.23 packages/crossmingw32-cairo/crossmingw32-cairo.spec:1.24
--- packages/crossmingw32-cairo/crossmingw32-cairo.spec:1.23	Sun Mar 25 17:27:53 2012
+++ packages/crossmingw32-cairo/crossmingw32-cairo.spec	Mon May  7 21:11:00 2012
@@ -3,24 +3,24 @@
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D - skrośna wersja MinGW32
 %define		realname   cairo
 Name:		crossmingw32-%{realname}
-Version:	1.12.0
+Version:	1.12.2
 Release:	1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Development/Libraries
-Source0:	http://cairographics.org/releases/%{realname}-%{version}.tar.gz
-# Source0-md5:	e6c85575ba7094f88b637bdfd835a751
+Source0:	http://cairographics.org/releases/%{realname}-%{version}.tar.xz
+# Source0-md5:	87649eb75789739d517c743e94879e51
 Patch0:		cairo-link.patch
 Patch1:		cairo-mingw32.patch
 URL:		http://cairographics.org/
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9.6
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-fontconfig >= 2.2.95
 BuildRequires:	crossmingw32-freetype >= 2.3.0
 BuildRequires:	crossmingw32-glib2 >= 2.0
 BuildRequires:	crossmingw32-libpng
 BuildRequires:	crossmingw32-pixman >= 0.22.0
 BuildRequires:	crossmingw32-zlib
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig >= 1:0.15
 Requires:	crossmingw32-fontconfig >= 2.2.95
 Requires:	crossmingw32-freetype >= 2.3.0
@@ -245,6 +245,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2012/05/07 19:11:00  qboosh
+- updated to 1.12.2
+- updated mingw32 patch
+
 Revision 1.23  2012/03/25 15:27:53  qboosh
 - updated to 1.12.0
 - added mingw32 patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/crossmingw32-cairo/cairo-mingw32.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/crossmingw32-cairo/crossmingw32-cairo.spec?r1=1.23&r2=1.24