commit a7ad4de8ce7b3702707f675296b37ee1c72e61c0
Author: Kalev Lember <kalevlem...@gmail.com>
Date: Fri Oct 26 22:35:20 2012 +0200
Update to 1.12.6
.gitignore | 1 +
mingw-cairo.spec | 34 ++------
mingw32-cairo-A1_surfaces.patch | 138 -------------------------------
mingw32-cairo-fix-ffs-declaration.patch | 13 ---
mingw32-cairo-reset_clip.patch | 21 -----
sources | 2 +-
6 files changed, 11 insertions(+), 198 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 869bce2..8469636 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
cairo-1.8.10.tar.gz
/cairo-1.10.0.tar.gz
/cairo-1.10.2.tar.gz
+/cairo-1.12.6.tar.xz
diff --git a/mingw-cairo.spec b/mingw-cairo.spec
index 0e56c10..0f0e521 100644
--- a/mingw-cairo.spec
+++ b/mingw-cairo.spec
@@ -1,30 +1,15 @@
%?mingw_package_header
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
Name: mingw-cairo
-Version: 1.10.2
-Release: 14%{?dist}
+Version: 1.12.6
+Release: 1%{?dist}
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
URL: http://cairographics.org
-Source0: http://cairographics.org/releases/cairo-%{version}.tar.gz
+Source0: http://cairographics.org/releases/cairo-%{version}.tar.xz
Group: Development/Libraries
-# The file cairo.c refers to a function called ffs(), but it
-# isn't declared in any of the mingw headers. work around this
-Patch0: mingw32-cairo-fix-ffs-declaration.patch
-
-# Fix A1 format win32 surfaces
-# https://bugs.freedesktop.org/show_bug.cgi?id=42739
-Patch1: mingw32-cairo-A1_surfaces.patch
-
-# Reset clip region when writing fallback results
-# https://bugs.freedesktop.org/show_bug.cgi?id=42821
-Patch2: mingw32-cairo-reset_clip.patch
-
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 95
@@ -52,7 +37,6 @@ BuildRequires: mingw64-zlib
BuildRequires: mingw64-glib2
BuildRequires: mingw-w64-tools
-BuildRequires: autoconf automake libtool
BuildRequires: pkgconfig
@@ -102,12 +86,7 @@ Static version of the MinGW Windows Cairo library.
%prep
%setup -q -n cairo-%{version}
-%patch0 -p0
-%patch1 -p1 -b .A1_surfaces
-%patch2 -p1 -b .reset_clip
-# The libtool bundled with this package is too old for win64 support
-NOCONFIGURE=1 ./autogen.sh
%build
# Function to generate an import library for delay-loading
@@ -160,7 +139,7 @@ popd
%install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/charset.alias
rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/charset.alias
@@ -188,6 +167,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{mingw32_libdir}/pkgconfig/cairo-png.pc
%{mingw32_libdir}/pkgconfig/cairo-ps.pc
+%{mingw32_libdir}/pkgconfig/cairo-script.pc
%{mingw32_libdir}/pkgconfig/cairo-svg.pc
%{mingw32_libdir}/pkgconfig/cairo-tee.pc
%{mingw32_libdir}/pkgconfig/cairo-win32-font.pc
@@ -215,6 +195,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw64_libdir}/pkgconfig/cairo-pdf.pc
%{mingw64_libdir}/pkgconfig/cairo-png.pc
%{mingw64_libdir}/pkgconfig/cairo-ps.pc
+%{mingw64_libdir}/pkgconfig/cairo-script.pc
%{mingw64_libdir}/pkgconfig/cairo-svg.pc
%{mingw64_libdir}/pkgconfig/cairo-tee.pc
%{mingw64_libdir}/pkgconfig/cairo-win32-font.pc
@@ -228,6 +209,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Fri Oct 26 2012 Kalev Lember <kalevlem...@gmail.com> - 1.12.6-1
+- Update to 1.12.6
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-...@lists.fedoraproject.org>
- 1.10.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 5692bae..8a17be3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f101a9e88b783337b20b2e26dfd26d5f cairo-1.10.2.tar.gz
+645b7c1421ed52260d0853e3215c1d8f cairo-1.12.6.tar.xz
_______________________________________________
mingw mailing list
mingw@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/mingw
