[arch-commits] Commit in cairo/trunk (PKGBUILD)

2020-12-17 Thread Jan Steffens via arch-commits 
Date: Thursday, December 17, 2020 @ 16:50:59
  Author: heftig
Revision: 404449

1.17.4-3

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-17 16:00:18 UTC (rev 404448)
+++ PKGBUILD2020-12-17 16:50:59 UTC (rev 404449)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.17.4
-pkgrel=2
+pkgrel=3
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
 arch=(x86_64)
@@ -26,6 +26,10 @@
 prepare() {
   cd cairo
 
+  # Fix library versioning
+  # https://bugs.archlinux.org/task/69012
+  git cherry-pick -n e9ccb1d8d095482e4139da658e679d5aad56b184
+
   # Disable XCB backend for Xlib surfaces
   # https://bugs.archlinux.org/task/68839
   git apply -3 ../xlib-xcb.diff

[arch-commits] Commit in cairo/trunk (PKGBUILD xlib-xcb.diff)

2020-12-04 Thread Jan Steffens via arch-commits 
Date: Friday, December 4, 2020 @ 12:29:01
  Author: heftig
Revision: 402860

1.17.4-2: FS#68839: Disable xlib-xcb

Added:
  cairo/trunk/xlib-xcb.diff
Modified:
  cairo/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +---
 xlib-xcb.diff |   25 +
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-04 12:24:58 UTC (rev 402859)
+++ PKGBUILD2020-12-04 12:29:01 UTC (rev 402860)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.17.4
-pkgrel=1
+pkgrel=2
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
 arch=(x86_64)
@@ -13,8 +13,10 @@
  glib2 pixman)
 makedepends=(valgrind git meson)
 _commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2  # tags/1.17.4^0
-source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit;)
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit;
+xlib-xcb.diff)
+sha256sums=('SKIP'
+'70cd3783381bf73ea7fccd5c2db43956b10865a9c54d5edd251dbcdb9b595a43')
 
 pkgver() {
   cd cairo
@@ -23,6 +25,10 @@
 
 prepare() {
   cd cairo
+
+  # Disable XCB backend for Xlib surfaces
+  # https://bugs.archlinux.org/task/68839
+  git apply -3 ../xlib-xcb.diff
 }
 
 build() {

Added: xlib-xcb.diff
===
--- xlib-xcb.diff   (rev 0)
+++ xlib-xcb.diff   2020-12-04 12:29:01 UTC (rev 402860)
@@ -0,0 +1,25 @@
+diff --git i/meson.build w/meson.build
+index b159b4071..2a1c68891 100644
+--- i/meson.build
 w/meson.build
+@@ -313,7 +313,7 @@ endif
+ 
+ if feature_conf.get('CAIRO_HAS_XCB_SURFACE', 0) == 1 and 
feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1
+   # FIXME: automagic
+-  x11xcb_dep = dependency('x11-xcb', required: false)
++  x11xcb_dep = dependency('x11-xcb', required: get_option('xlib-xcb'))
+   if x11xcb_dep.found()
+ deps += [x11xcb_dep]
+ feature_conf.set('CAIRO_HAS_XLIB_XCB_FUNCTIONS', 1)
+diff --git i/meson_options.txt w/meson_options.txt
+index ff11fe7ed..d1ae959e1 100644
+--- i/meson_options.txt
 w/meson_options.txt
+@@ -17,6 +17,7 @@ option('qt', type : 'feature', value : 'disabled')
+ option('tee', type : 'feature', value : 'disabled')
+ option('xcb', type : 'feature', value : 'auto')
+ option('xlib', type : 'feature', value : 'auto')
++option('xlib-xcb', type : 'feature', value : 'disabled')
+ #option('xml', type : 'feature', value : 'disabled')
+ option('zlib', type : 'feature', value : 'auto') # script, ps, pdf, xml 
surfaces
+

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2020-11-30 Thread Jan Steffens via arch-commits 
Date: Monday, November 30, 2020 @ 13:17:15
  Author: heftig
Revision: 402411

1.17.4-1

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   52 
 1 file changed, 12 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-30 12:35:11 UTC (rev 402410)
+++ PKGBUILD2020-11-30 13:17:15 UTC (rev 402411)
@@ -1,17 +1,18 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.17.2+25+gaee96d175
+pkgver=1.17.4
 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)
-checkdepends=(ttf-dejavu gsfonts)
-_commit=aee96d175d8349945a6d1948a56abd4b4ec6ad84  # master
+depends=(lzo zlib libpng fontconfig freetype2 libx11 libxext libxrender libxcb
+ glib2 pixman)
+makedepends=(valgrind git meson)
+_commit=156cd3eaaebfd8635517c2baf61fcf3627ff7ec2  # tags/1.17.4^0
 source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit;)
 sha256sums=('SKIP')
 
@@ -22,45 +23,16 @@
 
 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() {
-  cd cairo
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---localstatedir=/var \
---disable-static \
---disable-gl \
---enable-tee \
---enable-svg \
---enable-ps \
---enable-pdf \
---enable-gobject \
---enable-gtk-doc \
---enable-full-testing \
---enable-test-surfaces
-  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson cairo build \
+-D spectre=disabled \
+-D tee=enabled \
+-D tests=disabled
+  meson compile -C build
 }
 
-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
+  DESTDIR="$pkgdir" meson install -C build
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2018-10-20 Thread Jan Steffens via arch-commits 
Date: Saturday, October 20, 2018 @ 21:48:01
  Author: heftig
Revision: 336918

1.16.0-1

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-20 20:55:08 UTC (rev 336917)
+++ PKGBUILD2018-10-20 21:48:01 UTC (rev 336918)
@@ -2,7 +2,7 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.15.14
+pkgver=1.16.0
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
@@ -10,17 +10,18 @@
 license=(LGPL MPL)
 depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
 makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
-_commit=d9aaea0c1e1484c632e1a6735c6ecc961c4b032b  # tags/1.15.14^0
+checkdepends=(ttf-dejavu gsfonts)
+_commit=3ad43122b21a3299dd729dc8462d6b8f7f01142d  # tags/1.16.0^0
 source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit;)
 sha1sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
+  cd cairo
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd cairo
 
   # Update gtk-doc
   cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
@@ -30,7 +31,7 @@
 }
 
 build() {
-  cd $pkgname
+  cd cairo
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
@@ -41,20 +42,22 @@
 --enable-ps \
 --enable-pdf \
 --enable-gobject \
---enable-gtk-doc
-#--enable-full-testing \
-#--enable-test-surfaces
+--enable-gtk-doc \
+--enable-full-testing \
+--enable-test-surfaces
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 check() {
-  cd $pkgname
-  # many tests in cairo-test-suite hang forever
-  # xvfb-run 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 $pkgname
+  cd cairo
   make DESTDIR="$pkgdir" install
 }

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

2018-09-21 Thread Jan Steffens via arch-commits 
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)

2018-09-04 Thread Jan Steffens via arch-commits 
Date: Tuesday, September 4, 2018 @ 16:25:29
  Author: heftig
Revision: 333297

Id,source

Modified:
  cairo/trunk/PKGBUILD  (contents, properties)

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-04 14:01:13 UTC (rev 333296)
+++ PKGBUILD2018-09-04 16:25:29 UTC (rev 333297)
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Jan de Groot 
 # Contributor: Brice Carpentier 
 
@@ -12,7 +11,7 @@
 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://anongit.freedesktop.org/git/cairo#commit=$_commit;
+source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit;
 utf-8.diff)
 sha1sums=('SKIP'
   '3f680dea8533bcce4ca2af5d25c546235ef7b339')


Property changes on: cairo/trunk/PKGBUILD
___
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2018-04-12 Thread Jan Steffens via arch-commits 
Date: Thursday, April 12, 2018 @ 09:25:07
  Author: heftig
Revision: 321628

1.15.12-1

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-12 08:16:01 UTC (rev 321627)
+++ PKGBUILD2018-04-12 09:25:07 UTC (rev 321628)
@@ -3,7 +3,7 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.15.10+54+g1ed124ace
+pkgver=1.15.12
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
@@ -11,7 +11,7 @@
 license=(LGPL MPL)
 depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
 makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
-_commit=1ed124ace201946177eab962d3b07bb2fedf9026  # master
+_commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519  # tags/1.15.12^0
 source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit;
 utf-8.diff)
 sha1sums=('SKIP'

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2018-03-17 Thread Andreas Radke via arch-commits 
Date: Saturday, March 17, 2018 @ 08:31:06
  Author: andyrtr
Revision: 319546

upgpkg: cairo 1.15.10+54+g1ed124ace-1

update to latest git commits - solves FS#57867

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-17 07:43:12 UTC (rev 319545)
+++ PKGBUILD2018-03-17 08:31:06 UTC (rev 319546)
@@ -3,7 +3,7 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.15.10+50+g14404ada8
+pkgver=1.15.10+54+g1ed124ace
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
@@ -11,7 +11,7 @@
 license=(LGPL MPL)
 depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
 makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
-_commit=14404ada80f699418263256d7d3d8dddf68be279  # master
+_commit=1ed124ace201946177eab962d3b07bb2fedf9026  # master
 source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit;
 utf-8.diff)
 sha1sums=('SKIP'

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2018-03-14 Thread Jan Steffens via arch-commits 
Date: Wednesday, March 14, 2018 @ 21:03:37
  Author: heftig
Revision: 319137

1.15.10+50+g14404ada8-1

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-14 21:01:00 UTC (rev 319136)
+++ PKGBUILD2018-03-14 21:03:37 UTC (rev 319137)
@@ -3,7 +3,7 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.15.8+120+g14404ada8
+pkgver=1.15.10+50+g14404ada8
 pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
@@ -25,6 +25,9 @@
 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

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

2018-03-08 Thread Jan Steffens via arch-commits 
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 Carpentier 
 
 pkgname=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

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2018-02-16 Thread Andreas Radke via arch-commits 
Date: Friday, February 16, 2018 @ 13:24:53
  Author: andyrtr
Revision: 317145

remove unrecognised option - FS#57522

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-16 13:16:50 UTC (rev 317144)
+++ PKGBUILD2018-02-16 13:24:53 UTC (rev 317145)
@@ -24,7 +24,6 @@
 --sysconfdir=/etc \
 --localstatedir=/var \
 --disable-static \
---disable-lto \
 --disable-gl \
 --enable-tee \
 --enable-svg \

[arch-commits] Commit in cairo/trunk (PKGBUILD color-glyph-source-op.patch)

2017-12-12 Thread Jan Steffens via arch-commits 
Date: Tuesday, December 12, 2017 @ 08:51:15
  Author: heftig
Revision: 312193

1.15.10-1

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/color-glyph-source-op.patch

-+
 PKGBUILD|   13 -
 color-glyph-source-op.patch |   39 ---
 2 files changed, 4 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-12 08:14:54 UTC (rev 312192)
+++ PKGBUILD2017-12-12 08:51:15 UTC (rev 312193)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.15.8
-pkgrel=2
+pkgver=1.15.10
+pkgrel=1
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
 arch=(x86_64)
@@ -11,16 +11,11 @@
 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
-color-glyph-source-op.patch)
-sha1sums=('07cc2031b74d7582993ec49ecbfbfb85f1c6'
-  '5d8efd47038edcf0debf0a43713bba3025f3cffd')
+source=(https://cairographics.org/snapshots/cairo-$pkgver.tar.xz)
+sha1sums=('de180498ac563249b93ee5e17ba9aa26f90644b3')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # https://bugs.freedesktop.org/show_bug.cgi?id=102661
-  patch -Np1 -i ../color-glyph-source-op.patch
 }
 
 build() {

Deleted: color-glyph-source-op.patch
===
--- color-glyph-source-op.patch 2017-12-12 08:14:54 UTC (rev 312192)
+++ color-glyph-source-op.patch 2017-12-12 08:51:15 UTC (rev 312193)
@@ -1,39 +0,0 @@
-From 99427c3f4f6ce7ce3c95c4caa4d2b8ff7c0093d9 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod 
-Date: Tue, 12 Sep 2017 01:35:15 -0400
-Subject: Handle SOURCE and CLEAR operators when painting color glyphs
-
-In cairo, most operators are composited this way:
-
-  ((src IN mask) OP dst) LERP_clip dst
-
-but SOURCE and CLEAR operators are composited this way:
-
-  (src OP dst) LERP_(clip IN mask) dst
-
-(why is this not specified anywhere in the docs or source tree?)
-
-With color glyphs, we were not special-casing SOURCE and CLEAR.
-We do now.
-
-Fixes https://bugs.freedesktop.org/show_bug.cgi?id=102661
-
-diff --git a/src/cairo-surface.c b/src/cairo-surface.c
-index 6f25bd7..35c63d7 100644
 a/src/cairo-surface.c
-+++ b/src/cairo-surface.c
-@@ -2571,7 +2571,10 @@ composite_one_color_glyph (cairo_surface_t   
*surface,
- pattern = cairo_pattern_create_for_surface ((cairo_surface_t 
*)glyph_surface);
- cairo_matrix_init_translate (, - x, - y);
- cairo_pattern_set_matrix (pattern, );
--status = surface->backend->paint (surface, op, pattern, clip);
-+  if (op == CAIRO_OPERATOR_SOURCE || op == CAIRO_OPERATOR_CLEAR)
-+status = surface->backend->mask (surface, op, pattern, pattern, clip);
-+  else
-+status = surface->backend->paint (surface, op, pattern, clip);
- }
- 
- return status;
--- 
-cgit v0.10.2
-

[arch-commits] Commit in cairo/trunk (PKGBUILD color-glyph-source-op.patch)

2017-09-14 Thread Jan Steffens 
Date: Thursday, September 14, 2017 @ 19:22:41
  Author: heftig
Revision: 305566

1.15.8-2

Added:
  cairo/trunk/color-glyph-source-op.patch
Modified:
  cairo/trunk/PKGBUILD

-+
 PKGBUILD|   15 ---
 color-glyph-source-op.patch |   39 +++
 2 files changed, 51 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-14 19:11:16 UTC (rev 305565)
+++ PKGBUILD2017-09-14 19:22:41 UTC (rev 305566)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.15.8
-pkgrel=1
+pkgrel=2
 pkgdesc="2D graphics library with support for multiple output devices"
 url="https://cairographics.org/;
 arch=(i686 x86_64)
@@ -11,9 +11,18 @@
 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=('07cc2031b74d7582993ec49ecbfbfb85f1c6')
+source=(https://cairographics.org/snapshots/cairo-$pkgver.tar.xz
+color-glyph-source-op.patch)
+sha1sums=('07cc2031b74d7582993ec49ecbfbfb85f1c6'
+  '5d8efd47038edcf0debf0a43713bba3025f3cffd')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # https://bugs.freedesktop.org/show_bug.cgi?id=102661
+  patch -Np1 -i ../color-glyph-source-op.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \

Added: color-glyph-source-op.patch
===
--- color-glyph-source-op.patch (rev 0)
+++ color-glyph-source-op.patch 2017-09-14 19:22:41 UTC (rev 305566)
@@ -0,0 +1,39 @@
+From 99427c3f4f6ce7ce3c95c4caa4d2b8ff7c0093d9 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod 
+Date: Tue, 12 Sep 2017 01:35:15 -0400
+Subject: Handle SOURCE and CLEAR operators when painting color glyphs
+
+In cairo, most operators are composited this way:
+
+  ((src IN mask) OP dst) LERP_clip dst
+
+but SOURCE and CLEAR operators are composited this way:
+
+  (src OP dst) LERP_(clip IN mask) dst
+
+(why is this not specified anywhere in the docs or source tree?)
+
+With color glyphs, we were not special-casing SOURCE and CLEAR.
+We do now.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=102661
+
+diff --git a/src/cairo-surface.c b/src/cairo-surface.c
+index 6f25bd7..35c63d7 100644
+--- a/src/cairo-surface.c
 b/src/cairo-surface.c
+@@ -2571,7 +2571,10 @@ composite_one_color_glyph (cairo_surface_t   
*surface,
+ pattern = cairo_pattern_create_for_surface ((cairo_surface_t 
*)glyph_surface);
+ cairo_matrix_init_translate (, - x, - y);
+ cairo_pattern_set_matrix (pattern, );
+-status = surface->backend->paint (surface, op, pattern, clip);
++  if (op == CAIRO_OPERATOR_SOURCE || op == CAIRO_OPERATOR_CLEAR)
++status = surface->backend->mask (surface, op, pattern, pattern, clip);
++  else
++status = surface->backend->paint (surface, op, pattern, clip);
+ }
+ 
+ return status;
+-- 
+cgit v0.10.2
+

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2017-09-08 Thread Jan Steffens 
Date: Friday, September 8, 2017 @ 17:00:26
  Author: heftig
Revision: 305071

1.15.8-1

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   59 +++
 1 file changed, 19 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-08 14:20:24 UTC (rev 305070)
+++ PKGBUILD2017-09-08 17:00:26 UTC (rev 305071)
@@ -3,56 +3,35 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.14.10
+pkgver=1.15.8
 pkgrel=1
-pkgdesc="Cairo vector graphics library"
+pkgdesc="2D graphics library with support for multiple output devices"
+url="https://cairographics.org/;
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
-url="https://cairographics.org/;
-# requires libGL + libEGL - all libgl variants (mesa, 
nvidia-xxx-libgl/nvidia-utils) provide libEGL
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'libgl' 
'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind' 'git')
- # for the test suite:
- #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
-#optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb')
-replaces=('cairo-xcb')
-source=(https://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('28c59d85d6b790c21b8b59ece73a6a1dda28d69a')
+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=('07cc2031b74d7582993ec49ecbfbfb85f1c6')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --disable-static \
-   --disable-lto \
-   --enable-tee \
-   --enable-gl \
-   --enable-egl \
-   --enable-svg \
-   --enable-ps \
-   --enable-pdf \
-   --enable-gobject \
-   --enable-gtk-doc
-   
-   #--disable-xlib-xcb \
-   #--enable-test-surfaces \ takes ages
-   #--enable-drm # breaks build
-   
+--sysconfdir=/etc \
+--localstatedir=/var \
+--disable-static \
+--disable-lto \
+--disable-gl \
+--enable-tee \
+--enable-svg \
+--enable-ps \
+--enable-pdf \
+--enable-gobject \
+--enable-gtk-doc
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
-check() {
-  cd $pkgname-$pkgver
-  #make -j1 -k test || /bin/true
-  
-  # results:
-  # 1.12.8-1   # 162 Passed, 328 Failed [  8 crashed, 10 expected], 26 Skipped
-  # 1.12.12-2: #  29 Passed, 464 Failed [460 crashed,  2 expected], 26 Skipped
-  # 1.12.16-1: # 144 Passed, 364 Failed [  6 crashed, 12 expected], 27 Skipped
-}
-
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2017-06-17 Thread Andreas Radke 
Date: Saturday, June 17, 2017 @ 08:04:50
  Author: andyrtr
Revision: 298919

upgpkg: cairo 1.14.10-1

upstream update 1.14.10

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-17 07:29:11 UTC (rev 298918)
+++ PKGBUILD2017-06-17 08:04:50 UTC (rev 298919)
@@ -3,7 +3,7 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.14.8
+pkgver=1.14.10
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
@@ -18,7 +18,7 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 source=(https://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('c6f7b99986f93c9df78653c3e6a3b5043f65145e')
+sha1sums=('28c59d85d6b790c21b8b59ece73a6a1dda28d69a')
 
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2016-12-08 Thread Andreas Radke 
Date: Thursday, December 8, 2016 @ 20:17:47
  Author: andyrtr
Revision: 282944

upgpkg: cairo 1.14.8-1

upstream update 1.14.8

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-08 19:30:51 UTC (rev 282943)
+++ PKGBUILD2016-12-08 20:17:47 UTC (rev 282944)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.14.6
-pkgrel=2
+pkgver=1.14.8
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -18,7 +18,7 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 source=(https://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5')
+sha1sums=('c6f7b99986f93c9df78653c3e6a3b5043f65145e')
 
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2016-12-02 Thread Andreas Radke 
Date: Friday, December 2, 2016 @ 08:26:10
  Author: andyrtr
Revision: 282514

use https/gpg signatures

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-02 08:25:17 UTC (rev 282513)
+++ PKGBUILD2016-12-02 08:26:10 UTC (rev 282514)
@@ -8,7 +8,7 @@
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
-url="http://cairographics.org/;
+url="https://cairographics.org/;
 # requires libGL + libEGL - all libgl variants (mesa, 
nvidia-xxx-libgl/nvidia-utils) provide libEGL
 depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'libgl' 
'lzo')
 makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind' 'git')
@@ -17,7 +17,7 @@
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
+source=(https://cairographics.org/releases/cairo-$pkgver.tar.xz)
 sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5')
 
 build() {

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2016-07-30 Thread Andreas Radke 
Date: Saturday, July 30, 2016 @ 12:24:46
  Author: andyrtr
Revision: 272708

upgpkg: cairo 1.14.6-2

depend only on libgl variants that also all provide required libegl - FS#50183

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-30 12:05:08 UTC (rev 272707)
+++ PKGBUILD2016-07-30 12:24:46 UTC (rev 272708)
@@ -4,12 +4,13 @@
 
 pkgname=cairo
 pkgver=1.14.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url="http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 
'mesa' 'libgl' 'lzo')
+# requires libGL + libEGL - all libgl variants (mesa, 
nvidia-xxx-libgl/nvidia-utils) provide libEGL
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'libgl' 
'lzo')
 makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind' 'git')
  # for the test suite:
  #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2015-12-10 Thread Andreas Radke 
Date: Thursday, December 10, 2015 @ 20:51:18
  Author: andyrtr
Revision: 255757

upgpkg: cairo 1.14.6-1

upstream update 1.14.6

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-10 15:15:03 UTC (rev 255756)
+++ PKGBUILD2015-12-10 19:51:18 UTC (rev 255757)
@@ -3,7 +3,7 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.14.4
+pkgver=1.14.6
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('5b44471e7c328f96de6830baf8ea65030de797f9')
+sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5')
 
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2015-10-31 Thread Andreas Radke 
Date: Saturday, October 31, 2015 @ 12:05:00
  Author: andyrtr
Revision: 249888

upgpkg: cairo 1.14.4-1

upstream update 1.14.4

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-31 07:00:49 UTC (rev 249887)
+++ PKGBUILD2015-10-31 11:05:00 UTC (rev 249888)
@@ -3,7 +3,7 @@
 # Contributor: Brice Carpentier 
 
 pkgname=cairo
-pkgver=1.14.2
+pkgver=1.14.4
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24')
+sha1sums=('5b44471e7c328f96de6830baf8ea65030de797f9')
 
 build() {
   cd $pkgname-$pkgver
@@ -33,7 +33,7 @@
--enable-ps \
--enable-pdf \
--enable-gobject \
---enable-gtk-doc
+   --enable-gtk-doc

#--disable-xlib-xcb \
#--enable-test-surfaces \ takes ages

[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.diff)

2015-03-11 Thread Andreas Radke 
Date: Wednesday, March 11, 2015 @ 19:52:24
  Author: andyrtr
Revision: 233362

upgpkg: cairo 1.14.2-1

upstream update 1.14.2

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/git_fixes.diff

+
 PKGBUILD   |   17 -
 git_fixes.diff |   34 --
 2 files changed, 4 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-11 18:17:35 UTC (rev 233361)
+++ PKGBUILD2015-03-11 18:52:24 UTC (rev 233362)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.14.0
-pkgrel=2
+pkgver=1.14.2
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,18 +16,9 @@
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz
-git_fixes.diff)
-sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae'
-  '0ebac538dfa510e8e3f07ba71a49dabc627b08ff')
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
+sha1sums=('c8da68aa66ca0855b5d0ff552766d3e8679e1d24')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # fix some segfaults: https://bugs.freedesktop.org/show_bug.cgi?id=85151
-  # https://bugs.archlinux.org/task/42596
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \

Deleted: git_fixes.diff
===
--- git_fixes.diff  2015-03-11 18:17:35 UTC (rev 233361)
+++ git_fixes.diff  2015-03-11 18:52:24 UTC (rev 233362)
@@ -1,34 +0,0 @@
-From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001
-From: Massimo Valentini mvalent...@src.gnome.org
-Date: Sun, 19 Oct 2014 09:19:10 +0200
-Subject: tor-scan-converter: can't do_fullrow when intersection in row +
- 0.5subrow
-
-the active edges list must be left sorted at the next possible use
-and since full_row does not deal with intersections it is not usable
-when there is an intersection in the top half of the next row first
-subrow
-
-Reported-and-tested-by: Matthew Leach
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151
-Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
-
-diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
-index 4adcafb..14922d0 100644
 a/src/cairo-tor-scan-converter.c
-+++ b/src/cairo-tor-scan-converter.c
-@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
- 
-   if (e-dy) {
-   struct quorem x = e-x;
--  x.quo += e-dxdy_full.quo - e-dxdy.quo/2;
--  x.rem += e-dxdy_full.rem - e-dxdy.rem/2;
-+  x.quo += e-dxdy_full.quo;
-+  x.rem += e-dxdy_full.rem;
-   if (x.rem  0) {
-   x.quo--;
-   x.rem += e-dy;
--- 
-cgit v0.10.2
-
-

[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.diff)

2014-10-29 Thread Andreas Radke 
Date: Wednesday, October 29, 2014 @ 15:52:43
  Author: andyrtr
Revision: 225432

upgpkg: cairo 1.14.0-2

fix a segfault; FS#42596

Added:
  cairo/trunk/git_fixes.diff
Modified:
  cairo/trunk/PKGBUILD

+
 PKGBUILD   |   15 ---
 git_fixes.diff |   34 ++
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-29 14:09:55 UTC (rev 225431)
+++ PKGBUILD2014-10-29 14:52:43 UTC (rev 225432)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,9 +16,18 @@
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
-sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae')
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz
+git_fixes.diff)
+sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae'
+  '0ebac538dfa510e8e3f07ba71a49dabc627b08ff')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # fix some segfaults: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+  # https://bugs.archlinux.org/task/42596
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \

Added: git_fixes.diff
===
--- git_fixes.diff  (rev 0)
+++ git_fixes.diff  2014-10-29 14:52:43 UTC (rev 225432)
@@ -0,0 +1,34 @@
+From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001
+From: Massimo Valentini mvalent...@src.gnome.org
+Date: Sun, 19 Oct 2014 09:19:10 +0200
+Subject: tor-scan-converter: can't do_fullrow when intersection in row +
+ 0.5subrow
+
+the active edges list must be left sorted at the next possible use
+and since full_row does not deal with intersections it is not usable
+when there is an intersection in the top half of the next row first
+subrow
+
+Reported-and-tested-by: Matthew Leach
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151
+Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
+index 4adcafb..14922d0 100644
+--- a/src/cairo-tor-scan-converter.c
 b/src/cairo-tor-scan-converter.c
+@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
+ 
+   if (e-dy) {
+   struct quorem x = e-x;
+-  x.quo += e-dxdy_full.quo - e-dxdy.quo/2;
+-  x.rem += e-dxdy_full.rem - e-dxdy.rem/2;
++  x.quo += e-dxdy_full.quo;
++  x.rem += e-dxdy_full.rem;
+   if (x.rem  0) {
+   x.quo--;
+   x.rem += e-dy;
+-- 
+cgit v0.10.2
+
+

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2014-10-14 Thread Jan de Groot 
Date: Tuesday, October 14, 2014 @ 15:50:10
  Author: jgc
Revision: 224321

upgpkg: cairo 1.14.0-1

Update to 1.14.0 release

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-14 13:38:43 UTC (rev 224320)
+++ PKGBUILD2014-10-14 13:50:10 UTC (rev 224321)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.13.1
-pkgrel=2
+pkgver=1.14.0
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,13 +16,11 @@
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=('git://anongit.freedesktop.org/cairo#commit=fbb0a260b707cb5f02a14cc368c6f2f0d63564c3')
-sha1sums=('SKIP')
+source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz)
+sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae')
 
 build() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
-
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -45,7 +43,7 @@
 }
 
 check() {
-  cd $pkgname
+  cd $pkgname-$pkgver
   #make -j1 -k test || /bin/true
   
   # results:
@@ -55,6 +53,6 @@
 }
 
 package() {
-  cd $pkgname
+  cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD cairo-1.12.16-lto-optional.patch)

2014-09-24 Thread Jan Steffens 
Date: Thursday, September 25, 2014 @ 00:16:36
  Author: heftig
Revision: 222967

bump commit

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/cairo-1.12.16-lto-optional.patch

--+
 PKGBUILD |   16 +++-
 cairo-1.12.16-lto-optional.patch |   29 -
 2 files changed, 7 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-24 22:10:18 UTC (rev 222966)
+++ PKGBUILD2014-09-24 22:16:36 UTC (rev 222967)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,7 +16,7 @@
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=('git://anongit.freedesktop.org/cairo#commit=29a8b4e970379ca04a7db8e63c71bb34c0e349ce')
+source=('git://anongit.freedesktop.org/cairo#commit=fbb0a260b707cb5f02a14cc368c6f2f0d63564c3')
 sha1sums=('SKIP')
 
 build() {
@@ -35,11 +35,10 @@
--enable-ps \
--enable-pdf \
--enable-gobject \
---enable-gtk-doc #\
-   # --enable-test-surfaces
+--enable-gtk-doc

#--disable-xlib-xcb \
-   # --enable-test-surfaces \ takes ages
+   #--enable-test-surfaces \ takes ages
#--enable-drm # breaks build

   make
@@ -50,10 +49,9 @@
   #make -j1 -k test || /bin/true
   
   # results:
-  # 1.12.8-1   # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
-  # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
-  # 1.12.16-1: 144 Passed, 364 Failed [6 crashed, 12 expected], 27 Skipped
-
+  # 1.12.8-1   # 162 Passed, 328 Failed [  8 crashed, 10 expected], 26 Skipped
+  # 1.12.12-2: #  29 Passed, 464 Failed [460 crashed,  2 expected], 26 Skipped
+  # 1.12.16-1: # 144 Passed, 364 Failed [  6 crashed, 12 expected], 27 Skipped
 }
 
 package() {

Deleted: cairo-1.12.16-lto-optional.patch
===
--- cairo-1.12.16-lto-optional.patch2014-09-24 22:10:18 UTC (rev 222966)
+++ cairo-1.12.16-lto-optional.patch2014-09-24 22:16:36 UTC (rev 222967)
@@ -1,29 +0,0 @@
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f984eb2..15b3da2 100644
 a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -38,13 +38,18 @@ dnl options.  Namely, the following:
- 
- dnl -flto working really needs a test link, not just a compile
- 
--safe_MAYBE_WARN=$MAYBE_WARN
--MAYBE_WARN=$MAYBE_WARN -flto
--AC_TRY_LINK([],[
-+AC_ARG_ENABLE(lto,
-+  AS_HELP_STRING([--disable-lto],
-+ [Do not try to use Link-Time Optimization]))
-+if test x$enable_lto != xno; then
-+  safe_MAYBE_WARN=$MAYBE_WARN
-+  MAYBE_WARN=$MAYBE_WARN -flto
-+  AC_TRY_LINK([],[
-   int main(int argc, char **argv) { return 0; }
--],[],[
-+  ],[],[
-   MAYBE_WARN=$safe_MAYBE_WARN
--])
-+  ])
-+fi
- 
- MAYBE_WARN=$MAYBE_WARN -fno-strict-aliasing -fno-common
- 
-

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2014-09-04 Thread Jan de Groot 
Date: Thursday, September 4, 2014 @ 21:56:57
  Author: jgc
Revision: 220960

upgpkg: cairo 1.13.1-1

Update to git snapshot

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   36 ++--
 1 file changed, 14 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-04 19:00:08 UTC (rev 220959)
+++ PKGBUILD2014-09-04 19:56:57 UTC (rev 220960)
@@ -3,34 +3,25 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.12.16
-pkgrel=3
+pkgver=1.13.1
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'libgl' 'sh' 'lzo')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'libgl' 'lzo')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind' 'git')
  # for the test suite:
- 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+ #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-cairo-1.12.16-lto-optional.patch)
-sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
-  '80883e44a57942762995aea2f136701b1fa54568')
+source=('git://anongit.freedesktop.org/cairo#commit=29a8b4e970379ca04a7db8e63c71bb34c0e349ce')
+sha1sums=('SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782
-  # patch to make it optional is taken from Gentoo
-  patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch
-  autoreconf -vfi
-}
-
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 
   ./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -43,7 +34,8 @@
--enable-svg \
--enable-ps \
--enable-pdf \
-   --enable-gobject #\
+   --enable-gobject \
+--enable-gtk-doc #\
# --enable-test-surfaces

#--disable-xlib-xcb \
@@ -54,8 +46,8 @@
 }
 
 check() {
-  cd $pkgname-$pkgver
-  make -k test || /bin/true
+  cd $pkgname
+  #make -j1 -k test || /bin/true
   
   # results:
   # 1.12.8-1   # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
@@ -65,6 +57,6 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2014-08-01 Thread Andreas Radke 
Date: Friday, August 1, 2014 @ 10:12:56
  Author: andyrtr
Revision: 218480

upgpkg: cairo 1.12.16-3

lzo2 has been renamed to lzo

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-01 07:04:34 UTC (rev 218479)
+++ PKGBUILD2014-08-01 08:12:56 UTC (rev 218480)
@@ -4,12 +4,12 @@
 
 pkgname=cairo
 pkgver=1.12.16
-pkgrel=2
+pkgrel=3
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'libgl' 'sh' 'lzo2')
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'libgl' 'sh' 'lzo')
 makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
  # for the test suite:
  'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')

[arch-commits] Commit in cairo/trunk (PKGBUILD cairo-1.12.16-lto-optional.patch)

2014-05-29 Thread Andreas Radke 
Date: Thursday, May 29, 2014 @ 18:21:26
  Author: andyrtr
Revision: 213823

upgpkg: cairo 1.12.16-2

fix build with gcc4.9 - make lto optional and disable it for now

Added:
  cairo/trunk/cairo-1.12.16-lto-optional.patch
Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 cairo-1.12.16-lto-optional.patch |   29 +
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-29 12:21:35 UTC (rev 213822)
+++ PKGBUILD2014-05-29 16:21:26 UTC (rev 213823)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.12.16
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,9 +16,19 @@
 #optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+cairo-1.12.16-lto-optional.patch)
+sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec'
+  '80883e44a57942762995aea2f136701b1fa54568')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782
+  # patch to make it optional is taken from Gentoo
+  patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch
+  autoreconf -vfi
+}
+
 build() {
   cd $pkgname-$pkgver
 
@@ -26,6 +36,7 @@
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
+   --disable-lto \
--enable-tee \
--enable-gl \
--enable-egl \

Added: cairo-1.12.16-lto-optional.patch
===
--- cairo-1.12.16-lto-optional.patch(rev 0)
+++ cairo-1.12.16-lto-optional.patch2014-05-29 16:21:26 UTC (rev 213823)
@@ -0,0 +1,29 @@
+diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
+index f984eb2..15b3da2 100644
+--- a/build/configure.ac.warnings
 b/build/configure.ac.warnings
+@@ -38,13 +38,18 @@ dnl options.  Namely, the following:
+ 
+ dnl -flto working really needs a test link, not just a compile
+ 
+-safe_MAYBE_WARN=$MAYBE_WARN
+-MAYBE_WARN=$MAYBE_WARN -flto
+-AC_TRY_LINK([],[
++AC_ARG_ENABLE(lto,
++  AS_HELP_STRING([--disable-lto],
++ [Do not try to use Link-Time Optimization]))
++if test x$enable_lto != xno; then
++  safe_MAYBE_WARN=$MAYBE_WARN
++  MAYBE_WARN=$MAYBE_WARN -flto
++  AC_TRY_LINK([],[
+   int main(int argc, char **argv) { return 0; }
+-],[],[
++  ],[],[
+   MAYBE_WARN=$safe_MAYBE_WARN
+-])
++  ])
++fi
+ 
+ MAYBE_WARN=$MAYBE_WARN -fno-strict-aliasing -fno-common
+ 
+

[arch-commits] Commit in cairo/trunk (PKGBUILD libpng16.patch)

2013-08-27 Thread Andreas Radke 
Date: Tuesday, August 27, 2013 @ 16:03:11
  Author: andyrtr
Revision: 193674

upgpkg: cairo 1.12.16-1

upstream update 1.12..16

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/libpng16.patch

+
 PKGBUILD   |   31 ---
 libpng16.patch |   40 
 2 files changed, 16 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-27 06:28:04 UTC (rev 193673)
+++ PKGBUILD2013-08-27 14:03:11 UTC (rev 193674)
@@ -3,14 +3,14 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.12.14
-pkgrel=4
+pkgver=1.12.16
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa=9.1' 'libgl' 'sh' 'lzo2')
-makedepends=('mesa-libgl=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'libgl' 'sh' 'lzo2')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
  # for the test suite:
  'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
@@ -17,16 +17,12 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-libpng16.patch)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15'
-  'c9911f185637d266ce1d2985bd6fb7d0df3d75b2')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../libpng16.patch
-
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -47,12 +43,17 @@
   make
 }
 
-#check() {
-#  cd $srcdir/$pkgname-$pkgver
-  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 
expected], 26 Skipped
-#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 
26 Skipped
-#}
+check() {
+  cd $pkgname-$pkgver
+  make -k test || /bin/true
+  
+  # results:
+  # 1.12.8-1   # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+  # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
+  # 1.12.16-1: 144 Passed, 364 Failed [6 crashed, 12 expected], 27 Skipped
 
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install

Deleted: libpng16.patch
===
--- libpng16.patch  2013-08-27 06:28:04 UTC (rev 193673)
+++ libpng16.patch  2013-08-27 14:03:11 UTC (rev 193674)
@@ -1,40 +0,0 @@
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson ch...@chris-wilson.co.uk
-Date: Tue, 16 Apr 2013 09:58:56 +
-Subject: png: Avoid marking the surface as in error after a png warning
-
-It turns out that libpng will continue to load an image after throwing a
-warning, and that libpng16 now throws warnings for images that libpng15
-and earlier loaded without error. As we were happily loading those
-images into cairo surfaces before, we are therefore being overzealous
-in throwing an error now - so just squelch the warning.
-
-Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

-diff --git a/src/cairo-png.c b/src/cairo-png.c
-index e74a4a8..068617d 100644
 a/src/cairo-png.c
-+++ b/src/cairo-png.c
-@@ -149,13 +149,13 @@ static void
- png_simple_warning_callback (png_structp png,
-png_const_charp error_msg)
- {
--cairo_status_t *error = png_get_error_ptr (png);
--
--/* default to the most likely error */
--if (*error == CAIRO_STATUS_SUCCESS)
--  *error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--/* png does not expect to abort and will try to tidy up after a warning */
-+/* png does not expect to abort and will try to tidy up and continue
-+ * loading the image after a warning. So we also want to return the
-+ * (incorrect?) surface.
-+ *
-+ * We use our own warning callback to squelch any attempts by libpng
-+ * to write to stderr as we may not be in control of that output.
-+ */
- }
- 
- 
---
-cgit v0.9.0.2-2-gbebe

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-06-25 Thread Andreas Radke 
Date: Tuesday, June 25, 2013 @ 21:58:19
  Author: andyrtr
Revision: 188930

fix FS#35930

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-25 17:07:01 UTC (rev 188929)
+++ PKGBUILD2013-06-25 19:58:19 UTC (rev 188930)
@@ -9,8 +9,8 @@
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
-makedepends=('mesa=9.1' 'mesa-libgl=9.1' 'librsvg' 'gtk2' 'poppler-glib' 
'libspectre' 'gtk-doc' 'valgrind'
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa=9.1' 'libgl' 'sh' 'lzo2')
+makedepends=('mesa-libgl=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
  # for the test suite:
  'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
@@ -54,8 +54,6 @@
 #}
 
 package() {
-  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh' 'lzo2')
-
   cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD libpng16.patch)

2013-04-27 Thread Ionuț Mircea Bîru 
Date: Saturday, April 27, 2013 @ 15:05:52
  Author: ioni
Revision: 183722

libpng 1.6 rebuild

Added:
  cairo/trunk/libpng16.patch
Modified:
  cairo/trunk/PKGBUILD

+
 PKGBUILD   |   17 +++--
 libpng16.patch |   40 
 2 files changed, 51 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-27 13:02:07 UTC (rev 183721)
+++ PKGBUILD2013-04-27 13:05:52 UTC (rev 183722)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.12.14
-pkgrel=3
+pkgrel=4
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -17,11 +17,16 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+libpng16.patch)
+sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15'
+  'c9911f185637d266ce1d2985bd6fb7d0df3d75b2')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../libpng16.patch
+
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -49,8 +54,8 @@
 #}
 
 package() {
-  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
+  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh' 'lzo2')
 
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Added: libpng16.patch
===
--- libpng16.patch  (rev 0)
+++ libpng16.patch  2013-04-27 13:05:52 UTC (rev 183722)
@@ -0,0 +1,40 @@
+From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Tue, 16 Apr 2013 09:58:56 +
+Subject: png: Avoid marking the surface as in error after a png warning
+
+It turns out that libpng will continue to load an image after throwing a
+warning, and that libpng16 now throws warnings for images that libpng15
+and earlier loaded without error. As we were happily loading those
+images into cairo surfaces before, we are therefore being overzealous
+in throwing an error now - so just squelch the warning.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+diff --git a/src/cairo-png.c b/src/cairo-png.c
+index e74a4a8..068617d 100644
+--- a/src/cairo-png.c
 b/src/cairo-png.c
+@@ -149,13 +149,13 @@ static void
+ png_simple_warning_callback (png_structp png,
+png_const_charp error_msg)
+ {
+-cairo_status_t *error = png_get_error_ptr (png);
+-
+-/* default to the most likely error */
+-if (*error == CAIRO_STATUS_SUCCESS)
+-  *error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+-
+-/* png does not expect to abort and will try to tidy up after a warning */
++/* png does not expect to abort and will try to tidy up and continue
++ * loading the image after a warning. So we also want to return the
++ * (incorrect?) surface.
++ *
++ * We use our own warning callback to squelch any attempts by libpng
++ * to write to stderr as we may not be in control of that output.
++ */
+ }
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-02-23 Thread Andreas Radke 
Date: Saturday, February 23, 2013 @ 11:06:24
  Author: andyrtr
Revision: 178458

upgpkg: cairo 1.12.14-2

fix deps for new unified Mesa 9.1

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 08:29:13 UTC (rev 178457)
+++ PKGBUILD2013-02-23 10:06:24 UTC (rev 178458)
@@ -4,14 +4,13 @@
 
 pkgname=cairo
 pkgver=1.12.14
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'sh'
- 'libgl' 'libegl')
-makedepends=('mesa' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 
'valgrind'
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'sh')
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
  # for the test suite:
  'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-02-23 Thread Andreas Radke 
Date: Saturday, February 23, 2013 @ 12:06:24
  Author: andyrtr
Revision: 178460

upgpkg: cairo 1.12.14-3

cairo truely needs libgl; move deps to package function to avoid pulling in old 
libgl/mesa before new makedeps

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-23 10:06:51 UTC (rev 178459)
+++ PKGBUILD2013-02-23 11:06:24 UTC (rev 178460)
@@ -4,13 +4,13 @@
 
 pkgname=cairo
 pkgver=1.12.14
-pkgrel=2
+pkgrel=3
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'mesa' 'sh')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 
'gtk-doc' 'valgrind'
+# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
+makedepends=('mesa=9.1' 'mesa-libgl=9.1' 'librsvg' 'gtk2' 'poppler-glib' 
'libspectre' 'gtk-doc' 'valgrind'
  # for the test suite:
  'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
@@ -49,6 +49,8 @@
 #}
 
 package() {
+  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 
'glib2' 'mesa=9.1' 'libgl' 'sh') 
+
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-02-10 Thread Andreas Radke 
Date: Sunday, February 10, 2013 @ 20:20:07
  Author: andyrtr
Revision: 177921

upgpkg: cairo 1.12.14-1

upstream update 1.12.14

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-10 18:57:08 UTC (rev 177920)
+++ PKGBUILD2013-02-10 19:20:07 UTC (rev 177921)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.12.12
-pkgrel=2
+pkgver=1.12.14
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -19,7 +19,7 @@
 replaces=('cairo-xcb')
 options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('8e597874da5b861287893d87dd4ab32471e99c82')
+sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -33,8 +33,8 @@
--enable-svg \
--enable-ps \
--enable-pdf \
-   --enable-gobject \
-   --enable-test-surfaces
+   --enable-gobject #\
+   # --enable-test-surfaces

#--disable-xlib-xcb \
# --enable-test-surfaces \ takes ages

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-02-09 Thread Andreas Radke 
Date: Saturday, February 9, 2013 @ 13:37:18
  Author: andyrtr
Revision: 177810

upgpkg: cairo 1.12.12-2

enable GL+EGL backends for Wayland/Weston use; enable xlib-xcb

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   25 +++--
 1 file changed, 19 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-09 09:19:23 UTC (rev 177809)
+++ PKGBUILD2013-02-09 12:37:18 UTC (rev 177810)
@@ -4,14 +4,17 @@
 
 pkgname=cairo
 pkgver=1.12.12
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'sh')
-makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind') # 
'libdrm')
-optdepends=('xcb-util: for XCB backend') # really needed?
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'sh'
+ 'libgl' 'libegl')
+makedepends=('mesa' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 
'valgrind'
+ # for the test suite:
+ 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+#optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
@@ -25,15 +28,25 @@
--localstatedir=/var \
--disable-static \
--enable-tee \
-   --disable-xlib-xcb \
+   --enable-gl \
+   --enable-egl \
+   --enable-svg \
+   --enable-ps \
+   --enable-pdf \
+   --enable-gobject \
+   --enable-test-surfaces
+   
+   #--disable-xlib-xcb \
# --enable-test-surfaces \ takes ages
#--enable-drm # breaks build
+   
   make
 }
 
 #check() {
 #  cd $srcdir/$pkgname-$pkgver
-#  make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 
expected], 26 Skipped
+  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 
expected], 26 Skipped
+#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 
26 Skipped
 #}
 
 package() {

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2013-01-17 Thread andyrtr 
Date: Thursday, January 17, 2013 @ 10:31:02
  Author: andyrtr
Revision: 175506

upgpkg: cairo 1.12.10-1

upstream update 1.12.10

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-17 15:01:31 UTC (rev 175505)
+++ PKGBUILD2013-01-17 15:31:02 UTC (rev 175506)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.12.8
-pkgrel=2
+pkgver=1.12.10
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,7 +16,7 @@
 replaces=('cairo-xcb')
 options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('56a10bf3b804367c97734d655c23a9f652d5c297')
+sha1sums=('be06d5aaa272bbbd08380f71ca710d5612881493')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2012-11-08 Thread andyrtr 
Date: Thursday, November 8, 2012 @ 12:26:51
  Author: andyrtr
Revision: 170558

upgpkg: cairo 1.12.8-2

rebuild to pick up new pixman 0.28 features

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-08 17:08:27 UTC (rev 170557)
+++ PKGBUILD2012-11-08 17:26:51 UTC (rev 170558)
@@ -4,13 +4,13 @@
 
 pkgname=cairo
 pkgver=1.12.8
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'sh')
-makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
+depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman=0.28.0' 'glib2' 
'sh')
+makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind') # 
'libdrm')
 optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')

[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.diff)

2012-10-31 Thread andyrtr 
Date: Wednesday, October 31, 2012 @ 03:41:50
  Author: andyrtr
Revision: 170044

upgpkg: cairo 1.12.6-2

update to latest git commits - should solve FS#32272; drop buggy gradient patch 
that should be obsolete with latest Xorg

Added:
  cairo/trunk/git_fixes.diff
Modified:
  cairo/trunk/PKGBUILD

+
 PKGBUILD   |   15 
 git_fixes.diff |  934 +++
 2 files changed, 945 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-31 07:26:06 UTC (rev 170043)
+++ PKGBUILD2012-10-31 07:41:50 UTC (rev 170044)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.12.6
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,14 +16,21 @@
 replaces=('cairo-xcb')
 options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-cairo-1.10.0-buggy_gradients.patch)
+cairo-1.10.0-buggy_gradients.patch
+git_fixes.diff)
 sha1sums=('a383c6cb4495e18848ea43e1031c294aa9417a43'
-  '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
+  '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04'
+  '31b3179cda0afa2e2f037d6850fd8607383cb95a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
+#  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
 
+  # status: 
http://cgit.freedesktop.org/cairo/commit/?id=66625cb46c985321c46b79d2163a4d676d6700ba
+  # 2012-10-30 12:40:41 (GMT)
+  # xlib: Apply the image offsets to the destination rather the source
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+
 #  autoreconf -vfi
   ./configure --prefix=/usr \
--sysconfdir=/etc \

Added: git_fixes.diff
===
--- git_fixes.diff  (rev 0)
+++ git_fixes.diff  2012-10-31 07:41:50 UTC (rev 170044)
@@ -0,0 +1,934 @@
+From e43f53bf7f3d371116f31f22ab9754b08b5abe7f Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Mon, 22 Oct 2012 12:47:11 +
+Subject: version: Post release bump to 1.12.7
+
+---
+diff --git a/cairo-version.h b/cairo-version.h
+index dc89a19..c685909 100644
+--- a/cairo-version.h
 b/cairo-version.h
+@@ -3,6 +3,6 @@
+ 
+ #define CAIRO_VERSION_MAJOR 1
+ #define CAIRO_VERSION_MINOR 12
+-#define CAIRO_VERSION_MICRO 6
++#define CAIRO_VERSION_MICRO 7
+ 
+ #endif
+--
+cgit v0.9.0.2-2-gbebe
+From 00feb8ce530a472abbde445b52d9ae8c99ec97f0 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Fri, 26 Oct 2012 09:51:31 +
+Subject: xlib/shm: Sanity check that the server handles XSendEvent with 
ShmCompletion
+
+Uli Schlachter suggested it would be wiser to complement our blacklist
+of known broken X/libXext with an explicit roundtrip to check for a
+BadValue error return when we try to use XSendEvent.
+
+Suggested-by: Uli Schlachter psyc...@znc.in
+Reported-by: Martin Husemann mar...@duskware.de
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
+index ec0d334..17594b1 100644
+--- a/src/cairo-xlib-surface-shm.c
 b/src/cairo-xlib-surface-shm.c
+@@ -1128,8 +1128,60 @@ _cairo_xlib_shm_surface_is_idle (cairo_surface_t 
*surface)
+ (((major) * 1000) + ((minor) * 10) + ((patch) * 1000) + snap)
+ 
+ static cairo_bool_t
+-xorg_has_buggy_send_shm_completion_event(Display *dpy)
++has_broken_send_shm_event (cairo_xlib_display_t *display,
++ cairo_xlib_shm_display_t *shm)
+ {
++Display *dpy = display-display;
++int (*old_handler) (Display *display, XErrorEvent *event);
++XShmCompletionEvent ev;
++XShmSegmentInfo info;
++
++info.shmid = shmget (IPC_PRIVATE, 0x1000, IPC_CREAT | 0600);
++if (info.shmid == -1)
++  return TRUE;
++
++info.readOnly = FALSE;
++info.shmaddr = shmat (info.shmid, NULL, 0);
++if (info.shmaddr == (char *) -1) {
++  shmctl (info.shmid, IPC_RMID, NULL);
++  return TRUE;
++}
++
++ev.type = shm-event;
++ev.drawable = shm-window;
++ev.major_code = shm-opcode;
++ev.minor_code = X_ShmPutImage;
++
++ev.shmseg = info.shmid;
++ev.offset = 0;
++
++assert (CAIRO_MUTEX_IS_LOCKED (_cairo_xlib_display_mutex));
++_x_error_occurred = FALSE;
++
++XLockDisplay (dpy);
++XSync (dpy, False);
++old_handler = XSetErrorHandler (_check_error_handler);
++
++XShmAttach (dpy, info);
++XSendEvent (dpy, ev.drawable, False, 0, (XEvent *)ev);
++XShmDetach (dpy, info);
++
++XSync (dpy, False);
++XSetErrorHandler (old_handler);
++XUnlockDisplay (dpy);
++
++shmctl (info.shmid, IPC_RMID, NULL);
++shmdt (info.shmaddr);
++
++return _x_error_occurred;
++}
++
++static cairo_bool_t
++xorg_has_buggy_send_shm_completion_event(cairo_xlib_display_t *display,
++

[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.patch)

2012-10-22 Thread andyrtr 
Date: Monday, October 22, 2012 @ 13:33:15
  Author: andyrtr
Revision: 169505

upgpkg: cairo 1.12.6-1

upstream update 1.12.6 - FreeNX is still broken

Modified:
  cairo/trunk/PKGBUILD
Deleted:
  cairo/trunk/git_fixes.patch

-+
 PKGBUILD|9 
 git_fixes.patch | 1086 --
 2 files changed, 5 insertions(+), 1090 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 169504:169505 to see the changes.

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2012-04-30 Thread andyrtr 
Date: Monday, April 30, 2012 @ 10:17:18
  Author: andyrtr
Revision: 157980

upgpkg: cairo 1.12.2-1

upstream update 1.12.2

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-30 12:31:14 UTC (rev 157979)
+++ PKGBUILD2012-04-30 14:17:18 UTC (rev 157980)
@@ -3,9 +3,9 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-_gitdate=20120426
-_gitver=957a9cc619965178a8927d114fe852034fc2385c
-pkgver=1.12.0.20120426
+#_gitdate=20120426
+#_gitver=957a9cc619965178a8927d114fe852034fc2385c
+pkgver=1.12.2
 pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
@@ -17,23 +17,23 @@
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(#http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
-
$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz
 
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+
#$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz
 
 cairo-1.10.0-buggy_gradients.patch
 #git_fixes.patch 
 )
-md5sums=('0495ca6aab85f4936112635baba1bf85'
+md5sums=('87649eb75789739d517c743e94879e51'
  '9b323790dab003e228c6955633cb888e')
 
 build() {
-  #cd $srcdir/$pkgname-$pkgver
-  cd ${srcdir}/${pkgname}-${_gitver}
+  cd $srcdir/$pkgname-$pkgver
+  #cd ${srcdir}/${pkgname}-${_gitver}
   patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
   # status is 2012-04-26 last commit: image: Fix typo in _blit_spans()
   #patch -Np1 -i ${srcdir}/git_fixes.patch
-  #autoreconf -vfi
-  #./configure --prefix=/usr \
-  ./autogen.sh --prefix=/usr \
+  autoreconf -vfi
+  #./autogen.sh --prefix=/usr \
+  ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
@@ -51,7 +51,7 @@
 #}
 
 package() {
-  #cd $srcdir/$pkgname-$pkgver
-  cd $srcdir/$pkgname-${_gitver}
+  cd $srcdir/$pkgname-$pkgver
+  #cd $srcdir/$pkgname-${_gitver}
   make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2012-04-26 Thread andyrtr 
Date: Thursday, April 26, 2012 @ 13:35:34
  Author: andyrtr
Revision: 157258

upgpkg: cairo 1.12.0.20120426-1

update git snapshot to solve more bugs

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   41 -
 1 file changed, 24 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-26 15:46:35 UTC (rev 157257)
+++ PKGBUILD2012-04-26 17:35:34 UTC (rev 157258)
@@ -3,32 +3,37 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.12.0
-pkgrel=4
+_gitdate=20120426
+_gitver=957a9cc619965178a8927d114fe852034fc2385c
+pkgver=1.12.0.20120426
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
 depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
-makedepends=('librsvg' 'poppler-glib' 'libspectre') # 'libdrm')
+makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
 optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
+source=(#http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
+
$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz
 
 cairo-1.10.0-buggy_gradients.patch
-git_fixes.patch )
-md5sums=('e6c85575ba7094f88b637bdfd835a751'
- '9b323790dab003e228c6955633cb888e'
- 'ce32ba4639d910bce7159c9a67ff2355')
+#git_fixes.patch 
+)
+md5sums=('0495ca6aab85f4936112635baba1bf85'
+ '9b323790dab003e228c6955633cb888e')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-  # status is 2012-04-14 last commit: doc: add returns statement to 
cairo_surface_supports_mime_type
-  patch -Np1 -i ${srcdir}/git_fixes.patch
-  autoreconf -vfi
-  ./configure --prefix=/usr \
+  #cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${_gitver}
+  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
+  # status is 2012-04-26 last commit: image: Fix typo in _blit_spans()
+  #patch -Np1 -i ${srcdir}/git_fixes.patch
+  #autoreconf -vfi
+  #./configure --prefix=/usr \
+  ./autogen.sh --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
@@ -40,11 +45,13 @@
 }
 
 #check() {
-#  cd $srcdir/$pkgname-$pkgver
-#  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 
Skipped
+#  #cd $srcdir/$pkgname-$pkgver
+#  cd $srcdir/$pkgname-${_gitver}
+#  make -k check || /bin/true # 165 Passed, 316 Failed [3 crashed, 10 
expected], 23 Skipped
 #}
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  #cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-${_gitver}
   make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.patch)

2012-04-14 Thread andyrtr 
Date: Saturday, April 14, 2012 @ 04:58:24
  Author: andyrtr
Revision: 156122

upgpkg: cairo 1.12.0-4

add more upstream post release git fixes

Modified:
  cairo/trunk/PKGBUILD
  cairo/trunk/git_fixes.patch

-+
 PKGBUILD|7 
 git_fixes.patch |  512 ++
 2 files changed, 516 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-14 08:57:18 UTC (rev 156121)
+++ PKGBUILD2012-04-14 08:58:24 UTC (rev 156122)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.12.0
-pkgrel=3
+pkgrel=4
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -20,13 +20,14 @@
 git_fixes.patch )
 md5sums=('e6c85575ba7094f88b637bdfd835a751'
  '9b323790dab003e228c6955633cb888e'
- '31aff4a4d8943ed81dce398f6421487d')
+ 'ce32ba4639d910bce7159c9a67ff2355')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-  # status is 2012-04-07 last commit: fix _cairo_pattern_get_ink_extents to 
work with snapshot recording surfaces
+  # status is 2012-04-14 last commit: doc: add returns statement to 
cairo_surface_supports_mime_type
   patch -Np1 -i ${srcdir}/git_fixes.patch
+  autoreconf -vfi
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \

Modified: git_fixes.patch
===
--- git_fixes.patch 2012-04-14 08:57:18 UTC (rev 156121)
+++ git_fixes.patch 2012-04-14 08:58:24 UTC (rev 156122)
@@ -572,3 +572,515 @@
cairo_box_t box;
 --
 cgit v0.9.0.2-2-gbebe
+From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Sun, 08 Apr 2012 10:28:59 +
+Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes
+
+A typo using half_line_x instead of half_line_y when emitting dashed
+segments of the rectilinear stroke.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c
+index 3e8c5a4..cc9dd19 100644
+--- a/src/cairo-path-stroke-boxes.c
 b/src/cairo-path-stroke-boxes.c
+@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed 
(cairo_rectilinear_stroker_t *st
+   box.p1.x = box.p2.x - half_line_x;
+   }
+   if (out_slope.dy = 0)
+-  box.p1.y -= half_line_x;
++  box.p1.y -= half_line_y;
+   if (out_slope.dy = 0)
+-  box.p2.y += half_line_x;
++  box.p2.y += half_line_y;
+   } else {
+   if (box.p1.y = box.p2.y) {
+   box.p1.y = box.p2.y;
+-  box.p2.y += half_line_x;
++  box.p2.y += half_line_y;
+   } else {
+-  box.p1.y = box.p2.y - half_line_x;
++  box.p1.y = box.p2.y - half_line_y;
+   }
+   if (out_slope.dx = 0)
+   box.p1.x -= half_line_x;
+--
+cgit v0.9.0.2-2-gbebe
+From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Sun, 08 Apr 2012 16:58:13 +
+Subject: traps: Clip the trapezoid extents against the clip extents
+
+Just in case the clip polygon turns out to be much larger than the
+operation extents (silly us for not reducing it correctly) and lead to
+catastrophe, such as:
+
+Program received signal SIGSEGV, Segmentation fault.
+pixman_fill_sse2 (bits=optimized out, stride=4, bpp=8, x=0, y=0,
+width=3, height=-34811, data=0) at pixman-sse2.c:3369
+3369   *(uint16_t *)d = data;
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---
+diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c
+index 284a0be..c49e208 100644
+--- a/src/cairo-traps-compositor.c
 b/src/cairo-traps-compositor.c
+@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t 
*compositor,
+ _cairo_traps_fini (traps);
+ cairo_surface_destroy (src);
+ 
+-if (status == CAIRO_INT_STATUS_SUCCESS 
+-  (fixup.width  extents-width || fixup.height  extents-height)) {
++if (unlikely (status))
++  return status;
++
++if (! _cairo_rectangle_intersect (fixup, extents))
++  return CAIRO_STATUS_SUCCESS;
++
++if (fixup.width  extents-width || fixup.height  extents-height) {
+   cairo_boxes_t clear;
+ 
+   _cairo_boxes_init (clear);
+--
+cgit v0.9.0.2-2-gbebe
+From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Mon, 09 Apr 2012 11:47:34 +
+Subject: build: Disable -Wset-but-unused-variable
+
+This is too noisy in the current build, and masking more important
+warnings.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+---

[arch-commits] Commit in cairo/trunk (PKGBUILD git_fixes.patch)

2012-04-07 Thread andyrtr 
Date: Saturday, April 7, 2012 @ 02:26:07
  Author: andyrtr
Revision: 155822

upgpkg: cairo 1.12.0-3

add most important upstream post release git fixes

Added:
  cairo/trunk/git_fixes.patch
Modified:
  cairo/trunk/PKGBUILD

-+
 PKGBUILD|   10 
 git_fixes.patch |  574 ++
 2 files changed, 581 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-07 06:09:20 UTC (rev 155821)
+++ PKGBUILD2012-04-07 06:26:07 UTC (rev 155822)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -16,13 +16,17 @@
 replaces=('cairo-xcb')
 options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
-cairo-1.10.0-buggy_gradients.patch)
+cairo-1.10.0-buggy_gradients.patch
+git_fixes.patch )
 md5sums=('e6c85575ba7094f88b637bdfd835a751'
- '9b323790dab003e228c6955633cb888e')
+ '9b323790dab003e228c6955633cb888e'
+ '31aff4a4d8943ed81dce398f6421487d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
+  # status is 2012-04-07 last commit: fix _cairo_pattern_get_ink_extents to 
work with snapshot recording surfaces
+  patch -Np1 -i ${srcdir}/git_fixes.patch
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \

Added: git_fixes.patch
===
--- git_fixes.patch (rev 0)
+++ git_fixes.patch 2012-04-07 06:26:07 UTC (rev 155822)
@@ -0,0 +1,574 @@
+From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod beh...@behdad.org
+Date: Sun, 25 Mar 2012 18:37:14 +
+Subject: Fix math in comments
+
+---
+diff --git a/src/cairo-arc.c b/src/cairo-arc.c
+index dc07fee..6977e88 100644
+--- a/src/cairo-arc.c
 b/src/cairo-arc.c
+@@ -139,7 +139,7 @@ _arc_segments_needed (double angle,
+ 
+From that paper, a very practical value of h is:
+ 
+-  h = 4/3 * tan(angle/4)
++  h = 4/3 * R * tan(angle/4)
+ 
+This value does not give the spline with minimal error, but it does
+provide a very good approximation, (6th-order convergence), and the
+--
+cgit v0.9.0.2-2-gbebe
+From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001
+From: Henry (Yu) Song hs...@sisa.samsung.com
+Date: Tue, 27 Mar 2012 21:25:37 +
+Subject: gl: use font's antialias option to check whether it needs mask
+
+There is need to loop over number of glyphs to check wether the glyph
+image is a ARGB32 as the font's antialias option can be used for checking.
+If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32,
+otherwise it will be A8 format. Therefore we will only be using
+component-alpha at SUBPIXEL (or better) font quality and only then need
+a mask for multiple pass glyph composition.
+---
+diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
+index 832956f..9756ea4 100644
+--- a/src/cairo-gl-glyphs.c
 b/src/cairo-gl-glyphs.c
+@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void *_dst,
+ 
+ TRACE ((stderr, %s\n, __FUNCTION__));
+ 
+-/* If any of the glyphs are component alpha, we have to go through a mask,
+- * since only _cairo_gl_surface_composite() currently supports component
+- * alpha.
++/* If any of the glyphs require component alpha, we have to go through
++ * a mask, since only _cairo_gl_surface_composite() currently supports
++ * component alpha.
+  */
+-if (!dst-base.is_clear  ! info-use_mask  op != CAIRO_OPERATOR_OVER) 
{
+-  for (i = 0; i  info-num_glyphs; i++) {
+-  cairo_scaled_glyph_t *scaled_glyph;
+-
+-  if (_cairo_scaled_glyph_lookup (info-font, info-glyphs[i].index,
+-  CAIRO_SCALED_GLYPH_INFO_SURFACE,
+-  scaled_glyph) == 
CAIRO_INT_STATUS_SUCCESS 
+-  scaled_glyph-surface-format == CAIRO_FORMAT_ARGB32)
+-  {
+-  info-use_mask = TRUE;
+-  break;
+-  }
+-  }
++if (!dst-base.is_clear  ! info-use_mask  op != CAIRO_OPERATOR_OVER 

++  (info-font-options.antialias == CAIRO_ANTIALIAS_SUBPIXEL ||
++   info-font-options.antialias == CAIRO_ANTIALIAS_BEST))
++{
++  info-use_mask = TRUE;
+ }
+ 
+ if (info-use_mask) {
+--
+cgit v0.9.0.2-2-gbebe
+From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001
+From: Chris Wilson ch...@chris-wilson.co.uk
+Date: Wed, 28 Mar 2012 23:32:36 +
+Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask
+
+The SOURCE and CLEAR are the odd pair in Cairo's range of operators that
+are bound by the shape/mask, but are unbound by the source. This

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2012-04-01 Thread andyrtr 
Date: Sunday, April 1, 2012 @ 11:12:26
  Author: andyrtr
Revision: 155306

upgpkg: cairo 1.12.0-2

disable xlib-xcb to solve some crashes; FS#29207

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-01 14:23:52 UTC (rev 155305)
+++ PKGBUILD2012-04-01 15:12:26 UTC (rev 155306)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -28,7 +28,7 @@
--localstatedir=/var \
--disable-static \
--enable-tee \
-   --enable-xlib-xcb \
+   --disable-xlib-xcb \
# --enable-test-surfaces \ takes ages
#--enable-drm # breaks build
   make

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2012-03-31 Thread andyrtr 
Date: Saturday, March 31, 2012 @ 05:11:55
  Author: andyrtr
Revision: 154930

upgpkg: cairo 1.12.0-1

upstream update 1.12.0, XCB backend now included upstream

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-31 09:05:33 UTC (rev 154929)
+++ PKGBUILD2012-03-31 09:11:55 UTC (rev 154930)
@@ -3,18 +3,22 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.10.2
-pkgrel=3
+pkgver=1.12.0
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
 depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
+makedepends=('librsvg' 'poppler-glib' 'libspectre') # 'libdrm')
+optdepends=('xcb-util: for XCB backend') # really needed?
+provides=('cairo-xcb')
+replaces=('cairo-xcb')
 options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
 cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
-  '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
+md5sums=('e6c85575ba7094f88b637bdfd835a751'
+ '9b323790dab003e228c6955633cb888e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -23,14 +27,17 @@
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
-   --enable-tee
+   --enable-tee \
+   --enable-xlib-xcb \
+   # --enable-test-surfaces \ takes ages
+   #--enable-drm # breaks build
   make
 }
 
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 
Skipped
-}
+#check() {
+#  cd $srcdir/$pkgname-$pkgver
+#  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 
Skipped
+#}
 
 package() {
   cd $srcdir/$pkgname-$pkgver

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2012-01-18 Thread Ionut Biru 
Date: Wednesday, January 18, 2012 @ 14:56:25
  Author: ibiru
Revision: 146831

libpng 1.5 rebuild

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-18 19:53:58 UTC (rev 146830)
+++ PKGBUILD2012-01-18 19:56:25 UTC (rev 146831)
@@ -4,21 +4,20 @@
 
 pkgname=cairo
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.18.4' 
'glib2=2.24.0' 'sh')
-makedepends=('pkgconfig')
+depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
 cairo-1.10.0-buggy_gradients.patch)
 sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
   '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
   ./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -26,10 +25,14 @@
--disable-static \
--enable-tee
   make
+}
+
+check() {
+  cd $srcdir/$pkgname-$pkgver
   make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 
Skipped
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2011-03-13 Thread andyrtr 
Date: Sunday, March 13, 2011 @ 04:22:31
  Author: andyrtr
Revision: 114393

upgpkg: cairo 1.10.2-2
add tee support required for FF4

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-13 03:11:15 UTC (rev 114392)
+++ PKGBUILD2011-03-13 08:22:31 UTC (rev 114393)
@@ -4,12 +4,12 @@
 
 pkgname=cairo
 pkgver=1.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.18.4' 
'glib2=2.24.0')
+depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.18.4' 
'glib2=2.24.0' 'sh')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
@@ -20,8 +20,16 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-  ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --disable-static
+  ./configure --prefix=/usr \
+   --sysconfdir=/etc \
+   --localstatedir=/var \
+   --disable-static \
+   --enable-tee
   make
+  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 
Skipped
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2011-01-05 Thread Jan de Groot 
Date: Wednesday, January 5, 2011 @ 08:46:12
  Author: jgc
Revision: 104891

upgpkg: cairo 1.10.2-1
Update to 1.10.2

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-05 13:25:37 UTC (rev 104890)
+++ PKGBUILD2011-01-05 13:46:12 UTC (rev 104891)
@@ -3,8 +3,8 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.10.0
-pkgrel=2
+pkgver=1.10.2
+pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -14,7 +14,7 @@
 options=('!libtool')
 source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
 cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702'
+sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
   '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
 
 build() {

[arch-commits] Commit in cairo/trunk (PKGBUILD cairo-1.10.0-buggy_gradients.patch)

2010-09-09 Thread Jan de Groot 
Date: Thursday, September 9, 2010 @ 17:56:54
  Author: jgc
Revision: 90247

upgpkg: cairo 1.10.0-2
Do not use server-side gradients. It hurts performance, and causes bad 
rendering on at least nvidia.

Added:
  cairo/trunk/cairo-1.10.0-buggy_gradients.patch
Modified:
  cairo/trunk/PKGBUILD

+
 PKGBUILD   |9 ++---
 cairo-1.10.0-buggy_gradients.patch |   13 +
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-09 21:00:14 UTC (rev 90246)
+++ PKGBUILD2010-09-09 21:56:54 UTC (rev 90247)
@@ -4,7 +4,7 @@
 
 pkgname=cairo
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -12,11 +12,14 @@
 depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.18.4' 
'glib2=2.24.0')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702')
+source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
+cairo-1.10.0-buggy_gradients.patch)
+sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702'
+  '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
 --localstatedir=/var --disable-static
   make

Added: cairo-1.10.0-buggy_gradients.patch
===
--- cairo-1.10.0-buggy_gradients.patch  (rev 0)
+++ cairo-1.10.0-buggy_gradients.patch  2010-09-09 21:56:54 UTC (rev 90247)
@@ -0,0 +1,13 @@
+--- a/src/cairo-xlib-display.c.ubuntu  2010-08-04 11:57:49.0 +0200
 b/src/cairo-xlib-display.c 2010-08-04 11:58:28.0 +0200
+@@ -353,11 +353,7 @@
+ /* Prior to Render 0.10, there is no protocol support for gradients and
+  * we call function stubs instead, which would silently consume the 
drawing.
+  */
+-#if RENDER_MAJOR == 0  RENDER_MINOR  10
+ display-buggy_gradients = TRUE;
+-#else
+-display-buggy_gradients = FALSE;
+-#endif
+ display-buggy_pad_reflect = FALSE;
+ display-buggy_repeat = FALSE;

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2010-09-08 Thread Jan de Groot 
Date: Wednesday, September 8, 2010 @ 13:41:28
  Author: jgc
Revision: 90180

upgpkg: cairo 1.10.0-1
Update to 1.10.0:
Remove the XCB backend, compile with default options
We no longer include experimental backends not supported by upstream. This also 
includes the new GL backend.

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-08 17:11:51 UTC (rev 90179)
+++ PKGBUILD2010-09-08 17:41:28 UTC (rev 90180)
@@ -3,23 +3,22 @@
 # Contributor: Brice Carpentier br...@daknet.org
 
 pkgname=cairo
-pkgver=1.8.10
+pkgver=1.10.0
 pkgrel=1
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.16.6' 
'xcb-util=0.3.6')
+depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.18.4' 
'glib2=2.24.0')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('fd5e8ca82ff0e8542ea4c51612cad387f2a49df3')
+sha1sums=('efe7e47408d5188690228ccadc8523652f6bf702')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i -e 's/libpng13/libpng14/g' configure || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-xcb --disable-static || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+--localstatedir=/var --disable-static
+  make
+  make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2010-08-31 Thread Jan de Groot 
Date: Tuesday, August 31, 2010 @ 08:37:44
  Author: jgc
Revision: 89317

Remove gtk-doc from makedepends (FS#20656)

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-31 12:36:24 UTC (rev 89316)
+++ PKGBUILD2010-08-31 12:37:44 UTC (rev 89317)
@@ -10,7 +10,7 @@
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
 depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.16.6' 
'xcb-util=0.3.6')
-makedepends=('pkgconfig' 'gtk-doc')
+makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('fd5e8ca82ff0e8542ea4c51612cad387f2a49df3')

[arch-commits] Commit in cairo/trunk (PKGBUILD)

2010-01-16 Thread Jan de Groot 
Date: Saturday, January 16, 2010 @ 14:07:32
  Author: jgc
Revision: 63243

upgpkg: cairo 1.8.8-2
Rebuild for libpng14, fix configure script to use the new stable version

Modified:
  cairo/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 18:43:08 UTC (rev 63242)
+++ PKGBUILD2010-01-16 19:07:32 UTC (rev 63243)
@@ -4,19 +4,20 @@
 
 pkgname=cairo
 pkgver=1.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc=Cairo vector graphics library
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url=http://cairographics.org/;
-depends=('libpng=1.2.37' 'libxrender' 'fontconfig=2.6.0' 'pixman=0.14.0' 
'xcb-util=0.3.4')
-makedepends=('pkgconfig')
+depends=('libpng=1.4.0' 'libxrender' 'fontconfig=2.8.0' 'pixman=0.16.4' 
'xcb-util=0.3.6')
+makedepends=('pkgconfig' 'gtk-doc')
 options=('!libtool')
 source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
 md5sums=('d3e1a1035ae563812d4dd44a74fb0dd0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i -e 's/libpng13/libpng14/g' configure || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
 --localstatedir=/var --enable-xcb --disable-static || return 1
   make || return 1