Revert "update to 1.17.2"

follow the stable branch

2 files changed, 17 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bfa351c30e0c..f85493b60062 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-cairo-bootstrap
 	pkgdesc = Cairo vector graphics library (mingw-w64 bootstrap)
-	pkgver = 1.17.2
-	pkgrel = 1
+	pkgver = 1.16.0
+	pkgrel = 3
 	url = http://cairographics.org/
 	arch = any
 	license = LGPL
@@ -12,19 +12,21 @@ pkgbase = mingw-w64-cairo-bootstrap
 	depends = mingw-w64-fontconfig
 	depends = mingw-w64-libpng
 	depends = mingw-w64-lzo
-	provides = mingw-w64-cairo=1.17.2
+	provides = mingw-w64-cairo=1.16.0
 	conflicts = mingw-w64-cairo
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://cairographics.org/snapshots/cairo-1.17.2.tar.xz
+	source = https://cairographics.org/releases/cairo-1.16.0.tar.xz
 	source = 0009-standalone-headers.mingw.patch
 	source = 0026-create-argb-fonts.all.patch
 	source = 0027-win32-print-fix-unbounded-surface-assertion.patch
-	sha256sums = 6b70d4655e2a47a22b101c666f4b29ba746eda4aa8a0f7255b32b2e9408801df
+	source = 0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+	sha256sums = 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
 	sha256sums = 234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756
 	sha256sums = 6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975
 	sha256sums = 7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781
+	sha256sums = 52ab418058076ad01e046ebbbdc834f390305516c222d07de91a93a4dcebe921
 
 pkgname = mingw-w64-cairo-bootstrap
 
diff --git a/PKGBUILD b/PKGBUILD
index 17b79a423ad2..67014aa005b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Chris Kitching <chriskitching@linux.com>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 pkgname=mingw-w64-cairo-bootstrap
-pkgver=1.17.2
-pkgrel=1
+pkgver=1.16.0
+pkgrel=3
 pkgdesc="Cairo vector graphics library (mingw-w64 bootstrap)"
 arch=(any)
 url="http://cairographics.org/"
@@ -13,14 +13,16 @@ depends=(mingw-w64-pixman mingw-w64-glib2 mingw-w64-fontconfig mingw-w64-libpng
 options=(!strip !buildflags staticlibs)
 provides=(${pkgname%-bootstrap}=$pkgver)
 conflicts=(${pkgname%-bootstrap})
-source=("https://cairographics.org/snapshots/cairo-${pkgver}.tar.xz"
+source=("https://cairographics.org/releases/cairo-${pkgver}.tar.xz"
         "0009-standalone-headers.mingw.patch"
         "0026-create-argb-fonts.all.patch"
-        "0027-win32-print-fix-unbounded-surface-assertion.patch")
-sha256sums=('6b70d4655e2a47a22b101c666f4b29ba746eda4aa8a0f7255b32b2e9408801df'
+        "0027-win32-print-fix-unbounded-surface-assertion.patch"
+        "0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch")
+sha256sums=('5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331'
             '234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756'
             '6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975'
-            '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781')
+            '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781'
+            '52ab418058076ad01e046ebbbdc834f390305516c222d07de91a93a4dcebe921')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
@@ -28,6 +30,8 @@ prepare() {
   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
+  # CVE-2018-19876
+  patch -p1 -i ${srcdir}/0001-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
   autoreconf -fi
 }