Update to 1.14.0

This commit is contained in:
Erik van Pienbroek 2015-01-01 22:31:45 +01:00
parent c1dc8d1f0b
commit bae445ee58
4 changed files with 7 additions and 49 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ cairo-1.8.10.tar.gz
/cairo-1.12.14.tar.xz
/cairo-1.12.16.tar.xz
/cairo-1.12.18.tar.xz
/cairo-1.14.0.tar.xz

View File

@ -1,37 +0,0 @@
From 332bce6142b313f336e5a714543cc9ea202912e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
Date: Tue, 2 Apr 2013 21:00:20 +0200
Subject: [PATCH 3/3] build-sys: do not try to build util/sphinx on Windows
glib and dlfcn exist on windows, but sphinx code uses a lot of
Unix-only API
Fixes the following build error on mingw-fedora
CC cairo-boilerplate-system.lo
../../../util/cairo-sphinx/sphinx.c:8:22: fatal error: sys/mman.h: No such file or directory
compilation terminated.
https://bugs.freedesktop.org/show_bug.cgi?id=63043
https://bugs.freedesktop.org/show_bug.cgi?id=63044
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 928a169..9a9be60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -797,7 +797,7 @@ CAIRO_ENABLE(symbol_lookup, symbol-lookup, auto, [
PKG_CHECK_MODULES(glib, glib-2.0, have_glib=yes, have_glib=no)
AC_SUBST(glib_CFLAGS)
AC_SUBST(glib_LIBS)
-AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes")
+AM_CONDITIONAL(BUILD_SPHINX, test "x$have_glib" = "xyes" -a "x$have_windows" = "xno")
save_LIBS="$LIBS"
AC_CHECK_LIB(rt, shm_open, shm_LIBS="-lrt")
--
1.8.1.1.439.g50a6b54

View File

@ -1,7 +1,7 @@
%?mingw_package_header
Name: mingw-cairo
Version: 1.12.18
Version: 1.14.0
Release: 1%{?dist}
Summary: MinGW Windows Cairo library
@ -37,11 +37,8 @@ BuildRequires: mingw64-zlib
BuildRequires: mingw64-glib2
BuildRequires: mingw-w64-tools
BuildRequires: autoconf automake libtool
BuildRequires: pkgconfig
# https://bugs.freedesktop.org/show_bug.cgi?id=63043
Patch3: 0003-build-sys-do-not-try-to-build-util-sphinx-on-Windows.patch
%description
MinGW Windows Cairo library.
@ -90,9 +87,6 @@ Static version of the MinGW Windows Cairo library.
%prep
%setup -q -n cairo-%{version}
%patch3 -p1
autoreconf -vfi
%build
# Function to generate an import library for delay-loading
@ -116,6 +110,7 @@ gen_delay_lib libfontconfig-1.dll libfontconfig-delayed.dll.a
gen_delay_lib libfreetype-6.dll libfreetype-delayed.dll.a
MINGW_CONFIGURE_ARGS=" \
ax_cv_c_float_words_bigendian=no \
--disable-pthread \
--disable-xlib \
--disable-xcb \
@ -127,10 +122,6 @@ MINGW_CONFIGURE_ARGS=" \
--enable-gobject \
--enable-tee"
# Workaround for gcc 4.9 compatibility issue
MINGW32_CFLAGS="%{mingw32_cflags} -fno-lto"
MINGW64_CFLAGS="%{mingw64_cflags} -fno-lto"
# 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
@ -219,6 +210,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
* Thu Jan 1 2015 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.14.0-1
- Update to 1.14.0
* Thu Jan 1 2015 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.12.18-1
- Update to 1.12.18

View File

@ -1 +1 @@
8e4ff32b82c3b39387eb6f5c59ef848e cairo-1.12.18.tar.xz
fc3a5edeba703f906f2241b394f0cced cairo-1.14.0.tar.xz