[mingw-cairo] Manually Require fontconfig and freetype

Kalev Lember kalev at fedoraproject.org
Sun Mar 18 20:58:48 UTC 2012


commit 4e0dbb5126eeb0ccc9accc25fa0262aa6c208d2b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Mar 18 22:51:25 2012 +0200

    Manually Require fontconfig and freetype
    
    These are referenced from cairo.pc file, so they have to be installed
    for pkg-config to work. Since commit 90dd92, fontconfig and freetype are
    both delay-loaded and that causes rpm to not generate automatic
    mingw32(...) and mingw64(...) deps on them.
    
    This is a case where automatic mingw pkg-config deps would be handy.

 mingw-cairo.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/mingw-cairo.spec b/mingw-cairo.spec
index 1be4c69..f64551e 100644
--- a/mingw-cairo.spec
+++ b/mingw-cairo.spec
@@ -5,7 +5,7 @@
 
 Name:           mingw-cairo
 Version:        1.10.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
@@ -63,6 +63,8 @@ MinGW Windows Cairo library.
 # Win32
 %package -n mingw32-cairo
 Summary:        MinGW Windows Cairo library
+Requires:       mingw32-fontconfig
+Requires:       mingw32-freetype
 Requires:       pkgconfig
 
 %description -n mingw32-cairo
@@ -79,6 +81,8 @@ Static version of the MinGW Windows Cairo library.
 # Win64
 %package -n mingw64-cairo
 Summary:        MinGW Windows Cairo library
+Requires:       mingw64-fontconfig
+Requires:       mingw64-freetype
 Requires:       pkgconfig
 
 %description -n mingw64-cairo
@@ -224,6 +228,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Sun Mar 18 2012 Kalev Lember <kalevlember at gmail.com> - 1.10.2-13
+- Manually Require fontconfig and freetype, now that they are delay-loaded
+
 * Sat Mar 17 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.2-12
 - Make freetype/fontconfig an optional runtime dependency (delay-load)
 


More information about the mingw mailing list