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
This commit is contained in:
Kalev Lember
parent
0a5896bdf5
commit
edfc04b885
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
--- cairo-1.11.2/src/Makefile.am.orig 2012-02-19 21:36:31.805936062 +0100
|
||||
+++ cairo-1.11.2/src/Makefile.am 2012-02-19 21:37:21.002819998 +0100
|
||||
@@ -65,14 +65,14 @@
|
||||
CLEANFILES += cairo.def
|
||||
cairo.def: cairo-features.h $(enabled_cairo_headers)
|
||||
@echo Generating $@
|
||||
- @(echo EXPORTS; \
|
||||
+ @(echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \
|
||||
+ echo EXPORTS; \
|
||||
(cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \
|
||||
grep -v -E '^# *include' | \
|
||||
( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \
|
||||
grep -E '^cairo_.* \(' | \
|
||||
sed -e 's/[ ].*//' | \
|
||||
sort; \
|
||||
- echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \
|
||||
) >$@
|
||||
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
|
||||
|
||||
--- cairo-1.11.2/src/check-def.sh.orig 2012-02-19 22:28:46.681132716 +0100
|
||||
+++ cairo-1.11.2/src/check-def.sh 2012-02-19 22:29:14.158624900 +0100
|
||||
@@ -38,10 +38,7 @@
|
||||
echo Checking that $so has the same symbol list as $def
|
||||
|
||||
{
|
||||
- echo EXPORTS
|
||||
eval $get_cairo_syms | c++filt --no-params | grep -v '^_cairo_test_\|^_fini\|^_init\|^_save[fg]pr\|^_rest[fg]pr\|^_Z\|^__gnu' | sort -u
|
||||
- # cheat: copy the last line from the def file!
|
||||
- tail -n1 "$def"
|
||||
} | diff "$def" - >&2 || stat=1
|
||||
done
|
||||
|
||||
@ -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@fedoraproject.org> - 1.11.2-1
|
||||
- Update to 1.11.2
|
||||
* Sun Mar 11 2012 Erik van Pienbroek <epienbro@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@fedoraproject.org> - 1.10.2-10
|
||||
|
||||
Loading…
Reference in New Issue
Block a user