[arch-commits] Commit in cairo/trunk (PKGBUILD utf-8.diff)
Date: Friday, September 21, 2018 @ 18:12:25 Author: heftig Revision: 335175 1.15.14-1 Modified: cairo/trunk/PKGBUILD Deleted: cairo/trunk/utf-8.diff + PKGBUILD | 22 -- utf-8.diff | 44 2 files changed, 8 insertions(+), 58 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-21 17:03:58 UTC (rev 335174) +++ PKGBUILD2018-09-21 18:12:25 UTC (rev 335175) @@ -2,7 +2,7 @@ # Contributor: Brice Carpentier pkgname=cairo -pkgver=1.15.12 +pkgver=1.15.14 pkgrel=1 pkgdesc="2D graphics library with support for multiple output devices" url="https://cairographics.org/; @@ -10,11 +10,9 @@ license=(LGPL MPL) depends=(libpng libxrender libxext fontconfig pixman glib2 lzo) makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git) -_commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519 # tags/1.15.12^0 -source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit; -utf-8.diff) -sha1sums=('SKIP' - '3f680dea8533bcce4ca2af5d25c546235ef7b339') +_commit=d9aaea0c1e1484c632e1a6735c6ecc961c4b032b # tags/1.15.14^0 +source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit;) +sha1sums=('SKIP') pkgver() { cd $pkgname @@ -24,12 +22,6 @@ prepare() { cd $pkgname - # Fixup tag for pkgver() - git tag -f 1.15.10 5e6b9aeb5e3402ff17ae8ee8548ae2341c2f7d59 - - # Fix non-UTF-8 sources giving gtk-doc trouble - patch -Np1 -i ../utf-8.diff - # Update gtk-doc cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4 cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc @@ -50,6 +42,8 @@ --enable-pdf \ --enable-gobject \ --enable-gtk-doc +#--enable-full-testing \ +#--enable-test-surfaces sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } @@ -56,8 +50,8 @@ check() { cd $pkgname - # https://people.gnome.org/~federico/blog/helping-cairo.html - #make check + # many tests in cairo-test-suite hang forever + # xvfb-run make check } package() { Deleted: utf-8.diff === --- utf-8.diff 2018-09-21 17:03:58 UTC (rev 335174) +++ utf-8.diff 2018-09-21 18:12:25 UTC (rev 335175) @@ -1,44 +0,0 @@ - src/cairo-quartz-image.h | 2 +- - src/cairo-quartz.h | 2 +- - src/cairo-vg.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git c/src/cairo-quartz-image.h i/src/cairo-quartz-image.h -index dae234dac..0dd5abb4f 100644 c/src/cairo-quartz-image.h -+++ i/src/cairo-quartz-image.h -@@ -1,6 +1,6 @@ - /* cairo - a vector graphics library with display and print output - * -- * Copyright � 2008 Mozilla Corporation -+ * Copyright © 2008 Mozilla Corporation - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public -diff --git c/src/cairo-quartz.h i/src/cairo-quartz.h -index 9be5f9ae5..9e11e876f 100644 c/src/cairo-quartz.h -+++ i/src/cairo-quartz.h -@@ -1,6 +1,6 @@ - /* cairo - a vector graphics library with display and print output - * -- * Copyright � 2006, 2007 Mozilla Corporation -+ * Copyright © 2006, 2007 Mozilla Corporation - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public -diff --git c/src/cairo-vg.h i/src/cairo-vg.h -index f9a62e51c..a2701db3b 100644 c/src/cairo-vg.h -+++ i/src/cairo-vg.h -@@ -1,8 +1,8 @@ - /* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ - /* cairo - a vector graphics library with display and print output - * -- * Copyright � 2007 * Mozilla Corporation -- * Copyright � 2009 Chris Wilson -+ * Copyright © 2007 * Mozilla Corporation -+ * Copyright © 2009 Chris Wilson - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public
[arch-commits] Commit in cairo/trunk (PKGBUILD utf-8.diff)
Date: Thursday, March 8, 2018 @ 18:02:45 Author: heftig Revision: 318246 1.15.8+120+g14404ada8-1 Added: cairo/trunk/utf-8.diff Modified: cairo/trunk/PKGBUILD + PKGBUILD | 41 - utf-8.diff | 44 2 files changed, 76 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-08 17:47:49 UTC (rev 318245) +++ PKGBUILD2018-03-08 18:02:45 UTC (rev 318246) @@ -3,23 +3,40 @@ # Contributor: Brice Carpentierpkgname=cairo -pkgver=1.15.10 +pkgver=1.15.8+120+g14404ada8 pkgrel=1 pkgdesc="2D graphics library with support for multiple output devices" url="https://cairographics.org/; arch=(x86_64) -license=('LGPL' 'MPL') -depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'lzo') -makedepends=('librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' 'git') -source=(https://cairographics.org/snapshots/cairo-$pkgver.tar.xz) -sha1sums=('de180498ac563249b93ee5e17ba9aa26f90644b3') +license=(LGPL MPL) +depends=(libpng libxrender libxext fontconfig pixman glib2 lzo) +makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git) +_commit=14404ada80f699418263256d7d3d8dddf68be279 # master +source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit; +utf-8.diff) +sha1sums=('SKIP' + '3f680dea8533bcce4ca2af5d25c546235ef7b339') +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + prepare() { - cd $pkgname-$pkgver + cd $pkgname + + # Fix non-UTF-8 sources giving gtk-doc trouble + patch -Np1 -i ../utf-8.diff + + # Update gtk-doc + cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4 + cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc + + NOCONFIGURE=1 ./autogen.sh } build() { - cd $pkgname-$pkgver + cd $pkgname ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -35,7 +52,13 @@ make } +check() { + cd $pkgname + # https://people.gnome.org/~federico/blog/helping-cairo.html + #make check +} + package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="$pkgdir" install } Added: utf-8.diff === --- utf-8.diff (rev 0) +++ utf-8.diff 2018-03-08 18:02:45 UTC (rev 318246) @@ -0,0 +1,44 @@ + src/cairo-quartz-image.h | 2 +- + src/cairo-quartz.h | 2 +- + src/cairo-vg.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git c/src/cairo-quartz-image.h i/src/cairo-quartz-image.h +index dae234dac..0dd5abb4f 100644 +--- c/src/cairo-quartz-image.h i/src/cairo-quartz-image.h +@@ -1,6 +1,6 @@ + /* cairo - a vector graphics library with display and print output + * +- * Copyright � 2008 Mozilla Corporation ++ * Copyright © 2008 Mozilla Corporation + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public +diff --git c/src/cairo-quartz.h i/src/cairo-quartz.h +index 9be5f9ae5..9e11e876f 100644 +--- c/src/cairo-quartz.h i/src/cairo-quartz.h +@@ -1,6 +1,6 @@ + /* cairo - a vector graphics library with display and print output + * +- * Copyright � 2006, 2007 Mozilla Corporation ++ * Copyright © 2006, 2007 Mozilla Corporation + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public +diff --git c/src/cairo-vg.h i/src/cairo-vg.h +index f9a62e51c..a2701db3b 100644 +--- c/src/cairo-vg.h i/src/cairo-vg.h +@@ -1,8 +1,8 @@ + /* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ + /* cairo - a vector graphics library with display and print output + * +- * Copyright � 2007 * Mozilla Corporation +- * Copyright � 2009 Chris Wilson ++ * Copyright © 2007 * Mozilla Corporation ++ * Copyright © 2009 Chris Wilson + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public