[arch-commits] Commit in lib32-freetype2/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Tue Dec 23 21:03:21 UTC 2014
Date: Tuesday, December 23, 2014 @ 22:03:20
Author: heftig
Revision: 124416
2.5.4-3
Added:
lib32-freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff
(from rev 124415, lib32-freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff)
Modified:
lib32-freetype2/trunk/PKGBUILD
Deleted:
lib32-freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff
----------------------------------+
PKGBUILD | 30 +++++++++++++++++-------------
env_FT2_NO_SUBPIXEL_HINTING.diff | 19 -------------------
env_FT2_SUBPIXEL_HINTING.diff | 18 ++++++++++++++++++
3 files changed, 35 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-23 20:55:50 UTC (rev 124415)
+++ PKGBUILD 2014-12-23 21:03:20 UTC (rev 124416)
@@ -5,19 +5,20 @@
_pkgbasename=freetype2
pkgname=lib32-$_pkgbasename
pkgver=2.5.4
-pkgrel=1
+pkgrel=3
pkgdesc="TrueType font rendering library (32-bit)"
arch=(x86_64)
license=('GPL')
url="http://freetype.sourceforge.net"
+# 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)
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
freetype-2.2.1-enable-valid.patch
freetype-2.5.1-enable-spr.patch
freetype-2.5.1-enable-sph.patch
- env_FT2_NO_SUBPIXEL_HINTING.diff
+ env_FT2_SUBPIXEL_HINTING.diff
0001-pcf-Fix-Savannah-bug-43774.patch)
sha1sums=('f30b929e2edc5d7ca64c1ccc65f0c2068e84c5e2'
'SKIP'
@@ -24,20 +25,21 @@
'f279d922a873d62a8af50bfc873051839d194dca'
'13ee8d558593db991ad29fa090b461f914536104'
'c31fa3d342ead56f3acfa1f267b474a7686d0014'
- 'ddba70eef4270e5a89e098d6ee1e7ceb03ea98da'
+ '78322bee05f013cd76487439ddac0cae50596db4'
'16057f51b084e9ce5c614a4add41b532d32648b4')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
prepare() {
cd "${srcdir}/freetype-${pkgver}"
+ patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch"
- patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
# https://bugs.archlinux.org/task/35274
patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch"
- # Provide a way to disable the above patch at runtime.
- # Expected to be a temporary measure until fontconfig picks up
+ # Provide a way to enable the above patch at runtime.
+ # Hopefully just a temporary measure until fontconfig picks up
# the necessary configurables.
- patch -Np1 -i "${srcdir}/env_FT2_NO_SUBPIXEL_HINTING.diff"
+ patch -Np1 -i "${srcdir}/env_FT2_SUBPIXEL_HINTING.diff"
# http://savannah.nongnu.org/bugs/index.php?43774
patch -Np1 -i "${srcdir}/0001-pcf-Fix-Savannah-bug-43774.patch"
@@ -49,15 +51,17 @@
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
cd "${srcdir}/freetype-${pkgver}"
-
./configure --prefix=/usr --libdir=/usr/lib32
make
}
+check() {
+ cd "${srcdir}/freetype-${pkgver}"
+ make -k check
+}
+
package() {
cd "${srcdir}/freetype-${pkgver}"
-
make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
+ rm -r "${pkgdir}"/usr/{include,share,bin}
}
Deleted: env_FT2_NO_SUBPIXEL_HINTING.diff
===================================================================
--- env_FT2_NO_SUBPIXEL_HINTING.diff 2014-12-23 20:55:50 UTC (rev 124415)
+++ env_FT2_NO_SUBPIXEL_HINTING.diff 2014-12-23 21:03:20 UTC (rev 124416)
@@ -1,19 +0,0 @@
-diff --git i/src/truetype/ttobjs.c w/src/truetype/ttobjs.c
-index 46f1332..af50a1d 100644
---- i/src/truetype/ttobjs.c
-+++ w/src/truetype/ttobjs.c
-@@ -1264,10 +1264,11 @@
- return FT_THROW( Could_Not_Find_Context );
-
- #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-- driver->interpreter_version = TT_INTERPRETER_VERSION_38;
--#else
-- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+ if ( !getenv( "FT2_NO_SUBPIXEL_HINTING" ) )
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+ else
- #endif
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-
- #else /* !TT_USE_BYTECODE_INTERPRETER */
-
Copied: lib32-freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff (from rev 124415, lib32-freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff)
===================================================================
--- env_FT2_SUBPIXEL_HINTING.diff (rev 0)
+++ env_FT2_SUBPIXEL_HINTING.diff 2014-12-23 21:03:20 UTC (rev 124416)
@@ -0,0 +1,18 @@
+diff -u -r freetype-2.5.4/src/truetype/ttobjs.c freetype-2.5.4-env/src/truetype/ttobjs.c
+--- freetype-2.5.4/src/truetype/ttobjs.c 2014-12-06 18:52:13.098214719 +0100
++++ freetype-2.5.4-env/src/truetype/ttobjs.c 2014-12-10 09:13:04.418886699 +0100
+@@ -1264,10 +1264,11 @@
+ return FT_THROW( Could_Not_Find_Context );
+
+ #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 */
+
More information about the arch-commits
mailing list