[arch-commits] Commit in lib32-cairo/trunk (PKGBUILD utf-8.diff)

2018-09-21 Thread Jan Steffens via arch-commits 
Date: Friday, September 21, 2018 @ 18:14:02
  Author: heftig
Revision: 383864

1.15.14-1

Modified:
  lib32-cairo/trunk/PKGBUILD
Deleted:
  lib32-cairo/trunk/utf-8.diff

+
 PKGBUILD   |   24 +---
 utf-8.diff |   44 
 2 files changed, 9 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-21 17:56:42 UTC (rev 383863)
+++ PKGBUILD2018-09-21 18:14:02 UTC (rev 383864)
@@ -2,7 +2,7 @@
 
 _pkgbasename=cairo
 pkgname=lib32-$_pkgbasename
-pkgver=1.15.12
+pkgver=1.15.14
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices (32-bit)"
 url="https://cairographics.org/;
@@ -10,11 +10,9 @@
 license=(LGPL MPL)
 depends=(lib32-libpng lib32-libxrender lib32-libxext lib32-fontconfig 
lib32-pixman lib32-glib2 $_pkgbasename)
 makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
-_commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519  # tags/1.15.12^0
-source=("git+https://anongit.freedesktop.org/git/cairo#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 $_pkgbasename
@@ -24,12 +22,6 @@
 prepare() {
   cd $_pkgbasename
 
-  # 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
@@ -55,6 +47,8 @@
 --enable-pdf \
 --enable-gobject \
 --disable-gtk-doc
+#--enable-full-testing \
+#--enable-test-surfaces
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
@@ -61,12 +55,12 @@
 
 check() {
   cd $_pkgbasename
-  # https://people.gnome.org/~federico/blog/helping-cairo.html
-  #make check
+  # many tests in cairo-test-suite hang forever
+  # xvfb-run make check
 }
 
 package() {
   cd $_pkgbasename
   make DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir"/usr/{include,share,bin}
+  rm -r "$pkgdir"/usr/{include,bin}
 }

Deleted: utf-8.diff
===
--- utf-8.diff  2018-09-21 17:56:42 UTC (rev 383863)
+++ utf-8.diff  2018-09-21 18:14:02 UTC (rev 383864)
@@ -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 lib32-cairo/trunk (PKGBUILD utf-8.diff)

2018-03-17 Thread Jan Steffens via arch-commits 
Date: Saturday, March 17, 2018 @ 18:02:38
  Author: heftig
Revision: 308958

1.15.10+54+g1ed124ace-1

Added:
  lib32-cairo/trunk/utf-8.diff
Modified:
  lib32-cairo/trunk/PKGBUILD

+
 PKGBUILD   |   52 +---
 utf-8.diff |   44 
 2 files changed, 85 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-17 17:57:42 UTC (rev 308957)
+++ PKGBUILD2018-03-17 18:02:38 UTC (rev 308958)
@@ -1,21 +1,41 @@
 # $Id$
-# Maintainer: Ionut Biru 
+# Contributor: Ionut Biru 
 
 _pkgbasename=cairo
 pkgname=lib32-$_pkgbasename
-pkgver=1.15.10
+pkgver=1.15.10+54+g1ed124ace
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices (32-bit)"
 url="https://cairographics.org/;
 arch=(x86_64)
-license=('LGPL' 'MPL')
-depends=('lib32-libpng' 'lib32-libxrender' 'lib32-libxext' 'lib32-fontconfig' 
'lib32-pixman' 'lib32-glib2' $_pkgbasename)
-makedepends=('gcc-multilib' 'lib32-librsvg' 'lib32-gtk2')
-source=(https://cairographics.org/snapshots/$_pkgbasename-$pkgver.tar.xz)
-sha1sums=('de180498ac563249b93ee5e17ba9aa26f90644b3')
+license=(LGPL MPL)
+depends=(lib32-libpng lib32-libxrender lib32-libxext lib32-fontconfig 
lib32-pixman lib32-glib2 $_pkgbasename)
+makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
+_commit=1ed124ace201946177eab962d3b07bb2fedf9026  # master
+source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit;
+utf-8.diff)
+sha1sums=('SKIP'
+  '3f680dea8533bcce4ca2af5d25c546235ef7b339')
 
+pkgver() {
+  cd $_pkgbasename
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd $_pkgbasename-$pkgver
+  cd $_pkgbasename
+
+  # 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
+
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -23,7 +43,7 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  cd $_pkgbasename-$pkgver
+  cd $_pkgbasename
   ./configure --prefix=/usr \
 --libdir=/usr/lib32 \
 --sysconfdir=/etc \
@@ -31,13 +51,23 @@
 --disable-static \
 --disable-gl \
 --enable-tee \
---enable-gobject
+--enable-svg \
+--enable-ps \
+--enable-pdf \
+--enable-gobject \
+--disable-gtk-doc
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
+check() {
+  cd $_pkgbasename
+  # https://people.gnome.org/~federico/blog/helping-cairo.html
+  #make check
+}
+
 package() {
-  cd $_pkgbasename-$pkgver
+  cd $_pkgbasename
   make DESTDIR="$pkgdir" install
   rm -rf "$pkgdir"/usr/{include,share,bin}
 }

Added: utf-8.diff
===
--- utf-8.diff  (rev 0)
+++ utf-8.diff  2018-03-17 18:02:38 UTC (rev 308958)
@@ -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