match official repo

6 files changed, 296 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..716faecad2d2
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,30 @@
+pkgbase = lib32-freetype2-git
+	pkgdesc = TrueType font rendering library (32-bit)
+	pkgver = 2.9.1+p305+g8d517e679
+	pkgrel = 1
+	url = https://www.freetype.org/
+	arch = x86_64
+	license = GPL
+	makedepends = gcc-multilib
+	depends = lib32-zlib
+	depends = lib32-bzip2
+	depends = lib32-libpng
+	depends = lib32-harfbuzz
+	depends = freetype2
+	provides = libfreetype.so
+	provides = lib32-freetype2
+	conflicts = lib32-freetype2
+	source = git://git.sv.gnu.org/freetype/freetype2.git
+	source = 0001-Enable-table-validation-modules.patch
+	source = 0002-Enable-infinality-subpixel-hinting.patch
+	source = 0003-Enable-long-PCF-family-names.patch
+	source = 0004-Enable-old-engines-but-keep-adobe-as-default.patch
+	validpgpkeys = SKIP
+	sha1sums = SKIP
+	sha1sums = SKIP
+	sha1sums = SKIP
+	sha1sums = SKIP
+	sha1sums = SKIP
+
+pkgname = lib32-freetype2-git
+
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
new file mode 100755
index 000000000000..efb5382174a3
--- /dev/null
+++ b/0001-Enable-table-validation-modules.patch
@@ -0,0 +1,46 @@
+From eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0 Mon Sep 17 00:00:00 2001
+Message-Id: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/4] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index c46e61963..4618c8af3 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -111,26 +111,26 @@ AUX_MODULES += cache
+ 
+ # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
+ #
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+ # See include/freetype/ftgzip.h for the API.
+ AUX_MODULES += gzip
+ 
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ AUX_MODULES += lzw
+ 
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ AUX_MODULES += bzip2
+ 
+ # OpenType table validation.  Needs `ftotval.c' below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #
+-- 
+2.17.1
+
diff --git a/0002-Enable-infinality-subpixel-hinting.patch b/0002-Enable-infinality-subpixel-hinting.patch
new file mode 100755
index 000000000000..d9c37e2c4211
--- /dev/null
+++ b/0002-Enable-infinality-subpixel-hinting.patch
@@ -0,0 +1,30 @@
+From b34999b29f8016706716f40f456def2cfad177a8 Mon Sep 17 00:00:00 2001
+Message-Id: <b34999b29f8016706716f40f456def2cfad177a8.1528102613.git.jan.steffens@gmail.com>
+In-Reply-To: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+References: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 2/4] Enable infinality subpixel hinting
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 66bb8f9c8..301940a9a 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -649,8 +649,8 @@ FT_BEGIN_HEADER
+    *
+    */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2         */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )
+ 
+ 
+   /**************************************************************************
+-- 
+2.17.1
+
diff --git a/0003-Enable-long-PCF-family-names.patch b/0003-Enable-long-PCF-family-names.patch
new file mode 100755
index 000000000000..7241b12755b2
--- /dev/null
+++ b/0003-Enable-long-PCF-family-names.patch
@@ -0,0 +1,28 @@
+From c969754e4e68e2b217859c7a409e7a4c4b1e9268 Mon Sep 17 00:00:00 2001
+Message-Id: <c969754e4e68e2b217859c7a409e7a4c4b1e9268.1528102613.git.jan.steffens@gmail.com>
+In-Reply-To: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+References: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH 3/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 301940a9a..f47155b83 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -843,7 +843,7 @@ FT_BEGIN_HEADER
+    * `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.17.1
+
diff --git a/0004-Enable-old-engines-but-keep-adobe-as-default.patch b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
new file mode 100755
index 000000000000..91c8f3a4f35d
--- /dev/null
+++ b/0004-Enable-old-engines-but-keep-adobe-as-default.patch
@@ -0,0 +1,88 @@
+From 41bbf735a170d62e43ff399c28ae4a987a6ea21f Mon Sep 17 00:00:00 2001
+Message-Id: <41bbf735a170d62e43ff399c28ae4a987a6ea21f.1528102613.git.jan.steffens@gmail.com>
+In-Reply-To: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+References: <eb7f1fc4286d83dde4bf5ef60cebddeaa074d9f0.1528102613.git.jan.steffens@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sat, 16 Dec 2017 23:08:02 +0100
+Subject: [PATCH 4/4] Enable old engines, but keep adobe as default
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ src/cff/cffobjs.c                  | 4 ----
+ src/cid/cidobjs.c                  | 4 ----
+ src/type1/t1objs.c                 | 4 ----
+ 4 files changed, 2 insertions(+), 14 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index f47155b83..fd24ac4b8 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -771,7 +771,7 @@ FT_BEGIN_HEADER
+    * the type1 driver module.
+    *
+    */
+-/* #define T1_CONFIG_OPTION_OLD_ENGINE */
++#define T1_CONFIG_OPTION_OLD_ENGINE
+ 
+ 
+   /*************************************************************************/
+@@ -815,7 +815,7 @@ FT_BEGIN_HEADER
+    * the cff driver module.
+    *
+    */
+-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
++#define CFF_CONFIG_OPTION_OLD_ENGINE
+ 
+ 
+   /*************************************************************************/
+diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
+index b3f0f99e3..f85fa180e 100644
+--- a/src/cff/cffobjs.c
++++ b/src/cff/cffobjs.c
+@@ -1162,11 +1162,7 @@
+ 
+ 
+     /* set default property values, cf. `ftcffdrv.h' */
+-#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
+-    driver->hinting_engine = FT_HINTING_FREETYPE;
+-#else
+     driver->hinting_engine = FT_HINTING_ADOBE;
+-#endif
+ 
+     driver->no_stem_darkening = TRUE;
+ 
+diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
+index 91c4ed94a..6c6cff318 100644
+--- a/src/cid/cidobjs.c
++++ b/src/cid/cidobjs.c
+@@ -479,11 +479,7 @@
+ 
+ 
+     /* set default property values, cf. `ftt1drv.h' */
+-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
+-    driver->hinting_engine = FT_HINTING_FREETYPE;
+-#else
+     driver->hinting_engine = FT_HINTING_ADOBE;
+-#endif
+ 
+     driver->no_stem_darkening = TRUE;
+ 
+diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
+index 568440d05..0bf329973 100644
+--- a/src/type1/t1objs.c
++++ b/src/type1/t1objs.c
+@@ -594,11 +594,7 @@
+ 
+ 
+     /* set default property values, cf. `ftt1drv.h' */
+-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
+-    driver->hinting_engine = FT_HINTING_FREETYPE;
+-#else
+     driver->hinting_engine = FT_HINTING_ADOBE;
+-#endif
+ 
+     driver->no_stem_darkening = TRUE;
+ 
+-- 
+2.17.1
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100755
index 000000000000..feca398c55a8
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,74 @@
+# Maintainer: Vincent Grande <shoober420@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+_pkgbasename=freetype2
+pkgname=lib32-$_pkgbasename-git
+pkgver=2.9.1+p305+g8d517e679
+pkgrel=1
+pkgdesc="TrueType font rendering library (32-bit)"
+arch=(x86_64)
+license=('GPL')
+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=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename)
+makedepends=('gcc-multilib')
+provides=('libfreetype.so' 'lib32-freetype2')
+conflicts=('lib32-freetype2')
+source=(git://git.sv.gnu.org/freetype/freetype2.git
+        0001-Enable-table-validation-modules.patch
+        0002-Enable-infinality-subpixel-hinting.patch
+        0003-Enable-long-PCF-family-names.patch
+	0004-Enable-old-engines-but-keep-adobe-as-default.patch)
+sha1sums=('SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP')
+validpgpkeys=('SKIP')
+
+pkgver() {
+  local _tag _count
+
+  cd "${srcdir}/freetype2"
+  _tag=$(git describe --abbrev=0 )
+  _count=$(git rev-list --count ${_tag}..HEAD)
+  _tag=${_tag#VER-}
+  echo ${_tag//-/.}+p$_count+g$(git rev-parse --short HEAD)
+}
+
+prepare() {
+
+  cd freetype2
+  patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+  patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
+  patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
+  patch -Np1 -i ../0004-Enable-old-engines-but-keep-adobe-as-default.patch
+
+  ./autogen.sh
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd freetype2
+  ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
+  make
+}
+
+#check() {
+#  cd freetype2
+#  make -k check
+#}
+
+package() {
+  cd freetype2
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/{include,share}
+}
+
+# vim:set ts=2 sw=2 et: