[mingw-cairo: 25/29] Enable cairo-fc and cairo-ft
epienbro
epienbro at fedoraproject.org
Tue Mar 6 16:56:03 UTC 2012
commit 6b512e0f6cef11ce190b5f7975f255570d0347f9
Author: Kalev Lember <kalevlember at gmail.com>
Date: Fri Feb 10 00:42:51 2012 +0200
Enable cairo-fc and cairo-ft
Needed by e.g. poppler and webkitgtk freetype font backend.
mingw32-cairo.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/mingw32-cairo.spec b/mingw32-cairo.spec
index 2d85ed7..8037598 100644
--- a/mingw32-cairo.spec
+++ b/mingw32-cairo.spec
@@ -4,7 +4,7 @@
Name: mingw32-cairo
Version: 1.10.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
@@ -29,6 +29,8 @@ BuildArch: noarch
BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
+BuildRequires: mingw32-fontconfig
+BuildRequires: mingw32-freetype
BuildRequires: mingw32-libxml2
BuildRequires: mingw32-pixman
BuildRequires: mingw32-libpng
@@ -37,12 +39,6 @@ BuildRequires: mingw32-zlib
BuildRequires: mingw32-glib2
BuildRequires: pkgconfig
-# These are BRs for the base package, but are not needed on Win32
-# because Cairo includes a separate Win32 font rendering back end
-# (thanks to: Erik van Pienbroek).
-#BuildRequires: mingw32-fontconfig
-#BuildRequires: mingw32-freetype
-
Requires: pkgconfig
@@ -74,10 +70,11 @@ Static version of the MinGW Windows Cairo library.
--disable-xlib \
--disable-xcb \
--enable-win32 \
+ --enable-fc \
+ --enable-ft \
--enable-png \
--enable-static \
--disable-pthread \
- --disable-ft \
--enable-gobject
make %{?_smp_mflags}
@@ -101,6 +98,8 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{_mingw32_libdir}/libcairo.dll.a
%{_mingw32_libdir}/libcairo-gobject.dll.a
%{_mingw32_libdir}/libcairo-script-interpreter.dll.a
+%{_mingw32_libdir}/pkgconfig/cairo-fc.pc
+%{_mingw32_libdir}/pkgconfig/cairo-ft.pc
%{_mingw32_libdir}/pkgconfig/cairo-gobject.pc
%{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{_mingw32_libdir}/pkgconfig/cairo-png.pc
@@ -117,6 +116,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Thu Feb 09 2012 Kalev Lember <kalevlember at gmail.com> - 1.10.2-8
+- Enable cairo-fc and cairo-ft
+ (needed by e.g. poppler and webkitgtk freetype font backend)
+
* Thu Feb 09 2012 Kalev Lember <kalevlember at gmail.com> - 1.10.2-7
- Apply patches recommended by the GTK+ Windows team:
- Fix A1 format win32 surfaces
More information about the scm-commits
mailing list