summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2015-11-28 23:24:51 +0100
committerJan Alexander Steffens (heftig)2015-11-28 23:26:53 +0100
commit6513b08830c638029b1d36bf816500d221cd8464 (patch)
treecc310c968103ffc2a22cf2583c1ad5383763694b
parent0defcecfcc4b689e2f302391efefbfebecb29583 (diff)
downloadaur-6513b08830c638029b1d36bf816500d221cd8464.tar.gz
Minor fixes, sync with SVN
-rw-r--r--.SRCINFO7
-rw-r--r--0004-Mask-subpixel-hinting-with-an-env-var.patch31
-rw-r--r--PKGBUILD28
-rw-r--r--freetype2.install8
4 files changed, 29 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 31e6cc8b272..5e5d541744e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
pkgbase = freetype2-git
pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.6.1+p1+g30fe5e7
+ pkgver = 2.6.2+p0+g66cf29b
pkgrel = 1
epoch = 1
- url = http://freetype.sourceforge.net
+ url = http://www.freetype.org/
+ install = freetype2.install
arch = i686
arch = x86_64
license = GPL
@@ -13,8 +14,8 @@ pkgbase = freetype2-git
depends = sh
depends = libpng
depends = harfbuzz
- provides = freetype2=2.6.1+p1+g30fe5e7
provides = libfreetype.so
+ provides = freetype2=2.6.2+p0+g66cf29b
conflicts = freetype2
source = git://git.sv.gnu.org/freetype/freetype2.git
source = 0001-Enable-table-validation-modules.patch
diff --git a/0004-Mask-subpixel-hinting-with-an-env-var.patch b/0004-Mask-subpixel-hinting-with-an-env-var.patch
deleted file mode 100644
index ec8910488cb..00000000000
--- a/0004-Mask-subpixel-hinting-with-an-env-var.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bb5ece9c6773145c8342107bd32fcacbc4b212ab Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 23 Jun 2015 08:34:54 +0200
-Subject: [PATCH 4/4] Mask subpixel hinting with an env var
-
----
- src/truetype/ttobjs.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
-index 6060d6f..3fa98e7 100644
---- a/src/truetype/ttobjs.c
-+++ b/src/truetype/ttobjs.c
-@@ -1302,10 +1302,11 @@
- TT_Driver driver = (TT_Driver)ttdriver;
-
- #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-- driver->interpreter_version = TT_INTERPRETER_VERSION_38;
--#else
-- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+ if ( getenv( "FT2_SUBPIXEL_HINTING" ) )
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+ else
- #endif
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-
- #else /* !TT_USE_BYTECODE_INTERPRETER */
-
---
-2.6.0
-
diff --git a/PKGBUILD b/PKGBUILD
index c1b2738218e..c5c59c6651d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,19 @@
pkgname=freetype2-git
epoch=1
-pkgver=2.6.1+p1+g30fe5e7
+pkgver=2.6.2+p0+g66cf29b
pkgrel=1
pkgdesc="TrueType font rendering library (from git)"
arch=(i686 x86_64)
license=('GPL')
-url="http://freetype.sourceforge.net"
-# adding harfbuzz for improved OpenType features auto-hinting
+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=('git')
+provides=('libfreetype.so' "freetype2=$pkgver")
+conflicts=('freetype2')
+install=freetype2.install
source=(git://git.sv.gnu.org/freetype/freetype2.git
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
@@ -23,9 +26,7 @@ sha1sums=('SKIP'
'e2d2b8c4847ab9cfd497179c7140835e99ece711'
'ebe3d7a6fc41304a77c23cb56e94dc718146d963'
'0a75db92c93c7a1576052348174fa510740d079f')
-
-provides=("freetype2=$pkgver" libfreetype.so)
-conflicts=("freetype2")
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
pkgver() {
local _tag _count
@@ -39,15 +40,20 @@ pkgver() {
prepare() {
cd "${srcdir}/freetype2"
- patch -Np1 -i ../0001-Enable-table-validation-modules.patch
- patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
- patch -Np1 -i ../0003-Enable-subpixel-hinting.patch
- patch -Np1 -i ../0004-Add-env-var-to-turn-off-subpixel-hinting.patch
+ patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
+ patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
+
+ # https://bugs.archlinux.org/task/35274
+ patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
+ # Provide a way to disable the above patch at runtime.
+ # Hopefully just a temporary measure until fontconfig picks up
+ # the necessary configurables.
+ patch -Np1 -i "${srcdir}/0004-Add-env-var-to-turn-off-subpixel-hinting.patch"
+ ./autogen.sh
}
build() {
cd "${srcdir}/freetype2"
- ./autogen.sh
./configure --prefix=/usr --disable-static
make
}
diff --git a/freetype2.install b/freetype2.install
new file mode 100644
index 00000000000..38894409cf8
--- /dev/null
+++ b/freetype2.install
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.5.4-3) < 0 )); then
+ cat <<MSG
+ Subpixel hinting can be disabled by adding FT2_NO_SUBPIXEL_HINTING=1
+ to your environment, for example /etc/environment or ~/.pam_environment .
+MSG
+ fi
+}