new patch for lcdfilter

3 files changed, 37 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a67e8f86e15f..4fb752ba235a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Jun  5 10:43:19 UTC 2018
 pkgbase = cairo-ubuntu
 	pkgdesc = 2D graphics library with support for multiple output devices (with ubuntu patches)
 	pkgver = 1.15.12
-	pkgrel = 3
+	pkgrel = 4
 	url = https://cairographics.org/
 	arch = x86_64
 	license = LGPL
@@ -26,11 +24,13 @@ pkgbase = cairo-ubuntu
 	conflicts = cairo
 	source = cairo::git+https://anongit.freedesktop.org/git/cairo#commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519
 	source = utf-8.diff
+	source = cairo-make-lcdfilter-default.patch
 	source = cairo-respect-fontconfig_pb.patch
 	source = cairo-server-side-gradients.patch
 	source = cairo-webkit-html5-fix.patch
 	md5sums = SKIP
 	md5sums = 46b1abd8e6ff88107680d907b8c247fc
+	md5sums = 1ec7560b9f05b5b0a6aca41cfdb8ea93
 	md5sums = 080eac1ce1b2fa2beb550555d31d29b8
 	md5sums = 4ffec1c86085da11bf9f56d6bf88fbdf
 	md5sums = 6080d20e289f5e75cc013e8f40710aa3
diff --git a/PKGBUILD b/PKGBUILD
index 1220e401ae19..438905259d32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=cairo-ubuntu
 _realpkg=cairo
 pkgver=1.15.12
-pkgrel=3
+pkgrel=4
 pkgdesc="2D graphics library with support for multiple output devices (with ubuntu patches)"
 url="https://cairographics.org/"
 arch=(x86_64)
@@ -13,6 +13,7 @@ makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
 _commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519  # tags/1.15.12^0
 source=("cairo::git+https://anongit.freedesktop.org/git/cairo#commit=$_commit"
         utf-8.diff
+        cairo-make-lcdfilter-default.patch
         cairo-respect-fontconfig_pb.patch
         cairo-server-side-gradients.patch
         cairo-webkit-html5-fix.patch)
@@ -30,7 +31,8 @@ prepare() {
   patch -Np1 -i ../cairo-respect-fontconfig_pb.patch
   patch -Np1 -i ../cairo-server-side-gradients.patch
   patch -Np1 -i ../cairo-webkit-html5-fix.patch
-
+  patch -Np1 -i ../cairo-make-lcdfilter-default.patch
+  
   # Update gtk-doc
   cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
   cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc
@@ -65,8 +67,10 @@ package() {
   cd $_realpkg
   make DESTDIR="$pkgdir" install
 }
+
 md5sums=('SKIP'
          '46b1abd8e6ff88107680d907b8c247fc'
+         '1ec7560b9f05b5b0a6aca41cfdb8ea93'
          '080eac1ce1b2fa2beb550555d31d29b8'
          '4ffec1c86085da11bf9f56d6bf88fbdf'
          '6080d20e289f5e75cc013e8f40710aa3')
diff --git a/cairo-make-lcdfilter-default.patch b/cairo-make-lcdfilter-default.patch
new file mode 100644
index 000000000000..279f40a1b2ee
--- /dev/null
+++ b/cairo-make-lcdfilter-default.patch
@@ -0,0 +1,28 @@
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index 3e485c5..36703d1 100644
+--- a/src/cairo-ft-font.c
++++ b/src/cairo-ft-font.c
+@@ -1336,7 +1336,7 @@ _render_glyph_outline (FT_Face                    face,
+ 		       cairo_image_surface_t	**surface)
+ {
+     int rgba = FC_RGBA_UNKNOWN;
+-    int lcd_filter = FT_LCD_FILTER_LEGACY;
++    int lcd_filter = FT_LCD_FILTER_DEFAULT;
+     FT_GlyphSlot glyphslot = face->glyph;
+     FT_Outline *outline = &glyphslot->outline;
+     FT_Bitmap bitmap;
+@@ -1371,13 +1371,13 @@ _render_glyph_outline (FT_Face                    face,
+ 	case CAIRO_LCD_FILTER_NONE:
+ 	    lcd_filter = FT_LCD_FILTER_NONE;
+ 	    break;
+-	case CAIRO_LCD_FILTER_DEFAULT:
+ 	case CAIRO_LCD_FILTER_INTRA_PIXEL:
+ 	    lcd_filter = FT_LCD_FILTER_LEGACY;
+ 	    break;
+ 	case CAIRO_LCD_FILTER_FIR3:
+ 	    lcd_filter = FT_LCD_FILTER_LIGHT;
+ 	    break;
++	case CAIRO_LCD_FILTER_DEFAULT:
+ 	case CAIRO_LCD_FILTER_FIR5:
+ 	    lcd_filter = FT_LCD_FILTER_DEFAULT;
+ 	    break;