Date: Thursday, April 12, 2018 @ 09:27:47 Author: heftig Revision: 316034
archrelease: copy trunk to multilib-x86_64 Added: lib32-cairo/repos/multilib-x86_64/PKGBUILD (from rev 316033, lib32-cairo/trunk/PKGBUILD) lib32-cairo/repos/multilib-x86_64/utf-8.diff (from rev 316033, lib32-cairo/trunk/utf-8.diff) Deleted: lib32-cairo/repos/multilib-x86_64/PKGBUILD lib32-cairo/repos/multilib-x86_64/utf-8.diff ------------+ PKGBUILD | 146 +++++++++++++++++++++++++++++------------------------------ utf-8.diff | 88 +++++++++++++++++------------------ 2 files changed, 117 insertions(+), 117 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-12 09:27:25 UTC (rev 316033) +++ PKGBUILD 2018-04-12 09:27:47 UTC (rev 316034) @@ -1,73 +0,0 @@ -# $Id$ -# Contributor: Ionut Biru <ib...@archlinux.org> - -_pkgbasename=cairo -pkgname=lib32-$_pkgbasename -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=(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 - - # 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() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $_pkgbasename - ./configure --prefix=/usr \ - --libdir=/usr/lib32 \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-gl \ - --enable-tee \ - --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 - make DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/{include,share,bin} -} Copied: lib32-cairo/repos/multilib-x86_64/PKGBUILD (from rev 316033, lib32-cairo/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-12 09:27:47 UTC (rev 316034) @@ -0,0 +1,73 @@ +# $Id$ +# Contributor: Ionut Biru <ib...@archlinux.org> + +_pkgbasename=cairo +pkgname=lib32-$_pkgbasename +pkgver=1.15.12 +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=(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') + +pkgver() { + cd $_pkgbasename + git describe --tags | sed 's/-/+/g' +} + +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 + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd $_pkgbasename + ./configure --prefix=/usr \ + --libdir=/usr/lib32 \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-gl \ + --enable-tee \ + --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 + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/{include,share,bin} +} Deleted: utf-8.diff =================================================================== --- utf-8.diff 2018-04-12 09:27:25 UTC (rev 316033) +++ utf-8.diff 2018-04-12 09:27:47 UTC (rev 316034) @@ -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 Copied: lib32-cairo/repos/multilib-x86_64/utf-8.diff (from rev 316033, lib32-cairo/trunk/utf-8.diff) =================================================================== --- utf-8.diff (rev 0) +++ utf-8.diff 2018-04-12 09:27:47 UTC (rev 316034) @@ -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