packages: crossmingw32-cairo/crossmingw32-cairo.spec, crossmingw32-cairo/ca...
qboosh
qboosh at pld-linux.org
Sun Mar 25 17:27:59 CEST 2012
Author: qboosh Date: Sun Mar 25 15:27:59 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.12.0
- added mingw32 patch
---- Files affected:
packages/crossmingw32-cairo:
crossmingw32-cairo.spec (1.22 -> 1.23) , cairo-mingw32.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/crossmingw32-cairo/crossmingw32-cairo.spec
diff -u packages/crossmingw32-cairo/crossmingw32-cairo.spec:1.22 packages/crossmingw32-cairo/crossmingw32-cairo.spec:1.23
--- packages/crossmingw32-cairo/crossmingw32-cairo.spec:1.22 Fri Dec 31 12:36:57 2010
+++ packages/crossmingw32-cairo/crossmingw32-cairo.spec Sun Mar 25 17:27:53 2012
@@ -3,13 +3,14 @@
Summary(pl.UTF-8): Cairo - wieloplatformowa biblioteka graficzna 2D - skrośna wersja MinGW32
%define realname cairo
Name: crossmingw32-%{realname}
-Version: 1.10.2
+Version: 1.12.0
Release: 1
License: LGPL v2.1 or MPL v1.1
Group: Development/Libraries
Source0: http://cairographics.org/releases/%{realname}-%{version}.tar.gz
-# Source0-md5: f101a9e88b783337b20b2e26dfd26d5f
+# Source0-md5: e6c85575ba7094f88b637bdfd835a751
Patch0: cairo-link.patch
+Patch1: cairo-mingw32.patch
URL: http://cairographics.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9.6
@@ -17,14 +18,14 @@
BuildRequires: crossmingw32-freetype >= 2.3.0
BuildRequires: crossmingw32-glib2 >= 2.0
BuildRequires: crossmingw32-libpng
-BuildRequires: crossmingw32-pixman >= 0.18.4
+BuildRequires: crossmingw32-pixman >= 0.22.0
BuildRequires: crossmingw32-zlib
BuildRequires: libtool
BuildRequires: pkgconfig >= 1:0.15
Requires: crossmingw32-fontconfig >= 2.2.95
Requires: crossmingw32-freetype >= 2.3.0
Requires: crossmingw32-libpng
-Requires: crossmingw32-pixman >= 0.18.4
+Requires: crossmingw32-pixman >= 0.22.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define no_install_post_strip 1
@@ -98,7 +99,7 @@
Requires: crossmingw32-fontconfig-dll >= 2.2.95
Requires: crossmingw32-freetype-dll >= 2.3.0
Requires: crossmingw32-libpng-dll
-Requires: crossmingw32-pixman-dll >= 0.18.4
+Requires: crossmingw32-pixman-dll >= 0.22.0
%description dll
DLL Cairo library for Windows.
@@ -147,6 +148,7 @@
%prep
%setup -q -n %{realname}-%{version}
%patch0 -p1
+%patch1 -p1
%build
export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
@@ -207,6 +209,7 @@
%{_pkgconfigdir}/cairo-pdf.pc
%{_pkgconfigdir}/cairo-png.pc
%{_pkgconfigdir}/cairo-ps.pc
+%{_pkgconfigdir}/cairo-script.pc
%{_pkgconfigdir}/cairo-svg.pc
%{_pkgconfigdir}/cairo-win32.pc
%{_pkgconfigdir}/cairo-win32-font.pc
@@ -242,6 +245,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2012/03/25 15:27:53 qboosh
+- updated to 1.12.0
+- added mingw32 patch
+
Revision 1.22 2010/12/31 11:36:57 qboosh
- updated to 1.10.2
================================================================
Index: packages/crossmingw32-cairo/cairo-mingw32.patch
diff -u /dev/null packages/crossmingw32-cairo/cairo-mingw32.patch:1.1
--- /dev/null Sun Mar 25 17:27:59 2012
+++ packages/crossmingw32-cairo/cairo-mingw32.patch Sun Mar 25 17:27:53 2012
@@ -0,0 +1,95 @@
+--- cairo-1.12.0/util/cairo-missing/cairo-missing.h.orig 2012-02-02 01:48:15.000000000 +0100
++++ cairo-1.12.0/util/cairo-missing/cairo-missing.h 2012-03-25 12:56:29.970335651 +0200
+@@ -37,7 +37,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(__MINGW32__)
+ #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;
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/crossmingw32-cairo/crossmingw32-cairo.spec?r1=1.22&r2=1.23
More information about the pld-cvs-commit
mailing list