Update to 1.17.8

This commit is contained in:
Sandro Mani 2023-07-04 13:55:00 +02:00
parent c6a4a4420a
commit c29b68db9b
3 changed files with 37 additions and 83 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ cairo-1.8.10.tar.gz
/cairo-1.14.6.tar.xz
/cairo-1.14.10.tar.xz
/cairo-1.16.0.tar.xz
/cairo-1.17.8.tar.xz

View File

@ -1,17 +1,19 @@
%{?mingw_package_header}
Name: mingw-cairo
Version: 1.16.0
Release: 11%{?dist}
Version: 1.17.8
Release: 1%{?dist}
Summary: MinGW Windows Cairo library
License: LGPLv2 or MPLv1.1
URL: http://cairographics.org
Source0: http://cairographics.org/releases/cairo-%{version}.tar.xz
Source0: http://cairographics.org/snapshots/cairo-%{version}.tar.xz
BuildArch: noarch
BuildRequires: make
BuildRequires: meson
BuildRequires: ninja-build
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@ -87,67 +89,12 @@ Static version of the MinGW Windows Cairo library.
%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=" \
ax_cv_c_float_words_bigendian=no \
--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
%mingw_make_build
%mingw_meson --default-library both
%mingw_ninja
%install
%mingw_make_install
rm -f %{buildroot}%{mingw32_libdir}/charset.alias
rm -f %{buildroot}%{mingw64_libdir}/charset.alias
rm -r %{buildroot}%{mingw32_datadir}/gtk-doc
rm -r %{buildroot}%{mingw64_datadir}/gtk-doc
# Drop all .la files
find %{buildroot} -name "*.la" -delete
%mingw_ninja_install
# Win32
@ -160,18 +107,20 @@ find %{buildroot} -name "*.la" -delete
%{mingw32_libdir}/libcairo.dll.a
%{mingw32_libdir}/libcairo-gobject.dll.a
%{mingw32_libdir}/libcairo-script-interpreter.dll.a
%{mingw32_libdir}/pkgconfig/cairo-fc.pc
%{mingw32_libdir}/pkgconfig/cairo-ft.pc
%{mingw32_libdir}/pkgconfig/cairo-gobject.pc
%{mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{mingw32_libdir}/pkgconfig/cairo-png.pc
%{mingw32_libdir}/pkgconfig/cairo-ps.pc
%{mingw32_libdir}/pkgconfig/cairo-script.pc
%{mingw32_libdir}/pkgconfig/cairo-svg.pc
%{mingw32_libdir}/pkgconfig/cairo-tee.pc
%{mingw32_libdir}/pkgconfig/cairo-win32-font.pc
%{mingw32_libdir}/pkgconfig/cairo-win32.pc
%{mingw32_libdir}/pkgconfig/cairo-fc.pc
%{mingw32_libdir}/pkgconfig/cairo.pc
%{mingw32_libdir}/pkgconfig/cairo-pdf.pc
%{mingw32_libdir}/pkgconfig/cairo-dwrite-font.pc
%{mingw32_libdir}/pkgconfig/cairo-svg.pc
%{mingw32_libdir}/pkgconfig/cairo-ps.pc
%{mingw32_libdir}/pkgconfig/cairo-win32-font.pc
%{mingw32_libdir}/pkgconfig/cairo-ft.pc
%{mingw32_libdir}/pkgconfig/cairo-png.pc
%{mingw32_libdir}/pkgconfig/cairo-script.pc
%{mingw32_libdir}/pkgconfig/cairo-script-interpreter.pc
%{mingw32_libdir}/pkgconfig/cairo-win32.pc
%files -n mingw32-cairo-static
%{mingw32_libdir}/libcairo.a
@ -188,18 +137,19 @@ find %{buildroot} -name "*.la" -delete
%{mingw64_libdir}/libcairo.dll.a
%{mingw64_libdir}/libcairo-gobject.dll.a
%{mingw64_libdir}/libcairo-script-interpreter.dll.a
%{mingw64_libdir}/pkgconfig/cairo-fc.pc
%{mingw64_libdir}/pkgconfig/cairo-ft.pc
%{mingw64_libdir}/pkgconfig/cairo-gobject.pc
%{mingw64_libdir}/pkgconfig/cairo-pdf.pc
%{mingw64_libdir}/pkgconfig/cairo-png.pc
%{mingw64_libdir}/pkgconfig/cairo-ps.pc
%{mingw64_libdir}/pkgconfig/cairo-script.pc
%{mingw64_libdir}/pkgconfig/cairo-svg.pc
%{mingw64_libdir}/pkgconfig/cairo-tee.pc
%{mingw64_libdir}/pkgconfig/cairo-win32-font.pc
%{mingw64_libdir}/pkgconfig/cairo-win32.pc
%{mingw64_libdir}/pkgconfig/cairo-fc.pc
%{mingw64_libdir}/pkgconfig/cairo.pc
%{mingw64_libdir}/pkgconfig/cairo-pdf.pc
%{mingw64_libdir}/pkgconfig/cairo-dwrite-font.pc
%{mingw64_libdir}/pkgconfig/cairo-svg.pc
%{mingw64_libdir}/pkgconfig/cairo-ps.pc
%{mingw64_libdir}/pkgconfig/cairo-win32-font.pc
%{mingw64_libdir}/pkgconfig/cairo-ft.pc
%{mingw64_libdir}/pkgconfig/cairo-png.pc
%{mingw64_libdir}/pkgconfig/cairo-script.pc
%{mingw64_libdir}/pkgconfig/cairo-script-interpreter.pc
%{mingw64_libdir}/pkgconfig/cairo-win32.pc
%files -n mingw64-cairo-static
%{mingw64_libdir}/libcairo.a
@ -208,6 +158,9 @@ find %{buildroot} -name "*.la" -delete
%changelog
* Tue Jul 04 2023 Sandro Mani <manisandro@gmail.com> - 1.17.8-1
- Update to 1.17.8
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (cairo-1.16.0.tar.xz) = 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
SHA512 (cairo-1.17.8.tar.xz) = 62f0eaaebc46be5f0de7cb49df055eeadcc02706095a9d641eceac563d48344c2234940ce90d84a610c5003e536d9dcd318a1649578fd9cd5ab5f0db5b75bd8f