Upgpkg: 2.12.6

1 files changed, 8 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9a5bfab4cab9..8a396e4e4828 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Installation order:  freetype2 → fontconfig-ubuntu → cairo-ubuntu
 
 pkgname=fontconfig-ubuntu
-pkgver=2.11.94
-_ubver=0ubuntu2
-pkgrel=2
+pkgver=2.12.6
+_ubver=0ubuntu1
+pkgrel=1
 pkgdesc="Library for configuring and customizing font access - with Ubuntu's patches"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/ubuntu/+source/fontconfig"
@@ -18,12 +18,10 @@ options=('!libtool')
 install=$pkgname.install
 source=("https://launchpad.net/ubuntu/+archive/primary/+files/fontconfig_$pkgver.orig.tar.bz2"
         "https://launchpad.net/ubuntu/+archive/primary/+files/fontconfig_$pkgver-$_ubver.debian.tar.xz"
-        '53-monospace-lcd-filter.patch'
-        '0001-glibc-2.25-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch')
-md5sums=('c988ea12f4117330246e041109152b4a'
-         '1527bc9abef9c13eef6178b4369dda2e'
-         'a17e48be6a06bc056574be6756cb9738'
-         'eb0c6e936a485de81dafcd7a55088fe1')
+        '53-monospace-lcd-filter.patch')
+sha256=('cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017'
+        '6e44e884856924986ec3637cc38d0a759934d4d065ffd65fa25dd8c9d36bc844'
+        'c759702ba66fe88768aa93035637401085bb5c02d898c960b68291aea10daa8d')
 
 # nice pages to test font matching:
 # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
@@ -38,12 +36,8 @@ prepare() {
     patch -Np1 -i "../debian/patches/$_f"
   done
 
-  # Glibc 2.25
-  msg2 "Applying Glibc 2.25 fix"
-  patch -Np1 -i "$srcdir"/0001-glibc-2.25-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
-
   ## patch
-  #patch -u conf.d/53-monospace-lcd-filter.conf ../53-monospace-lcd-filter.patch
+  #patch -p1 -i conf.d/53-monospace-lcd-filter.conf ../53-monospace-lcd-filter.patch
 }
 
 build() {