summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2016-07-20 19:29:05 +0200
committerJan Alexander Steffens (heftig)2016-07-20 19:29:05 +0200
commit26f738ea071b924d4f07e131251d74a3e528171f (patch)
tree4af5a2b673ee642f652cbf85a9a0157aa96a3eca
parent4a6d1b899f7c686867bcd3f29530d27aff23f7c7 (diff)
downloadaur-26f738ea071b924d4f07e131251d74a3e528171f.tar.gz
Use the upstream config method
-rw-r--r--.SRCINFO13
-rw-r--r--0003-Make-subpixel-hinting-mode-configurable.patch88
-rw-r--r--PKGBUILD14
-rw-r--r--freetype2.install15
-rw-r--r--freetype2.sh12
5 files changed, 28 insertions, 114 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08656bc6ff5..4c78ba4f421 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Jul 15 07:14:37 UTC 2016
+# Wed Jul 20 17:27:24 UTC 2016
pkgbase = freetype2-git
pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.6.5+p11+gff65543
- pkgrel = 1
+ pkgver = 2.6.5+p25+g7f63105
+ pkgrel = 2
epoch = 1
url = http://www.freetype.org/
install = freetype2.install
@@ -19,18 +19,19 @@ pkgbase = freetype2-git
depends = libpng
depends = harfbuzz
provides = libfreetype.so
- provides = freetype2=2.6.5+p11+gff65543
+ provides = freetype2=2.6.5+p25+g7f63105
conflicts = freetype2
+ backup = etc/profile.d/freetype2.sh
source = git://git.sv.gnu.org/freetype/freetype2.git
source = git://git.sv.gnu.org/freetype/freetype2-demos.git
source = 0001-Enable-table-validation-modules.patch
source = 0002-Enable-subpixel-rendering.patch
- source = 0003-Make-subpixel-hinting-mode-configurable.patch
+ source = freetype2.sh
sha1sums = SKIP
sha1sums = SKIP
sha1sums = e1fde7854d2a64868a5eef07415ad23c339fc630
sha1sums = 7da3af8e1e002e39a247c37a05a10beb576007d6
- sha1sums = c64ba9d37732fc75de7817d1d679a3e38efdb4cb
+ sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
diff --git a/0003-Make-subpixel-hinting-mode-configurable.patch b/0003-Make-subpixel-hinting-mode-configurable.patch
deleted file mode 100644
index c1441dbef1d..00000000000
--- a/0003-Make-subpixel-hinting-mode-configurable.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From be997becc28dfbf2077cca55dc9a6a090d13e22a Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 15 Jun 2016 14:10:20 +0200
-Subject: [PATCH 3/4] Make subpixel hinting mode configurable
-
----
- include/freetype/config/ftoption.h | 2 +-
- src/truetype/ttobjs.c | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 8e58403529f597e5..197e15cdc3cc1e74 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -632,7 +632,7 @@ 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 ( 1 | 2 )
-
-
- /*************************************************************************/
-diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
-index ed3be2dbee79427c..d89f92e94d0e816b 100644
---- a/src/truetype/ttobjs.c
-+++ b/src/truetype/ttobjs.c
-@@ -36,6 +36,9 @@
- #include "ttgxvar.h"
- #endif
-
-+#include <stdlib.h>
-+#include <errno.h>
-+
- /*************************************************************************/
- /* */
- /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
-@@ -1286,6 +1289,7 @@
- #ifdef TT_USE_BYTECODE_INTERPRETER
-
- TT_Driver driver = (TT_Driver)ttdriver;
-+ const char *envval;
-
- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
- #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-@@ -1295,6 +1299,39 @@
- driver->interpreter_version = TT_INTERPRETER_VERSION_40;
- #endif
-
-+ errno = 0;
-+ envval = getenv( "FT2_SUBPIXEL_HINTING" );
-+ if ( envval )
-+ {
-+ char *endptr = NULL;
-+ unsigned long value = strtoul( envval, &endptr, 10 );
-+
-+ if ( !errno && endptr && !*endptr )
-+ {
-+ switch( value )
-+ {
-+ case 0:
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+ break;
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-+ case 1:
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+ break;
-+#endif
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-+ case 2:
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_40;
-+ break;
-+#endif
-+
-+ default:
-+ break;
-+ }
-+ }
-+ }
-+
- #else /* !TT_USE_BYTECODE_INTERPRETER */
-
- FT_UNUSED( ttdriver );
---
-2.9.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 8ede139969c..04fcb670890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgname=freetype2-git
epoch=1
-pkgver=2.6.5+p11+gff65543
-pkgrel=1
+pkgver=2.6.5+p25+g7f63105
+pkgrel=2
pkgdesc="TrueType font rendering library (from git)"
arch=(i686 x86_64)
license=('GPL')
@@ -16,16 +16,17 @@ makedepends=('libx11' 'git' 'python2')
provides=('libfreetype.so' "freetype2=$pkgver")
conflicts=('freetype2')
install=freetype2.install
+backup=('etc/profile.d/freetype2.sh')
source=(git://git.sv.gnu.org/freetype/freetype2.git
git://git.sv.gnu.org/freetype/freetype2-demos.git
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
- 0003-Make-subpixel-hinting-mode-configurable.patch)
+ freetype2.sh)
sha1sums=('SKIP'
'SKIP'
'e1fde7854d2a64868a5eef07415ad23c339fc630'
'7da3af8e1e002e39a247c37a05a10beb576007d6'
- 'c64ba9d37732fc75de7817d1d679a3e38efdb4cb')
+ 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
prepare() {
@@ -36,10 +37,6 @@ prepare() {
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
- # Provide a way to set the default subpixel hinting mode
- # at runtime, without depending on the application to do so.
- patch -Np1 -i ../0003-Make-subpixel-hinting-mode-configurable.patch
-
./autogen.sh
cd ../freetype2-demos
@@ -79,6 +76,7 @@ check() {
package() {
cd freetype2
make DESTDIR="${pkgdir}" install
+ install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
# Package docs
install -dm755 "${pkgdir}/usr/share/doc"
diff --git a/freetype2.install b/freetype2.install
index 42c697d2af6..c900ae8a018 100644
--- a/freetype2.install
+++ b/freetype2.install
@@ -1,17 +1,8 @@
-post_install() {
- post_upgrade $1 0
-}
-
post_upgrade() {
- if (( $(vercmp $2 1:2.6.3+p104+g7f569f4-1) < 0 )); then
+ if (( $(vercmp $2 1:2.6.5+p25+g7f63105-2) < 0 )); then
cat <<MSG
- Subpixel hinting mode can be chosen by setting the right value in
- your environment, for example /etc/environment or ~/.pam_environment .
-
- Available settings:
- FT2_SUBPIXEL_HINTING=0 # Classic mode (default in 2.6)
- FT2_SUBPIXEL_HINTING=1 # Infinality mode
- FT2_SUBPIXEL_HINTING=2 # Minimal mode (default in 2.7)
+ 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/freetype2.sh b/freetype2.sh
new file mode 100644
index 00000000000..93165d30fe7
--- /dev/null
+++ b/freetype2.sh
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+# truetype:interpreter-version=35 # Classic mode (default in 2.6)
+# truetype:interpreter-version=38 # Infinality mode
+# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"