Upgpkg: 2.12.6

3 files changed, 13 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7417b56c01f9..7e14738993a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fontconfig-ubuntu
 	pkgdesc = Library for configuring and customizing font access - with Ubuntu's patches
-	pkgver = 2.11.94
-	pkgrel = 2
+	pkgver = 2.12.6
+	pkgrel = 1
 	url = https://launchpad.net/ubuntu/+source/fontconfig
 	install = fontconfig-ubuntu.install
 	arch = i686
@@ -11,17 +11,12 @@ pkgbase = fontconfig-ubuntu
 	makedepends = docbook2x
 	depends = expat
 	depends = freetype2
-	provides = fontconfig=2.11.94
+	provides = fontconfig=2.12.6
 	conflicts = fontconfig
 	options = !libtool
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/fontconfig_2.11.94.orig.tar.bz2
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/fontconfig_2.11.94-0ubuntu2.debian.tar.xz
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/fontconfig_2.12.6.orig.tar.bz2
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/fontconfig_2.12.6-0ubuntu1.debian.tar.xz
 	source = 53-monospace-lcd-filter.patch
-	source = 0001-glibc-2.25-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
-	md5sums = c988ea12f4117330246e041109152b4a
-	md5sums = 1527bc9abef9c13eef6178b4369dda2e
-	md5sums = a17e48be6a06bc056574be6756cb9738
-	md5sums = eb0c6e936a485de81dafcd7a55088fe1
 
 pkgname = fontconfig-ubuntu
 
diff --git a/0001-glibc-2.25-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch b/0001-glibc-2.25-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
deleted file mode 100644
index cad71707adc0..000000000000
--- a/0001-glibc-2.25-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 11 Dec 2016 14:32:00 -0800
-Subject: [PATCH] Avoid conflicts with integer width macros from TS
- 18661-1:2014
-
-glibc 2.25+ has now defined these macros in <limits.h>
-https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- fontconfig/fontconfig.h | 2 +-
- src/fcobjs.h            | 2 +-
- src/fcobjshash.gperf    | 2 +-
- src/fcobjshash.h        | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: fontconfig-2.12.1/fontconfig/fontconfig.h
-===================================================================
---- fontconfig-2.12.1.orig/fontconfig/fontconfig.h
-+++ fontconfig-2.12.1/fontconfig/fontconfig.h
-@@ -128,7 +128,8 @@ typedef int		FcBool;
- #define FC_USER_CACHE_FILE	    ".fonts.cache-" FC_CACHE_VERSION
- 
- /* Adjust outline rasterizer */
--#define FC_CHAR_WIDTH	    "charwidth"	/* Int */
-+#define FC_CHARWIDTH	    "charwidth"	/* Int */
-+#define FC_CHAR_WIDTH	    FC_CHARWIDTH
- #define FC_CHAR_HEIGHT	    "charheight"/* Int */
- #define FC_MATRIX	    "matrix"    /* FcMatrix */
- 
-Index: fontconfig-2.12.1/src/fcobjs.h
-===================================================================
---- fontconfig-2.12.1.orig/src/fcobjs.h
-+++ fontconfig-2.12.1/src/fcobjs.h
-@@ -51,7 +51,7 @@ FC_OBJECT (DPI,			FcTypeDouble,	NULL)
- FC_OBJECT (RGBA,		FcTypeInteger,	NULL)
- FC_OBJECT (SCALE,		FcTypeDouble,	NULL)
- FC_OBJECT (MINSPACE,		FcTypeBool,	NULL)
--FC_OBJECT (CHAR_WIDTH,		FcTypeInteger,	NULL)
-+FC_OBJECT (CHARWIDTH,		FcTypeInteger,	NULL)
- FC_OBJECT (CHAR_HEIGHT,		FcTypeInteger,	NULL)
- FC_OBJECT (MATRIX,		FcTypeMatrix,	NULL)
- FC_OBJECT (CHARSET,		FcTypeCharSet,	FcCompareCharSet)
-Index: fontconfig-2.12.1/src/fcobjshash.gperf
-===================================================================
---- fontconfig-2.12.1.orig/src/fcobjshash.gperf
-+++ fontconfig-2.12.1/src/fcobjshash.gperf
-@@ -44,7 +44,7 @@ int id;
- "rgba",FC_RGBA_OBJECT
- "scale",FC_SCALE_OBJECT
- "minspace",FC_MINSPACE_OBJECT
--"charwidth",FC_CHAR_WIDTH_OBJECT
-+"charwidth",FC_CHARWIDTH_OBJECT
- "charheight",FC_CHAR_HEIGHT_OBJECT
- "matrix",FC_MATRIX_OBJECT
- "charset",FC_CHARSET_OBJECT
-Index: fontconfig-2.12.1/src/fcobjshash.h
-===================================================================
---- fontconfig-2.12.1.orig/src/fcobjshash.h
-+++ fontconfig-2.12.1/src/fcobjshash.h
-@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char
-       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT},
-       {-1},
- #line 47 "fcobjshash.gperf"
--      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT},
-+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT},
- #line 48 "fcobjshash.gperf"
-       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT},
- #line 55 "fcobjshash.gperf"
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() {