[arch-commits] Commit in lib32-cairo/repos/multilib-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Monday, May 18, 2020 @ 13:46:13
  Author: heftig
Revision: 629550

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD
    (from rev 629549, lib32-cairo/trunk/PKGBUILD)
Deleted:
  lib32-cairo/repos/multilib-x86_64/PKGBUILD

----------+
 PKGBUILD |  149 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 72 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-18 13:45:26 UTC (rev 629549)
+++ PKGBUILD	2020-05-18 13:46:13 UTC (rev 629550)
@@ -1,77 +0,0 @@
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=lib32-cairo
-pkgver=1.17.2+17+g52a7c79fd
-pkgrel=2
-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
-         cairo)
-makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
-checkdepends=(ttf-dejavu gsfonts)
-_commit=52a7c79fd4ff96bb5fac175f0199819b0f8c18fc  # master
-source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit"
-        0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch)
-sha256sums=('SKIP'
-            '262bf1cebc04eaae93dbfab56045ad800b3b027be303ca2611375645108f171f')
-
-pkgver() {
-  cd cairo
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd cairo
-
-  # https://bugs.archlinux.org/task/63856
-  patch -Np1 -i ../0001-image-compositor-Remove-the-right-glyph-from-pixman-.patch
-
-  # 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
-
-  # Fix typo
-  sed -i 's/have_png/use_png/g' configure.ac
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
-  cd cairo
-  ./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 \
-        --enable-full-testing \
-        --enable-test-surfaces
-  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-check() {
-  cd cairo
-  # FIXME: tests don't pass
-  env CAIRO_TEST_TARGET=image \
-      CAIRO_TEST_TARGET_FORMAT=rgba \
-      CAIRO_TESTS='!pthread-show-text' make -k check || :
-}
-
-package() {
-  cd cairo
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,bin}
-}

Copied: lib32-cairo/repos/multilib-x86_64/PKGBUILD (from rev 629549, lib32-cairo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-18 13:46:13 UTC (rev 629550)
@@ -0,0 +1,72 @@
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=lib32-cairo
+pkgver=1.17.2+25+gaee96d175
+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
+         cairo)
+makedepends=(lib32-librsvg lib32-gtk2 gtk-doc valgrind git)
+checkdepends=(ttf-dejavu gsfonts)
+_commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84  # master
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd cairo
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd cairo
+
+  # 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
+
+  # Fix typo
+  sed -i 's/have_png/use_png/g' configure.ac
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+  cd cairo
+  ./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 \
+        --enable-full-testing \
+        --enable-test-surfaces
+  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd cairo
+  # FIXME: tests don't pass
+  env CAIRO_TEST_TARGET=image \
+      CAIRO_TEST_TARGET_FORMAT=rgba \
+      CAIRO_TESTS='!pthread-show-text' make -k check || :
+}
+
+package() {
+  cd cairo
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/{include,bin}
+}