update to 1.17.2+25+gaee96d175

2 files changed, 9 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41106e4a34d5..a6ea177702e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-cairo-bootstrap
 	pkgdesc = 2D graphics library with support for multiple output devices (mingw-w64 bootstrap)
-	pkgver = 1.17.2+17+g52a7c79fd
-	pkgrel = 2
+	pkgver = 1.17.2+25+gaee96d175
+	pkgrel = 1
 	url = http://cairographics.org/
 	arch = any
 	license = LGPL
@@ -13,21 +13,19 @@ pkgbase = mingw-w64-cairo-bootstrap
 	depends = mingw-w64-fontconfig
 	depends = mingw-w64-libpng
 	depends = mingw-w64-lzo
-	provides = mingw-w64-cairo=1.17.2+17+g52a7c79fd
+	provides = mingw-w64-cairo=1.17.2+25+gaee96d175
 	conflicts = mingw-w64-cairo
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc
+	source = git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84
 	source = 0009-standalone-headers.mingw.patch
 	source = 0026-create-argb-fonts.all.patch
 	source = 0027-win32-print-fix-unbounded-surface-assertion.patch
-	source = 0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch
 	sha256sums = SKIP
 	sha256sums = 234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756
 	sha256sums = 6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975
 	sha256sums = 7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781
-	sha256sums = 262bf1cebc04eaae93dbfab56045ad800b3b027be303ca2611375645108f171f
 
 pkgname = mingw-w64-cairo-bootstrap
 
diff --git a/PKGBUILD b/PKGBUILD
index 85b54f0bdf48..d6b3bc7464fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: Chris Kitching <chriskitching@linux.com>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 pkgname=mingw-w64-cairo-bootstrap
-pkgver=1.17.2+17+g52a7c79fd
-pkgrel=2
+pkgver=1.17.2+25+gaee96d175
+pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices (mingw-w64 bootstrap)"
-_commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc
+_commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84
 arch=(any)
 url="http://cairographics.org/"
 license=("LGPL" "MPL")
@@ -17,13 +17,11 @@ conflicts=(${pkgname%-bootstrap})
 source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
         "0009-standalone-headers.mingw.patch"
         "0026-create-argb-fonts.all.patch"
-        "0027-win32-print-fix-unbounded-surface-assertion.patch"
-        "0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch")
+        "0027-win32-print-fix-unbounded-surface-assertion.patch")
 sha256sums=('SKIP'
             '234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756'
             '6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975'
-            '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781'
-            '262bf1cebc04eaae93dbfab56045ad800b3b027be303ca2611375645108f171f')
+            '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -37,8 +35,6 @@ 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
-  # https://bugs.archlinux.org/task/63856
-  patch -p1 -i ${srcdir}/0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch
 
   # Fix typo
   sed -i 's/have_png/use_png/g' configure.ac