* Upgrade to 2.7.

* Sync with ABS PKGBUILD.
* Get patches from archfan.

5 files changed, 98 insertions, 427 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e37f62d25e7c..01c6ecddbe67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,47 @@
 # Generated by mksrcinfo v8
-# Mon May  9 15:50:13 UTC 2016
+# Tue Nov 29 18:24:34 UTC 2016
 pkgbase = freetype2-infinality
 	pkgdesc = TrueType font rendering library with Infinality patches and custom settings.
-	pkgver = 2.6.3
-	pkgrel = 2
-	url = http://freetype.sourceforge.net
-	install = infinality.install
-	changelog = CHANGELOG
+	pkgver = 2.7
+	pkgrel = 1
+	url = http://www.freetype.org/
+	install = freetype2.install
 	arch = armv7h
 	arch = i686
 	arch = x86_64
-	groups = infinality-bundle
 	license = GPL
-	license = MIT
+	makedepends = libx11
 	depends = zlib
 	depends = bzip2
 	depends = sh
-	depends = xorg-xrdb
 	depends = libpng
 	depends = harfbuzz
-	provides = freetype2=2.6.3
+	optdepends = libx11: Some demo programs
+	provides = freetype2=2.7
 	provides = libfreetype.so
 	provides = freetype2-infinality-ultimate
 	conflicts = freetype2
-	source = http://downloads.sourceforge.net/sourceforge/freetype/freetype-2.6.3.tar.bz2
-	source = 01-freetype-2.6.3-enable-valid.patch::https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/freetype/01-freetype-2.6.2-enable-valid.patch
-	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/freetype/02-upstream-2016.03.26.patch
-	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/freetype/03-infinality-2.6.3-2016.03.26.patch
-	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/freetype/xft-settings.sh
-	source = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/freetype/infinality-settings.sh
-	source = infinality-settings-generic::https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/36b60ecefe1fd0e042cad51105b0ffb29315e577/freetype/generic_settings/infinality-settings.sh
-	sha1sums = 6c98bd5d0be313207c37ca23d25faf983486aee5
-	sha1sums = abf7a8f726ad6359533651a8942636880febf9f6
-	sha1sums = dc527dc3b45bb5f17533e7e049d16c475007a945
-	sha1sums = fa848046558c4ac59ef77775ab4a1a9d7200417f
-	sha1sums = a1859f2eacae2046a9ef705ac2bcc4bdf4fd9717
-	sha1sums = 44ca94634f894011db9ed7edbb105b50ca591e52
-	sha1sums = 4d219670cb9641b649f6ba0f2a799006f7c3c3c5
+	backup = etc/profile.d/freetype2.sh
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.tar.bz2.sig
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.tar.bz2.sig
+	source = http://download.savannah.gnu.org/releases/freetype/ft2demos-2.7.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/ft2demos-2.7.tar.bz2.sig
+	source = 0001-Enable-table-validation-modules.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-Enable-table-validation-modules.patch?id=f6f3016966633b17d3ec6360b4b8d62075ea6af4
+	source = 0005-freetype-2.5.2-more-demos.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-freetype-2.5.2-more-demos.patch?id=f6f3016966633b17d3ec6360b4b8d62075ea6af4
+	source = freetype2.sh::https://git.archlinux.org/svntogit/packages.git/plain/trunk/freetype2.sh?id=f6f3016966633b17d3ec6360b4b8d62075ea6af4
+	source = https://raw.githubusercontent.com/archfan/infinality_bundle/acb83b884f46b4c54a5529376592739f929e0fbe/01_freetype2-iu/0002-infinality-2.7-2016.09.09.patch
+	sha1sums = f251029d5ab542a96dd4531605fe577185077560
+	sha1sums = SKIP
+	sha1sums = 22949e7c809d7d5931331ca54da30e4d195669ea
+	sha1sums = SKIP
+	sha1sums = b7f7633ca0b828ca319afdd09a81b42592685d9c
+	sha1sums = SKIP
+	sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
+	sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
+	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
+	sha1sums = 753a97119586e69c5e57d4b4cf9e445637d4ae49
 
 pkgname = freetype2-infinality
 
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 5e1aedf0a114..000000000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,329 +0,0 @@
-
-freetype2-infinality-ultimate
-=============================
-
-CHANGELOG
----------
-
-
-2016-03-30
-~~~~~~~~~~
-
-* Fixed #133 & #138 (freetype crashing with `poppler-qt`).
-
-2016-03-28
-~~~~~~~~~~
-
-* Upstream `freetype2` version upgrade 2.6.3.
-* `freetype2` code was updated with recent upstream commits up to rev.2016.03.26.
-* Updated Infinality patch set.
-* `stem-darkening.patch` was merged with the Infinality patch set.
-
-2015-12-05
-~~~~~~~~~~
-
-* `freetype2` code was updated with recent upstream commits up to rev.2015.12.05.
-* Fixed bug #124 ("WebKit browsers (Chromium, Opera) won't use freetype2 run-time settings with the new Infinality patch").
-* Infinality patch set cleanup and update.
-
-2015-11-30
-~~~~~~~~~~
-
-* `freetype2` code was updated with recent upstream commit.
-* Fixed reported issues with the new Infinality functionality.
-
-2015-11-28
-~~~~~~~~~~
-
-* Upstream `freetype2` version upgrade 2.6.2.
-* Infinality patch set was rewritten and optimized for speed (by mviikki16).
-  Default rendering style is hard coded now and set to `ultimate3`.
-* New `xft-settings.sh` was split from the original `infinality-settings.sh` script.
-* New `infinality-settings.sh` is now optional and offers more rendering styles and
-  new methods of customization.
-
-2015-11-10
-~~~~~~~~~~
-
-* Reverting buggy upstream changes to working condition.
-* The code base was merged with the upstream changes up to 2015.11.10.
-
-2015-11-08
-~~~~~~~~~~
-
-* The code base was merged with the upstream changes up to 2015.11.08.
-
-2015-10-05
-~~~~~~~~~~
-
-* Upstream version upgrade, rev. 2.6.1-1.
-
-2015-10-04
-~~~~~~~~~~
-
-* The code base was merged with the upstream changes up to 2015.10.04.
-
-2015-09-30
-~~~~~~~~~~
-
-* The code base was merged with the upstream changes up to 2015.09.29.
-
-2015-09-17
-~~~~~~~~~~
-
-* The code base was merged with the upstream changes up to 2015.09.15.
-
-2015-08-24
-~~~~~~~~~~
-
-* The code base was merged with the upstream changes up to 2015.08.24.
-* Build with _GNU_SOURCE for strcasestr and strcasecmp (goddesse).
-* Use freetype2's new header file macros where possible (goddesse).
-
-2015-07-28
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.6-2
-
-* The code base was merged with the upstream changes up to 2015.07.28.
-* Minor changes in the Infinality patchset (modified location of freetype2 header files
-  introduced by the upstream).
-
-
-2015-06-08
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.6-1
-
-* Upstream version upgrade.
-
-
-2015-05-31
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.5-7
-
-* The code base was merged with the upstream changes up to 2015.05.31.
-
-
-2015-05-12
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.5-6
-
-* The code base was merged with the upstream changes up to 2015.05.12.
-
-
-2015-04-26
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.5-5
-
-* The code base was merged with the upstream changes up to 2015.04.24.
-* Fixed #85 (`infinality-settings` renamed to `infinality-settings.sh`).
-
-
-2015-03-30
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.5-4
-
-* The code base was merged with the upstream changes up to 2015.03.30.
-
-
-2015-03-05
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.5-3
-
-* The code base was merged with the upstream changes up to 2015.03.01.
-* The Infinality patchset was revised and updated accordingly (compatibility
-  fixes by goddesse).
-
-
-2014-12-31
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.5-2
-
-* The code base was merged with the upstream changes up to 2015.01.23.
-* The Infinality patchset was revised and updated accordingly.
-* `infinality-settings` was update to rev. 0.4.8.3.
-
-
-2014-12-30
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.5-1 (inc. multilib)
-
-* Version upgrade release, 2.5.5.
-
-
-2014-12-23
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.4-2 (inc. multilib)
-
-* Merged with the recent upstream code base.
-* `infinality-settings`: slightly increased fringe filter strength.
-
-
-2014-12-07
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.4-1 (inc. multilib)
-
-* Version upgrade release, 2.5.4.
-* Merged with the recent upstream code base (fixing memory leaks on buggy fonts).
-
-
-2014-12-06
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-16 (inc. multilib)
-
-* Merged with the recent upstream code base.
-* Infinality patchset was updated and revised.
-
-
-2014-11-23
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-15 (inc. multilib)
-
-* Merged with the recent upstream code base.
-* Several bug fixes, including issue #53 (rendering and stability issues during
-  playback of `*.mkv` video files with embedded TTF fonts).
-
-
-2014-10-29
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-14 (inc. multilib)
-
-* Merged with the recent upstream code base.
-* `infinality-settings` was moved to `/etc/X11/xinit/xinitrc.d` to ensure that
-  `xrdb` sets `Xft` variables when an X server is already running.
-
-
-2014-10-16
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-13 (inc. multilib)
-
-* Merged with the recent upstream code base.
-
-
-2014-09-14
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-12 (inc. multilib)
-
-* Bug #40 (affecting Urxvt): do not track cur_width through setenv (by goddesse,
-  contributed by estar).
-* Merged with the recent upstream code base.
-
-
-2014-09-09
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-11
-
-* Changes to Infinality patchset:
-  * Bug #36: Fix small memory in _lcd_stem_align (by goddesse).
-  * Bug #38: Fix another small memory leak (by goddesse).
-  * Bug #39: Set have_outline_shifted properly in ftsmooth.c (by goddesse).
-* `infinality-settings.sh` was updated to v.0.4.8.0.
-  * All styles were revised and updated, providing a smoother and more distinctive
-    transition between visual variants, from sharp and light to dark and bold.
-  * Core rendering settings were simplified and remain stable for all styles.
-* New upstream changes were merged with freetype2 code base.
-
-
-2014-08-15
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-10
-
-* Merging with most recent upstream commits.
-
-
-2014-07-29
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-9
-
-* Merging with most recent upstream commits.
-* `infinality-settings.sh` was updated to v. 0.4.7.5.
-
-
-2014-07-08
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-8
-
-* Merging with most recent upstream commits.
-* Updating Infinality patchset accordingly.
-
-
-2014-05-15
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.3-5
-
-* Semi-major upgrade, introducing most changes and fixes present in the
-  development branch of the upstream `freetype2`.
-
-
-2014-03-21
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate
-
-* `infinality-settings.sh`: revised and updated rendering styles.
-* Updated dependencies.
-
-
-2013-12-09
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.1-2
-
-* Upstream version upgrade to 2.5.1
-* Revised and updated Infinality patchset.
-
-
-2013-10-11
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.0.1-7
-
-* Added `libpng` dependency.
-
-
-2013-07-24
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.0.1-6
-
-Minor changes to `infinality-settings.sh` meant to prevent inaccurate kerning issues.
-
-
-2013-07-11
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.0.1-5
-
-* `infinality-settings.sh`: taking measures against blurriness.
-
-
-2013-06-21
-~~~~~~~~~~
-
-### freetype2-infinality-ultimate, rev. 2.5.0.1-2
-
-* Upstream update 2.5.0.1.
-* Moving to Adobe CFF as the default renderer.
-* Improved and simplified infinality settings: most minor rendering issues was resolved.
-* Added new style, Classical.
-
diff --git a/PKGBUILD b/PKGBUILD
index 764e629e4d9c..98af00db49c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,80 +4,85 @@
 # Contributor: bohoomil <@zoho.com>
 
 pkgname=freetype2-infinality
-pkgver=2.6.3
-pkgrel=2
-_patchrel=2016.03.26
-_commit=36b60ecefe1fd0e042cad51105b0ffb29315e577
+pkgver=2.7
+pkgrel=1
 pkgdesc="TrueType font rendering library with Infinality patches and custom settings."
-arch=('armv7h' 'i686' 'x86_64')
-changelog=CHANGELOG
-license=('GPL' 'MIT')
-groups=('infinality-bundle')
-url="http://freetype.sourceforge.net"
-depends=('zlib' 'bzip2' 'sh' 'xorg-xrdb' 'libpng' 'harfbuzz')
+arch=(armv7h i686 x86_64)
+license=('GPL')
+url="http://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')
+optdepends=('libx11: Some demo programs')
 conflicts=('freetype2')
 provides=("freetype2=$pkgver" 'libfreetype.so' 'freetype2-infinality-ultimate')
-install='infinality.install'
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
-        "01-freetype-2.6.3-enable-valid.patch::https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/freetype/01-freetype-2.6.2-enable-valid.patch"
-        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/freetype/02-upstream-2016.03.26.patch"
-        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/freetype/03-infinality-2.6.3-2016.03.26.patch"
-        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/freetype/xft-settings.sh"
-        "https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/freetype/infinality-settings.sh"
-        "infinality-settings-generic::https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/${_commit}/freetype/generic_settings/infinality-settings.sh")
-
-sha1sums=('6c98bd5d0be313207c37ca23d25faf983486aee5'
-          'abf7a8f726ad6359533651a8942636880febf9f6'
-          'dc527dc3b45bb5f17533e7e049d16c475007a945'
-          'fa848046558c4ac59ef77775ab4a1a9d7200417f'
-          'a1859f2eacae2046a9ef705ac2bcc4bdf4fd9717'
-          '44ca94634f894011db9ed7edbb105b50ca591e52'
-          '4d219670cb9641b649f6ba0f2a799006f7c3c3c5')
+install=freetype2.install
+backup=('etc/profile.d/freetype2.sh')
+_abs_commit=f6f3016966633b17d3ec6360b4b8d62075ea6af4
+_infinality_commit=acb83b884f46b4c54a5529376592739f929e0fbe
+source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+        http://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
+        http://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
+        "0001-Enable-table-validation-modules.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-Enable-table-validation-modules.patch?id=${_abs_commit}"
+        "0005-freetype-2.5.2-more-demos.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-freetype-2.5.2-more-demos.patch?id=${_abs_commit}"
+        "freetype2.sh::https://git.archlinux.org/svntogit/packages.git/plain/trunk/freetype2.sh?id=${_abs_commit}"
+        "https://raw.githubusercontent.com/archfan/infinality_bundle/${_infinality_commit}/01_freetype2-iu/0002-infinality-2.7-2016.09.09.patch")
+sha1sums=('f251029d5ab542a96dd4531605fe577185077560'
+          'SKIP'
+          '22949e7c809d7d5931331ca54da30e4d195669ea'
+          'SKIP'
+          'b7f7633ca0b828ca319afdd09a81b42592685d9c'
+          'SKIP'
+          'b31882ef5e8447e761acee1c4a44c0630cd4d465'
+          '72cfecbe738085eec475e012617661ad0cc9b76f'
+          'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f'
+          '753a97119586e69c5e57d4b4cf9e445637d4ae49')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 prepare() {
-  cd "freetype-${pkgver}"
+  # Rename source dir to allow building the demos
+  mv freetype-${pkgver} freetype2
 
-  patches=("01-freetype-${pkgver}-enable-valid.patch"
-           "02-upstream-${_patchrel}.patch"
-           "03-infinality-${pkgver}-${_patchrel}.patch")
+  cd freetype2
+  patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+  patch -Np1 -i ../0002-infinality-2.7-2016.09.09.patch
 
-  # infinality & post release fixes
-  for patch in "${patches[@]}"; do
-    patch -Np1 -i ${srcdir}/"${patch}"
-  done
+  cd ../ft2demos-${pkgver}
+  # enable more demos
+  patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
 
+  # Suppress RPATH
+  sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
 }
 
 build() {
-  cd "freetype-${pkgver}"
-
-  ./configure \
-    --prefix=/usr \
-    --disable-static \
-    --with-harfbuzz \
-    --with-png
+  cd freetype2
+  ./configure --prefix=/usr --disable-static
+  make
 
+  # Build demos
+  cd ../ft2demos-${pkgver}
   make
 }
 
-#check() {
-  #cd "freetype-${pkgver}"
-  #make -k check
-#}
+check() {
+  cd freetype2
+  make -k check
+}
 
 package() {
-  cd "freetype-${pkgver}"
-
+  cd freetype2
   make DESTDIR="${pkgdir}" install
+  install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
 
-  # freetype2 runtime settings
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/xft-settings.sh" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/xft-settings.sh"
+  # Package docs
+  install -dm755 "${pkgdir}/usr/share/doc"
+  cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
 
-  install -m755 -d "${pkgdir}/usr/share/doc/freetype2-infinality-ultimate"
-  install -m755 "${srcdir}/infinality-settings.sh" \
-    "${pkgdir}/usr/share/doc/freetype2-infinality-ultimate/infinality-settings.sh"
-  install -m755 "${srcdir}/infinality-settings-generic" \
-    "${pkgdir}/usr/share/doc/freetype2-infinality-ultimate/infinality-settings-generic"
+  # Package demos
+  cd ../ft2demos-${pkgver}
+  for _i in bin/{f,t}t*; do
+    libtool --mode=install install $_i "$pkgdir/usr/bin/"
+  done
 }
diff --git a/freetype2.install b/freetype2.install
new file mode 100644
index 000000000000..5d4d1e7856cb
--- /dev/null
+++ b/freetype2.install
@@ -0,0 +1,8 @@
+post_upgrade() {
+  if (( $(vercmp $2 2.7-1) < 0 )); then
+    cat <<MSG
+  The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+  Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
+MSG
+  fi
+}
diff --git a/infinality.install b/infinality.install
deleted file mode 100644
index 47f07465a6a5..000000000000
--- a/infinality.install
+++ /dev/null
@@ -1,18 +0,0 @@
-
-post_install() {
-  cat << EOF
-  If you are using [multilib], please install/upgrade
-  lib32-freetype2-infinality, too.
-EOF
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  cat << EOF
-  freetype2-infinality was removed.
-EOF
-}
-# vim:set ts=2 sw=2 et: