wok rev 19306
Up: harfbuzz(1.2.7), truetype(2.6.4)
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Jul 10 20:40:05 2016 +0300 (2016-07-10) |
| parents | e85c838301ad |
| children | 03550e87324e |
| files | freetype-dev/receipt freetype/description.txt freetype/receipt freetype/stuff/NO_SUBPIXEL_HINTING.env.patch freetype/stuff/freetype-2.6.4.patch freetype/stuff/freetype261-install.patch harfbuzz-dev/receipt harfbuzz/receipt |
line diff
1.1 --- a/freetype-dev/receipt Sun Jul 10 12:10:59 2016 +0200 1.2 +++ b/freetype-dev/receipt Sun Jul 10 20:40:05 2016 +0300 1.3 @@ -1,23 +1,21 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="freetype-dev" 1.7 -VERSION="2.6.1" 1.8 +VERSION="2.6.4" 1.9 CATEGORY="development" 1.10 -SHORT_DESC="Development files for Freetype" 1.11 -WEB_SITE="http://www.freetype.org/" 1.12 +SHORT_DESC="A free, high-quality, and portable font engine, development files" 1.13 +WEB_SITE="https://www.freetype.org/" 1.14 MAINTAINER="pankso@slitaz.org" 1.15 LICENSE="FTL GPL2" 1.16 HOST_ARCH="i486 arm" 1.17 1.18 WANTED="freetype" 1.19 -DEPENDS="freetype libzip-dev bzip2-dev libpng-dev harfbuzz-dev pkg-config" 1.20 +DEPENDS="freetype bzip2-dev glib-dev harfbuzz-dev libpng-dev pcre-dev zlib-dev" 1.21 1.22 # Rules to gen a SliTaz package suitable for Tazpkg. 1.23 genpkg_rules() 1.24 { 1.25 - mkdir -p $fs/usr/lib 1.26 - cp -a $install/usr/include $fs/usr 1.27 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.28 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.29 - cp -a $install/usr/share $fs/usr 1.30 + cp -a $install/* $fs 1.31 + rm $fs/usr/lib/*.so* 1.32 + rm -r $fs/usr/share/man 1.33 }
2.1 --- a/freetype/description.txt Sun Jul 10 12:10:59 2016 +0200 2.2 +++ b/freetype/description.txt Sun Jul 10 20:40:05 2016 +0300 2.3 @@ -3,4 +3,11 @@ 2.4 most vector and bitmap font formats for digital typography. FreeType is a freely 2.5 available and portable software library to render fonts. 2.6 2.7 -This version supports NO_SUBPIXEL_HINTING environment variable. 2.8 +Subpixel hinting mode can be chosen by setting the right value in your 2.9 +environment, for example /etc/profile or ~/.profile 2.10 + 2.11 +Available settings: 2.12 + 2.13 + * FT2_SUBPIXEL_HINTING=0 # Classic mode 2.14 + * FT2_SUBPIXEL_HINTING=1 # Infinality mode 2.15 + * FT2_SUBPIXEL_HINTING=2 # Default mode
3.1 --- a/freetype/receipt Sun Jul 10 12:10:59 2016 +0200 3.2 +++ b/freetype/receipt Sun Jul 10 20:40:05 2016 +0300 3.3 @@ -1,13 +1,13 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="freetype" 3.7 -VERSION="2.6.1" 3.8 +VERSION="2.6.4" 3.9 CATEGORY="x-window" 3.10 SHORT_DESC="A free, high-quality, and portable font engine" 3.11 MAINTAINER="pankso@slitaz.org" 3.12 LICENSE="FTL GPL2" 3.13 +WEB_SITE="https://www.freetype.org/" 3.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 3.15 -WEB_SITE="http://www.freetype.org/" 3.16 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 3.17 HOST_ARCH="i486 arm" 3.18 3.19 @@ -17,18 +17,8 @@ 3.20 # Rules to configure and make the package. 3.21 compile_rules() 3.22 { 3.23 - # Fix make install for version 2.6.1 3.24 - patch -p1 -i $stuff/freetype261-install.patch 3.25 + patch -p1 -i $stuff/freetype-2.6.4.patch 3.26 3.27 - # Optional old style fonts 3.28 - patch -p1 -i $stuff/NO_SUBPIXEL_HINTING.env.patch 3.29 - 3.30 - # Directives from LFS 3.31 - sed -e "/AUX.*.gxvalid/s@^# @@" \ 3.32 - -e "/AUX.*.otvalid/s@^# @@" \ 3.33 - -i modules.cfg && 3.34 - sed -e 's:.*\(#.*SUBPIXEL.*\) .*:\1:' \ 3.35 - -i include/freetype/config/ftoption.h && 3.36 ./autogen.sh && 3.37 ./configure \ 3.38 --sysconfdir=/etc \ 3.39 @@ -40,7 +30,5 @@ 3.40 # Rules to gen a SliTaz package suitable for Tazpkg. 3.41 genpkg_rules() 3.42 { 3.43 - mkdir -p $fs/usr/lib 3.44 - cp -a $install/usr/bin $fs/usr 3.45 - cp -a $install/usr/lib/*.so* $fs/usr/lib 3.46 + cook_copy_files *.so 3.47 }
4.1 --- a/freetype/stuff/NO_SUBPIXEL_HINTING.env.patch Sun Jul 10 12:10:59 2016 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,20 +0,0 @@ 4.4 -Source: https://projects.archlinux.org/svntogit/packages.git/tree/trunk/0004-Mask-subpixel-hinting-with-an-env-var.patch?h=packages/freetype2 4.5 -This is edited version of patch. 4.6 - 4.7 ---- a/src/truetype/ttobjs.c 4.8 -+++ b/src/truetype/ttobjs.c 4.9 -@@ -1302,10 +1302,11 @@ 4.10 - TT_Driver driver = (TT_Driver)ttdriver; 4.11 - 4.12 - #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING 4.13 -- driver->interpreter_version = TT_INTERPRETER_VERSION_38; 4.14 --#else 4.15 -- driver->interpreter_version = TT_INTERPRETER_VERSION_35; 4.16 -+ if ( getenv( "NO_SUBPIXEL_HINTING" ) ) 4.17 -+ driver->interpreter_version = TT_INTERPRETER_VERSION_35; 4.18 -+ else 4.19 - #endif 4.20 -+ driver->interpreter_version = TT_INTERPRETER_VERSION_38; 4.21 - 4.22 - #else /* !TT_USE_BYTECODE_INTERPRETER */ 4.23 - 4.24 \ No newline at end of file
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/freetype/stuff/freetype-2.6.4.patch Sun Jul 10 20:40:05 2016 +0300 5.3 @@ -0,0 +1,104 @@ 5.4 +--- a/modules.cfg 5.5 ++++ b/modules.cfg 5.6 +@@ -110,7 +110,7 @@ RASTER_MODULES += smooth 5.7 + AUX_MODULES += cache 5.8 + 5.9 + # TrueType GX/AAT table validation. Needs ftgxval.c below. 5.10 +-# AUX_MODULES += gxvalid 5.11 ++AUX_MODULES += gxvalid 5.12 + 5.13 + # Support for streams compressed with gzip (files with suffix .gz). 5.14 + # 5.15 +@@ -129,7 +129,7 @@ AUX_MODULES += bzip2 5.16 + 5.17 + # OpenType table validation. Needs ftotval.c below. 5.18 + # 5.19 +-# AUX_MODULES += otvalid 5.20 ++AUX_MODULES += otvalid 5.21 + 5.22 + # Auxiliary PostScript driver component to share common code. 5.23 + # 5.24 +--- a/include/freetype/config/ftoption.h 5.25 ++++ b/include/freetype/config/ftoption.h 5.26 +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER 5.27 + /* This is done to allow FreeType clients to run unmodified, forcing */ 5.28 + /* them to display normal gray-level anti-aliased glyphs. */ 5.29 + /* */ 5.30 +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ 5.31 ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING 5.32 + 5.33 + 5.34 + /*************************************************************************/ 5.35 +--- a/include/freetype/config/ftoption.h 5.36 ++++ b/include/freetype/config/ftoption.h 5.37 +@@ -631,8 +631,8 @@ FT_BEGIN_HEADER 5.38 + /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ 5.39 + /* */ 5.40 + /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ 5.41 +-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 5.42 +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ 5.43 ++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ 5.44 ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) 5.45 + 5.46 + 5.47 + /*************************************************************************/ 5.48 +--- a/src/truetype/ttobjs.c 5.49 ++++ b/src/truetype/ttobjs.c 5.50 +@@ -36,6 +36,9 @@ 5.51 + #include "ttgxvar.h" 5.52 + #endif 5.53 + 5.54 ++#include <stdlib.h> 5.55 ++#include <errno.h> 5.56 ++ 5.57 + /*************************************************************************/ 5.58 + /* */ 5.59 + /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ 5.60 +@@ -1286,6 +1289,7 @@ 5.61 + #ifdef TT_USE_BYTECODE_INTERPRETER 5.62 + 5.63 + TT_Driver driver = (TT_Driver)ttdriver; 5.64 ++ const char *envval; 5.65 + 5.66 + driver->interpreter_version = TT_INTERPRETER_VERSION_35; 5.67 + #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY 5.68 +@@ -1295,6 +1299,39 @@ 5.69 + driver->interpreter_version = TT_INTERPRETER_VERSION_40; 5.70 + #endif 5.71 + 5.72 ++ errno = 0; 5.73 ++ envval = getenv( "FT2_SUBPIXEL_HINTING" ); 5.74 ++ if ( envval ) 5.75 ++ { 5.76 ++ char *endptr = NULL; 5.77 ++ unsigned long value = strtoul( envval, &endptr, 10 ); 5.78 ++ 5.79 ++ if ( !errno && endptr && !*endptr ) 5.80 ++ { 5.81 ++ switch( value ) 5.82 ++ { 5.83 ++ case 0: 5.84 ++ driver->interpreter_version = TT_INTERPRETER_VERSION_35; 5.85 ++ break; 5.86 ++ 5.87 ++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY 5.88 ++ case 1: 5.89 ++ driver->interpreter_version = TT_INTERPRETER_VERSION_38; 5.90 ++ break; 5.91 ++#endif 5.92 ++ 5.93 ++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL 5.94 ++ case 2: 5.95 ++ driver->interpreter_version = TT_INTERPRETER_VERSION_40; 5.96 ++ break; 5.97 ++#endif 5.98 ++ 5.99 ++ default: 5.100 ++ break; 5.101 ++ } 5.102 ++ } 5.103 ++ } 5.104 ++ 5.105 + #else /* !TT_USE_BYTECODE_INTERPRETER */ 5.106 + 5.107 + FT_UNUSED( ttdriver );
6.1 --- a/freetype/stuff/freetype261-install.patch Sun Jul 10 12:10:59 2016 +0200 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,68 +0,0 @@ 6.4 -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/patch/?id=b9880aa0f8f52accc9074334f9e9f962b1b5a8e6 6.5 - 6.6 -From b9880aa0f8f52accc9074334f9e9f962b1b5a8e6 Mon Sep 17 00:00:00 2001 6.7 -From: Werner Lemberg <wl@gnu.org> 6.8 -Date: Mon, 12 Oct 2015 08:13:26 +0000 6.9 -Subject: [unix] Make MKDIR_P actually work. 6.10 - 6.11 -* builds/unix/configure.raw: Fix underquoting of `INSTALL' and 6.12 -`MKDIR_P'. 6.13 - 6.14 -Problem reported by Dan Liddell <lddll@yahoo.com>. 6.15 ---- 6.16 -diff --git a/ChangeLog b/ChangeLog 6.17 -index 067bf74..b02735f 100644 6.18 ---- a/ChangeLog 6.19 -+++ b/ChangeLog 6.20 -@@ -1,3 +1,12 @@ 6.21 -+2015-10-12 Werner Lemberg <wl@gnu.org> 6.22 -+ 6.23 -+ [unix] Make MKDIR_P actually work. 6.24 -+ 6.25 -+ * builds/unix/configure.raw: Fix underquoting of `INSTALL' and 6.26 -+ `MKDIR_P'. 6.27 -+ 6.28 -+ Problem reported by Dan Liddell <lddll@yahoo.com>. 6.29 -+ 6.30 - 2015-10-11 Werner Lemberg <wl@gnu.org> 6.31 - 6.32 - [sfnt] Improve extraction of number of named instances. 6.33 -diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw 6.34 -index 5a30c65..f28baff 100644 6.35 ---- a/builds/unix/configure.raw 6.36 -+++ b/builds/unix/configure.raw 6.37 -@@ -70,24 +70,25 @@ AC_SUBST(CC_BUILD) 6.38 - AC_SUBST(EXEEXT_BUILD) 6.39 - 6.40 - 6.41 --# Since this file will be finally moved to another directory we make 6.42 --# the path of the install scripts absolute. This small code snippet has 6.43 --# been taken from automake's `ylwrap' script. 6.44 -+# Since these files will be eventually called from another directory (namely 6.45 -+# from the top level) we make the path of the scripts absolute. 6.46 -+# 6.47 -+# This small code snippet has been taken from automake's `ylwrap' script. 6.48 - 6.49 - AC_PROG_INSTALL 6.50 - case "$INSTALL" in 6.51 --[\\/]* | ?:[\\/]*) 6.52 -+[[\\/]]* | ?:[[\\/]]*) 6.53 - ;; 6.54 --*[\\/]*) 6.55 -+*[[\\/]]*) 6.56 - INSTALL="`pwd`/$INSTALL" 6.57 - ;; 6.58 - esac 6.59 - 6.60 - AC_PROG_MKDIR_P 6.61 - case "$MKDIR_P" in 6.62 --[\\/]* | ?:[\\/]*) 6.63 -+[[\\/]]* | ?:[[\\/]]*) 6.64 - ;; 6.65 --*[\\/]*) 6.66 -+*[[\\/]]*) 6.67 - MKDIR_P="`pwd`/$MKDIR_P" 6.68 - ;; 6.69 - esac 6.70 --- 6.71 -cgit v0.9.0.2
7.1 --- a/harfbuzz-dev/receipt Sun Jul 10 12:10:59 2016 +0200 7.2 +++ b/harfbuzz-dev/receipt Sun Jul 10 20:40:05 2016 +0300 7.3 @@ -1,20 +1,19 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="harfbuzz-dev" 7.7 -VERSION="1.0.3" 7.8 +VERSION="1.2.7" 7.9 CATEGORY="development" 7.10 SHORT_DESC="harfbuzz development files" 7.11 MAINTAINER="pankso@slitaz.org" 7.12 LICENSE="GPL2" 7.13 -WEB_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" 7.14 +WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" 7.15 +HOST_ARCH="i486 arm" 7.16 + 7.17 WANTED="harfbuzz" 7.18 -HOST_ARCH="i486 arm" 7.19 +DEPENDS="harfbuzz bzip2-dev freetype-dev glib-dev libffi-dev libpng-dev pcre-dev" 7.20 7.21 # Rules to gen a SliTaz package suitable for Tazpkg. 7.22 genpkg_rules() 7.23 { 7.24 - mkdir -p $fs/usr/lib 7.25 - cp -a $install/usr/include $fs/usr 7.26 - cp -a $install/usr/lib/*.*a $fs/usr/lib 7.27 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 7.28 + cook_copy_files *.h *.la *.pc 7.29 }
8.1 --- a/harfbuzz/receipt Sun Jul 10 12:10:59 2016 +0200 8.2 +++ b/harfbuzz/receipt Sun Jul 10 20:40:05 2016 +0300 8.3 @@ -1,18 +1,18 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="harfbuzz" 8.7 -VERSION="1.0.3" 8.8 +VERSION="1.2.7" 8.9 CATEGORY="system-tools" 8.10 SHORT_DESC="OpenType text shaping engine" 8.11 MAINTAINER="pankso@slitaz.org" 8.12 LICENSE="GPL2" 8.13 +WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" 8.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 8.15 -WEB_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" 8.16 -WGET_URL="http://www.freedesktop.org/software/harfbuzz/release/$TARBALL" 8.17 +WGET_URL="https://www.freedesktop.org/software/harfbuzz/release/$TARBALL" 8.18 HOST_ARCH="i486 arm" 8.19 8.20 -DEPENDS="glib freetype cairo" 8.21 -BUILD_DEPENDS="glib-dev freetype-dev cairo-dev" 8.22 +DEPENDS="glib cairo freetype libffi pcre" 8.23 +BUILD_DEPENDS="glib-dev cairo-dev fontconfig-dev freetype-dev" 8.24 8.25 # Rules to configure and make the package. 8.26 compile_rules() 8.27 @@ -22,7 +22,7 @@ 8.28 --with-freetype \ 8.29 --with-gobject \ 8.30 --with-icu=no \ 8.31 - $CONFIGURE_ARGS && 8.32 + $CONFIGURE_ARGS && 8.33 make && make install 8.34 } 8.35