freetype2-old-hinting-2.8-2

3 files changed, 66 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78c1f3893dd5..d96868889931 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = freetype2-old-hinting
-	pkgdesc = TrueType font rendering library (including old hinting engine)
-	pkgver = 2.7.1
-	pkgrel = 1
-	url = http://www.freetype.org/
-	install = freetype2.install
+	pkgdesc = Font rasterization library
+	pkgver = 2.8
+	pkgrel = 2
+	url = https://www.freetype.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -13,26 +12,29 @@ pkgbase = freetype2-old-hinting
 	depends = sh
 	depends = libpng
 	depends = harfbuzz
-	provides = libfreetype.so
-	provides = freetype2=2.7.1-1
-	conflicts = freetype2
-	backup = etc/profile.d/freetype2.sh
-	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2
-	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2.sig
-	source = https://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.1.tar.bz2
-	source = https://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.1.tar.bz2.sig
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.8.tar.bz2
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.8.tar.bz2.sig
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-2.8.tar.bz2
+	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-2.8.tar.bz2.sig
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-subpixel-rendering.patch
 	source = 0003-Enable-infinality-subpixel-hinting.patch
+	source = 0004-Enable-long-PCF-family-names.patch
 	source = freetype2.sh
-	sha1sums = 4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789
+	sha1sums = 42c6b1f733fe13a3eba135f5025b22cb68450f91
 	sha1sums = SKIP
-	sha1sums = d8ce472cd775b8ce50d127689acab59181e72ecf
+	sha1sums = 5b221ee14fe674cd5f6db0193d55360bc0bd3655
 	sha1sums = SKIP
 	sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
 	sha1sums = b1494810ed3aca25cdd8e8cedf634e5adfe6c09e
 	sha1sums = 41d27140fd590945e22e012c9dce62de3d6f11e6
+	sha1sums = 334f229875039794adeb574e27d365bb445fb314
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
 
 pkgname = freetype2-old-hinting
+	install = freetype2.install
+	provides = libfreetype.so
+	provides = freetype2=2.8-2
+	conflicts = freetype2
+	backup = etc/profile.d/freetype2.sh
 
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
new file mode 100644
index 000000000000..675423a7c472
--- /dev/null
+++ b/0004-Enable-long-PCF-family-names.patch
@@ -0,0 +1,25 @@
+From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH 4/4] Enable long PCF family names
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index ebb44acdbbef9a47..0b39b417162707e4 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -865,7 +865,7 @@ FT_BEGIN_HEADER
+   /* If this option is activated, it can be controlled with the            */
+   /* `no-long-family-names' property of the pcf driver module.             */
+   /*                                                                       */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+ 
+ 
+   /*************************************************************************/
+-- 
+2.13.0
+
diff --git a/PKGBUILD b/PKGBUILD
index f8605cf3e8fd..68ba095bc956 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,34 @@
-# Based on freetype2 from extra repo
+# Based on freetype2 from extra
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-_origpkgname=freetype2
-pkgname=$_origpkgname-old-hinting
-pkgver=2.7.1
-pkgrel=1
-pkgdesc="TrueType font rendering library (including old hinting engine)"
+pkgbase=freetype2-old-hinting
+pkgname=('freetype2-old-hinting')
+pkgver=2.8
+pkgrel=2
+pkgdesc="Font rasterization library"
 arch=(i686 x86_64)
 license=('GPL')
-url="http://www.freetype.org/"
+url="https://www.freetype.org/"
 # adding harfbuzz for improved OpenType features auto-hinting
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
 depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
 makedepends=('libx11')
-provides=('libfreetype.so' $_origpkgname=$pkgver-$pkgrel)
-conflicts=($_origpkgname)
-install=freetype2.install
-backup=('etc/profile.d/freetype2.sh')
-source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
-        https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
+source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+        https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
         0001-Enable-table-validation-modules.patch
         0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
+        0004-Enable-long-PCF-family-names.patch
         freetype2.sh)
-sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
+sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
           'SKIP'
-          'd8ce472cd775b8ce50d127689acab59181e72ecf'
+          '5b221ee14fe674cd5f6db0193d55360bc0bd3655'
           'SKIP'
           'b31882ef5e8447e761acee1c4a44c0630cd4d465'
           'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
           '41d27140fd590945e22e012c9dce62de3d6f11e6'
+          '334f229875039794adeb574e27d365bb445fb314'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
@@ -42,6 +40,7 @@ prepare() {
   patch -Np1 -i ../0001-Enable-table-validation-modules.patch
   patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
   patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+  patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
 
   sed -ri 's|/\* +(#define +CFF_CONFIG_OPTION_OLD_ENGINE) +\*/|\1|' include/freetype/config/ftoption.h
 }
@@ -57,12 +56,19 @@ check() {
   make -k check
 }
 
-package() {
+package_freetype2-old-hinting() {
+  provides=('libfreetype.so' "freetype2=$pkgver-$pkgrel")
+  conflicts=('freetype2')
+  install=freetype2.install
+  backup=('etc/profile.d/freetype2.sh')
+
   cd freetype2
   make DESTDIR="${pkgdir}" install
   install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
 
   # Package docs
-  install -dm755 "${pkgdir}/usr/share/doc"
-  cp -a docs "${pkgdir}/usr/share/doc/${_origpkgname}"
+  install -d "${pkgdir}/usr/share/doc"
+  cp -a docs "${pkgdir}/usr/share/doc/freetype2"
 }
+
+# vim:set ts=2 sw=2 et: