[mingw-cairo] Revert delay-loading and go back to 1.10.2

[Kalev Lember]

commit edfc04b885fd5fa4d685d8d702ab4442748cc9b9
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 14 12:21:26 2012 +0200

    Revert delay-loading and go back to 1.10.2
    
    ... so that it can be built before the new mingw-w64-tools package is
    approved.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=802161

 .gitignore                          |    1 -
 cairo-fix-def-file-generation.patch |   32 -------------------
 mingw-cairo.spec                    |   59 ++++------------------------------
 sources                             |    2 +-
 4 files changed, 8 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5cdb29..869bce2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 cairo-1.8.10.tar.gz
 /cairo-1.10.0.tar.gz
 /cairo-1.10.2.tar.gz
-/cairo-1.11.2.tar.gz
diff --git a/mingw-cairo.spec b/mingw-cairo.spec
index 3cbf8d8..7529141 100644
--- a/mingw-cairo.spec
+++ b/mingw-cairo.spec
@@ -4,14 +4,13 @@
 %global mingw_build_win64 1
 
 Name:           mingw-cairo
-Version:        1.11.2
-Release:        1%{?dist}
+Version:        1.10.2
+Release:        11%{?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/snapshots/cairo-%{version}.tar.gz
+Source0:        http://cairographics.org/releases/cairo-%{version}.tar.gz
 Group:          Development/Libraries
 
 # The file cairo.c refers to a function called ffs(), but it
@@ -26,13 +25,6 @@ Patch1:         mingw32-cairo-A1_surfaces.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=42821
 Patch2:         mingw32-cairo-reset_clip.patch
 
-# In recent binutils snapshots (feb 2012) the handling of .def files got more strict
-# http://sourceware.org/bugzilla/show_bug.cgi?id=13710
-# https://bugs.freedesktop.org/show_bug.cgi?id=46299
-# https://savannah.gnu.org/support/?107959
-# http://msdn.microsoft.com/en-us/library/d91k01sh%28v=vs.80%29.aspx
-Patch3:         cairo-fix-def-file-generation.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -108,57 +100,22 @@ Static version of the MinGW Windows Cairo library.
 %patch0 -p0
 %patch1 -p1 -b .A1_surfaces
 %patch2 -p1 -b .reset_clip
-%patch3 -p1 -b .def
 
 # 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
-gen_delay_lib()
-{
-    local DLL="$1"
-    local OUT_IMPLIB="$2"
-
-    gendef - "%{mingw32_bindir}/$DLL" > build_win32/delay_load.def
-    %{mingw32_dlltool} --def build_win32/delay_load.def --kill-at --output-delaylib "build_win32/$OUT_IMPLIB"
-
-    gendef - "%{mingw64_bindir}/$DLL" > build_win64/delay_load.def
-    %{mingw64_dlltool} --def build_win64/delay_load.def --kill-at --output-delaylib "build_win64/$OUT_IMPLIB"
-}
-
-mkdir build_win32
-mkdir build_win64
-
-# Generate import libs for delay-loading fontconfig and freetype
-gen_delay_lib libfontconfig-1.dll libfontconfig-delayed.dll.a
-gen_delay_lib libfreetype-6.dll libfreetype-delayed.dll.a
-
-MINGW_CONFIGURE_ARGS=" \
-  --enable-win32 \
+%mingw_configure \
   --disable-pthread \
   --disable-xlib \
   --disable-xcb \
+  --enable-win32 \
   --enable-fc \
   --enable-ft \
   --enable-png \
   --enable-static \
   --enable-gobject \
-  --enable-tee"
-
-# The regular %%mingw_configure macro can't be used here as we need to inject custom
-# environment variables which are different between the win32 and win64 build
-pushd build_win32
-    %mingw32_configure \
-        FONTCONFIG_LIBS="-L`pwd` -lfontconfig-delayed" \
-        FREETYPE_LIBS="-L`pwd` -lfreetype-delayed"
-popd
-
-pushd build_win64
-    %mingw64_configure \
-        FONTCONFIG_LIBS="-L`pwd` -lfontconfig-delayed" \
-        FREETYPE_LIBS="-L`pwd` -lfreetype-delayed"
-popd
+  --enable-tee
 
 %mingw_make %{?_smp_mflags}
 
@@ -232,10 +189,8 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
-* Sun Mar 11 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.11.2-1
-- Update to 1.11.2
+* Sun Mar 11 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.2-11
 - Added win64 support
-- Make freetype/fontconfig an optional runtime dependency (delay-load)
 - Enable tee support
 
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.2-10
diff --git a/sources b/sources
index f4f6c24..5692bae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c8c7b7500058e0c841b2f6db43f15a2  cairo-1.11.2.tar.gz
+f101a9e88b783337b20b2e26dfd26d5f  cairo-1.10.2.tar.gz