* Upgrade to 1.14.6.

* Download patches directly from github.

6 files changed, 51 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bd49a40e55e..8103792c6dba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Feb 16 18:13:39 UTC 2016
+# Thu Apr 14 15:49:32 UTC 2016
 pkgbase = cairo-infinality
 	pkgdesc = Cairo vector graphics library
-	pkgver = 1.14.4
+	pkgver = 1.14.6
 	pkgrel = 1
 	url = http://cairographics.org/
 	changelog = CHANGELOG
@@ -29,7 +29,7 @@ pkgbase = cairo-infinality
 	depends = mesa
 	depends = libgl
 	depends = lzo
-	provides = cairo=1.14.4
+	provides = cairo=1.14.6
 	provides = cairo-ubuntu
 	provides = cairo-xcb
 	conflicts = cairo
@@ -41,11 +41,13 @@ pkgbase = cairo-infinality
 	conflicts = cairo-small
 	conflicts = cairo-ubuntu
 	replaces = cairo-xcb
-	source = http://cairographics.org/releases/cairo-1.14.4.tar.xz
-	source = cairo-respect-fontconfig_pb.patch
-	source = cairo-server-side-gradients.patch
-	source = cairo-webkit-html5-fix.patch
-	sha1sums = 5b44471e7c328f96de6830baf8ea65030de797f9
+	source = http://cairographics.org/releases/cairo-1.14.6.tar.xz
+	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/cairo/cairo-make-lcdfilter-default.patch
+	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/cairo/cairo-respect-fontconfig_pb.patch
+	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/cairo/cairo-server-side-gradients.patch
+	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/cairo/cairo-webkit-html5-fix.patch
+	sha1sums = 0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5
+	sha1sums = b0cc2466cc5479f055ca2148cfa37fe13a1e78a6
 	sha1sums = d8ffcb4c4745f7e61671109362a80a872ac989d3
 	sha1sums = 72ecf2dda8462e1588512de257ccbe18642d507f
 	sha1sums = 5bff494f52a16114f4cf6d04bfb0b9d7c4e9da23
diff --git a/CHANGELOG b/CHANGELOG
index e97efa494ad3..9ca21b97f047 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,15 @@ CHANGELOG
 ---------
 
 
+2016-03-28
+~~~~~~~~~~
+
+### cairo-infinality-ultimate, rev. 1.14.6-1
+
+* Version upgrade.
+* Fixed #143 (added `FT_LCD_FILTER_DEFAULT`).
+
+
 2015-11-01
 ~~~~~~~~~~
 
@@ -29,6 +38,7 @@ CHANGELOG
 
 * Applied git_fixes.diff patch.
 
+
 2014-10-15
 ~~~~~~~~~~
 
@@ -36,6 +46,7 @@ CHANGELOG
 
 * New upstream release.
 
+
 2014-09-26
 ~~~~~~~~~~
 
@@ -44,6 +55,7 @@ CHANGELOG
 * Merging latest upstream commits as used in the stock Arch Linux cairo 1.13.1.
 * Removing obsolete Ubuntu patches.
 
+
 2014-09-09
 ~~~~~~~~~~
 
@@ -52,6 +64,7 @@ CHANGELOG
 * Upstream code base upgraded to version 1.13.1 (Ubuntu source package).
 * Fixed Webkit browsers crashing on HTML5 video playback.
 
+
 2014-06-01
 ~~~~~~~~~~
 
@@ -59,6 +72,7 @@ CHANGELOG
 
 * Package update.
 
+
 2014-05-03
 ~~~~~~~~~~
 
@@ -66,6 +80,7 @@ CHANGELOG
 
 * Package update.
 
+
 2013-10-11
 ~~~~~~~~~~
 
@@ -73,4 +88,3 @@ CHANGELOG
 
 * Packages rebuilt with the updated Ubuntu patchset.
 
-
diff --git a/PKGBUILD b/PKGBUILD
index c672d8f8a254..f76d531cbb81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,12 @@
-# Maintainer (ib-bundle): bohoomil <@zoho.com>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer : Dobroslaw Kijowski [dobo] <dobo90_at_gmail.com>
+# Contributor (ib-bundle): bohoomil <@zoho.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo-infinality
 _name=cairo
-pkgver=1.14.4
+_commit=36b60ecefe1fd0e042cad51105b0ffb29315e577
+pkgver=1.14.6
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=('armv7h' 'i686' 'x86_64')
@@ -19,29 +21,36 @@ makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre'
              #'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
 groups=('infinality-bundle')
-provides=("cairo=$pkgver" 'cairo-ubuntu' 'cairo-xcb')
+provides=("cairo=${pkgver}" 'cairo-ubuntu' 'cairo-xcb')
 replaces=('cairo-xcb')
 conflicts=('cairo' 'cairo-cleartype' 'cairo-git' 'cairo-gl-git' 'cairo-glitz'
            'cairo-ocaml-git' 'cairo-small' 'cairo-ubuntu')
-source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz
-        cairo-respect-fontconfig_pb.patch
-        cairo-server-side-gradients.patch
-        cairo-webkit-html5-fix.patch)
-sha1sums=('5b44471e7c328f96de6830baf8ea65030de797f9'
+source=("http://cairographics.org/releases/cairo-${pkgver}.tar.xz"
+        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/cairo/cairo-make-lcdfilter-default.patch"
+        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/cairo/cairo-respect-fontconfig_pb.patch"
+        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/cairo/cairo-server-side-gradients.patch"
+        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/cairo/cairo-webkit-html5-fix.patch")
+sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5'
+          'b0cc2466cc5479f055ca2148cfa37fe13a1e78a6'
           'd8ffcb4c4745f7e61671109362a80a872ac989d3'
           '72ecf2dda8462e1588512de257ccbe18642d507f'
           '5bff494f52a16114f4cf6d04bfb0b9d7c4e9da23')
 
 prepare(){
-  cd $_name-$pkgver
+  cd "${_name}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}"/cairo-respect-fontconfig_pb.patch
-  patch -Np1 -i "${srcdir}"/cairo-server-side-gradients.patch
-  patch -Np1 -i "${srcdir}"/cairo-webkit-html5-fix.patch
+  patches=('cairo-make-lcdfilter-default.patch'
+           'cairo-respect-fontconfig_pb.patch'
+           'cairo-server-side-gradients.patch'
+           'cairo-webkit-html5-fix.patch')
+
+  for patch in "${patches[@]}"; do
+    patch -Np1 -i "${srcdir}/${patch}"
+  done
 }
 
 build() {
-  cd $_name-$pkgver
+  cd "${_name}-${pkgver}"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -65,7 +74,7 @@ build() {
 }
 
 check() {
-  cd $_name-$pkgver
+  cd "${_name}-${pkgver}"
   #make -j1 -k test || /bin/true
 
   # results:
@@ -75,6 +84,6 @@ check() {
 }
 
 package() {
-  cd $_name-$pkgver
-  make DESTDIR="$pkgdir" install
+  cd "${_name}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/cairo-respect-fontconfig_pb.patch b/cairo-respect-fontconfig_pb.patch
deleted file mode 100644
index 55912cd2371e..000000000000
--- a/cairo-respect-fontconfig_pb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-ft-font.c	2015-03-10 23:21:07.000000000 +0100
-+++ b/src/cairo-ft-font.c	2015-03-11 21:59:05.747697134 +0100
-@@ -1841,7 +1841,9 @@ _cairo_ft_options_merge (cairo_ft_option
- 	options->base.subpixel_order = other->base.subpixel_order;
-     }
- 
--    if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
-+    options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT;
-+
-+    if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
- 	options->base.hint_style = other->base.hint_style;
- 
-     if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
diff --git a/cairo-server-side-gradients.patch b/cairo-server-side-gradients.patch
deleted file mode 100644
index b5b012aaf210..000000000000
--- a/cairo-server-side-gradients.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Description: don't use server side gradients most drivers don't handle it
-Index: cairo-1.12.2/src/cairo-xlib-display.c
-===================================================================
---- a/src/cairo-xlib-display.c	2015-03-10 23:21:07.000000000 +0100
-+++ b/src/cairo-xlib-display.c	2015-03-11 21:59:05.751030406 +0100
-@@ -263,11 +263,7 @@ _cairo_xlib_device_create (Display *dpy)
-     /* 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;
- 
diff --git a/cairo-webkit-html5-fix.patch b/cairo-webkit-html5-fix.patch
deleted file mode 100644
index e56bbc922300..000000000000
--- a/cairo-webkit-html5-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0742b90a214b35951414558f6f5579f79b8a8194 Mon Sep 17 00:00:00 2001
-From: Massimo Valentini <mvalentini@src.gnome.org>
-Date: Thu, 21 Aug 2014 17:15:51 +0200
-Subject: [PATCH] Fix segfault rendering videos in webkit based browsers
-
-do not tessellate empty boxes.
-
-Reported-by: Henrique Lengler <henriqueleng@openmailbox.org>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81699
----
- src/cairo-bentley-ottmann-rectangular.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c
-index 5541bdc..4bcd8d1 100644
---- a/src/cairo-bentley-ottmann-rectangular.c
-+++ b/src/cairo-bentley-ottmann-rectangular.c
-@@ -823,6 +823,9 @@ _cairo_bentley_ottmann_tessellate_boxes (const cairo_boxes_t *in,
- 	for (i = 0; i < chunk->count; i++) {
- 	    int h;
- 
-+	    if (box[i].p1.y == box[i].p2.y)
-+	      continue;
-+
- 	    if (box[i].p1.x < box[i].p2.x) {
- 		rectangles[j].left.x = box[i].p1.x;
- 		rectangles[j].left.dir = 1;
--- 
-1.9.3
-