- updated to 2.11.1

- added mingw32 patch (compilation fix wrt. MemoryBarrier)

diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index c980dc4f86b5445ce02b1aa4adca28def3fdd1fe..293a8300af68679939011060b6568d82256f32ad 100644 (file)
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -2,13 +2,14 @@
 Summary:       Font configuration and customization tools - cross MinGW32 versoin
 Summary(pl.UTF-8):     Narzędzia do konfigurowania fontów - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       2.11.0
-Release:       2
+Version:       2.11.1
+Release:       1
 License:       MIT
 Group:         Development/Libraries
 Source0:       http://fontconfig.org/release/%{realname}-%{version}.tar.bz2
-# Source0-md5: 000bd4baf7aefa828e03414d0c8c7dc5
+# Source0-md5: 824d000eb737af6e16c826dd3b2d6c90
 Patch0:                %{realname}-bitstream-cyberbit.patch
+Patch1:                %{realname}-mingw32.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.11
@@ -86,6 +87,7 @@ Biblioteka DLL freetype dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # uses POSIX-specific dirent interfaces
 %{__sed} -i -e 's/test-migration//' test/Makefile.am
@@ -103,15 +105,18 @@ export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
        --with-arch=%{target} \
        --with-freetype-config="pkg-config freetype2" \
        --disable-docs \
-       --disable-silent-rules
+       --disable-silent-rules \
+       --enable-static
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# fc_cachedir=/dummy is to avoid creating ${DESTDIR}LOCAL_APPDATA_FONTCONFIG_CACHE dir
 %{__make} -j1 install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       fc_cachedir=/dummy
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
 mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}

diff --git a/fontconfig-mingw32.patch b/fontconfig-mingw32.patch
new file mode 100644 (file)
index 0000000..f2aaada
--- /dev/null
+++ b/fontconfig-mingw32.patch
@@ -0,0 +1,24 @@
+--- fontconfig-2.11.1/src/fcint.h.orig 2014-01-20 09:14:20.000000000 +0100
++++ fontconfig-2.11.1/src/fcint.h      2014-03-25 20:02:08.436489743 +0100
+@@ -29,6 +29,10 @@
+ #include <config.h>
+ #endif
+ 
++#ifdef _WIN32
++#include "fcwindows.h"
++#endif
++
+ #include "fcstdint.h"
+ 
+ #include <stdlib.h>
+--- fontconfig-2.11.1/src/fcwindows.h.orig     2014-01-20 09:14:21.000000000 +0100
++++ fontconfig-2.11.1/src/fcwindows.h  2014-03-25 19:23:46.449919680 +0100
+@@ -33,7 +33,7 @@
+ 
+ #ifdef _WIN32
+ #  ifndef _WIN32_WINNT
+-#    define _WIN32_WINNT 0x0500
++#    define _WIN32_WINNT 0x0600
+ #  endif
+ #  define WIN32_LEAN_AND_MEAN
+ #  define WIN32_EXTRA_LEAN