From 00a39316aba8654bed30c7be760ef6caca7b3173 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 2 Jul 2020 18:49:40 +0200 Subject: [PATCH] cairo: fix the build --- mingw-w64-cairo/0028-link-libssp.patch | 11 +++++++++++ mingw-w64-cairo/PKGBUILD | 9 ++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-cairo/0028-link-libssp.patch diff --git a/mingw-w64-cairo/0028-link-libssp.patch b/mingw-w64-cairo/0028-link-libssp.patch new file mode 100644 index 0000000000..51b717d067 --- /dev/null +++ b/mingw-w64-cairo/0028-link-libssp.patch @@ -0,0 +1,11 @@ +--- cairo-1.16.0/build/configure.ac.features.orig 2020-07-02 18:38:47.679950700 +0200 ++++ cairo-1.16.0/build/configure.ac.features 2020-07-02 18:36:28.530150600 +0200 +@@ -160,6 +160,8 @@ + CAIRO_LIBS="$CAIRO_LIBS $CAIRO_NONPKGCONFIG_LIBS" + ])dnl + ++CAIRO_LIBS="$CAIRO_LIBS -lssp" ++ + m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE], + [dnl + AC_CONFIG_FILES([$3:$4], diff --git a/mingw-w64-cairo/PKGBUILD b/mingw-w64-cairo/PKGBUILD index efb10a4ada..1297fb2f16 100644 --- a/mingw-w64-cairo/PKGBUILD +++ b/mingw-w64-cairo/PKGBUILD @@ -5,7 +5,7 @@ _realname=cairo pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="Cairo vector graphics library (mingw-w64)" arch=('any') url="https://cairographics.org/" @@ -33,17 +33,20 @@ source=("https://cairographics.org/releases/cairo-${pkgver}.tar.xz" #"https://cairographics.org/snapshots/cairo-${pkgver}.tar.xz" 0009-standalone-headers.mingw.patch 0026-create-argb-fonts.all.patch - 0027-win32-print-fix-unbounded-surface-assertion.patch) + 0027-win32-print-fix-unbounded-surface-assertion.patch + 0028-link-libssp.patch) sha256sums=('5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331' '234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756' '6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975' - '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781') + '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781' + '02fc331315b973e3bcfcf9e8d2647dcd719d1eee96466abaa3959ef153fdc5fb') prepare() { cd "${srcdir}"/${_realname}-${pkgver} patch -p1 -i ${srcdir}/0009-standalone-headers.mingw.patch patch -p1 -i ${srcdir}/0026-create-argb-fonts.all.patch patch -p1 -i ${srcdir}/0027-win32-print-fix-unbounded-surface-assertion.patch + patch -p1 -i ${srcdir}/0028-link-libssp.patch NOCONFIGURE=1 ./autogen.sh }