upgpkg: cairo-minimal 1.17.2+25+gaee96d175-1

update version to match arch/extra

2 files changed, 22 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5be04fe5bc5e..863ef0c75be7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cairo-minimal
 	pkgdesc = A vector graphics library - build with minimal dependencies
-	pkgver = 1.16.0
+	pkgver = 1.17.2+25+gaee96d175
 	pkgrel = 1
 	url = https://cairographics.org/
 	arch = x86_64
@@ -13,8 +13,8 @@ pkgbase = cairo-minimal
 	depends = lzo
 	provides = cairo
 	replaces = cairo
-	source = http://cairographics.org/releases/cairo-1.16.0.tar.xz
-	sha1sums = 00e81842ae5e81bb0343108884eb5205be0eac14
+	source = git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84
+	sha1sums = SKIP
 
 pkgname = cairo-minimal
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d5fe6dbb8fc..846806d90ca3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Patrick Oppenlander <patrick.oppenlander@gmail.com>
 
 pkgname=cairo-minimal
-pkgver=1.16.0
+pkgver=1.17.2+25+gaee96d175
 pkgrel=1
 pkgdesc="A vector graphics library - build with minimal dependencies"
 url="https://cairographics.org/"
@@ -10,12 +10,26 @@ license=(LGPL MPL)
 depends=(libpng fontconfig pixman glib2 lzo)
 provides=(cairo)
 replaces=(cairo)
-source=(http://cairographics.org/releases/${pkgname:0:5}-$pkgver.tar.xz)
+_commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
+sha1sums=('SKIP')
 
-sha1sums=('00e81842ae5e81bb0343108884eb5205be0eac14')
+pkgver() {
+  cd cairo
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd cairo
+
+  # Fix typo
+  sed -i 's/have_png/use_png/g' configure.ac
+
+  NOCONFIGURE=1 ./autogen.sh
+}
 
 build() {
-  cd ${pkgname:0:5}-$pkgver
+  cd cairo
 
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
@@ -32,6 +46,6 @@ build() {
 }
 
 package() {
-  cd ${pkgname:0:5}-$pkgver
+  cd cairo
   make DESTDIR="$pkgdir" install
 }