# HG changeset patch # User Aleksej Bobylev # Date 1468172405 -10800 # Node ID c460585add2aaa294faccb99a0186dd4713c45cb # Parent e85c838301adc7cef3e2de12c24059c810408ee8 Up: harfbuzz(1.2.7), truetype(2.6.4) diff -r e85c838301ad -r c460585add2a freetype-dev/receipt --- a/freetype-dev/receipt Sun Jul 10 12:10:59 2016 +0200 +++ b/freetype-dev/receipt Sun Jul 10 20:40:05 2016 +0300 @@ -1,23 +1,21 @@ # SliTaz package receipt. PACKAGE="freetype-dev" -VERSION="2.6.1" +VERSION="2.6.4" CATEGORY="development" -SHORT_DESC="Development files for Freetype" -WEB_SITE="http://www.freetype.org/" +SHORT_DESC="A free, high-quality, and portable font engine, development files" +WEB_SITE="https://www.freetype.org/" MAINTAINER="pankso@slitaz.org" LICENSE="FTL GPL2" HOST_ARCH="i486 arm" WANTED="freetype" -DEPENDS="freetype libzip-dev bzip2-dev libpng-dev harfbuzz-dev pkg-config" +DEPENDS="freetype bzip2-dev glib-dev harfbuzz-dev libpng-dev pcre-dev zlib-dev" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/share $fs/usr + cp -a $install/* $fs + rm $fs/usr/lib/*.so* + rm -r $fs/usr/share/man } diff -r e85c838301ad -r c460585add2a freetype/description.txt --- a/freetype/description.txt Sun Jul 10 12:10:59 2016 +0200 +++ b/freetype/description.txt Sun Jul 10 20:40:05 2016 +0300 @@ -3,4 +3,11 @@ most vector and bitmap font formats for digital typography. FreeType is a freely available and portable software library to render fonts. -This version supports NO_SUBPIXEL_HINTING environment variable. +Subpixel hinting mode can be chosen by setting the right value in your +environment, for example /etc/profile or ~/.profile + +Available settings: + + * FT2_SUBPIXEL_HINTING=0 # Classic mode + * FT2_SUBPIXEL_HINTING=1 # Infinality mode + * FT2_SUBPIXEL_HINTING=2 # Default mode diff -r e85c838301ad -r c460585add2a freetype/receipt --- a/freetype/receipt Sun Jul 10 12:10:59 2016 +0200 +++ b/freetype/receipt Sun Jul 10 20:40:05 2016 +0300 @@ -1,13 +1,13 @@ # SliTaz package receipt. PACKAGE="freetype" -VERSION="2.6.1" +VERSION="2.6.4" CATEGORY="x-window" SHORT_DESC="A free, high-quality, and portable font engine" MAINTAINER="pankso@slitaz.org" LICENSE="FTL GPL2" +WEB_SITE="https://www.freetype.org/" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.freetype.org/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" HOST_ARCH="i486 arm" @@ -17,18 +17,8 @@ # Rules to configure and make the package. compile_rules() { - # Fix make install for version 2.6.1 - patch -p1 -i $stuff/freetype261-install.patch + patch -p1 -i $stuff/freetype-2.6.4.patch - # Optional old style fonts - patch -p1 -i $stuff/NO_SUBPIXEL_HINTING.env.patch - - # Directives from LFS - sed -e "/AUX.*.gxvalid/s@^# @@" \ - -e "/AUX.*.otvalid/s@^# @@" \ - -i modules.cfg && - sed -e 's:.*\(#.*SUBPIXEL.*\) .*:\1:' \ - -i include/freetype/config/ftoption.h && ./autogen.sh && ./configure \ --sysconfdir=/etc \ @@ -40,7 +30,5 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib + cook_copy_files *.so } diff -r e85c838301ad -r c460585add2a freetype/stuff/NO_SUBPIXEL_HINTING.env.patch --- a/freetype/stuff/NO_SUBPIXEL_HINTING.env.patch Sun Jul 10 12:10:59 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -Source: https://projects.archlinux.org/svntogit/packages.git/tree/trunk/0004-Mask-subpixel-hinting-with-an-env-var.patch?h=packages/freetype2 -This is edited version of patch. - ---- 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( "NO_SUBPIXEL_HINTING" ) ) -+ driver->interpreter_version = TT_INTERPRETER_VERSION_35; -+ else - #endif -+ driver->interpreter_version = TT_INTERPRETER_VERSION_38; - - #else /* !TT_USE_BYTECODE_INTERPRETER */ - \ No newline at end of file diff -r e85c838301ad -r c460585add2a freetype/stuff/freetype-2.6.4.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/freetype/stuff/freetype-2.6.4.patch Sun Jul 10 20:40:05 2016 +0300 @@ -0,0 +1,104 @@ +--- a/modules.cfg ++++ b/modules.cfg +@@ -110,7 +110,7 @@ RASTER_MODULES += smooth + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -129,7 +129,7 @@ AUX_MODULES += bzip2 + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -92,7 +92,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -631,8 +631,8 @@ FT_BEGIN_HEADER + /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ + /* */ + /* #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 2 */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) + + + /*************************************************************************/ +--- a/src/truetype/ttobjs.c ++++ b/src/truetype/ttobjs.c +@@ -36,6 +36,9 @@ + #include "ttgxvar.h" + #endif + ++#include ++#include ++ + /*************************************************************************/ + /* */ + /* 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 ); diff -r e85c838301ad -r c460585add2a freetype/stuff/freetype261-install.patch --- a/freetype/stuff/freetype261-install.patch Sun Jul 10 12:10:59 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -http://git.savannah.gnu.org/cgit/freetype/freetype2.git/patch/?id=b9880aa0f8f52accc9074334f9e9f962b1b5a8e6 - -From b9880aa0f8f52accc9074334f9e9f962b1b5a8e6 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Mon, 12 Oct 2015 08:13:26 +0000 -Subject: [unix] Make MKDIR_P actually work. - -* builds/unix/configure.raw: Fix underquoting of `INSTALL' and -`MKDIR_P'. - -Problem reported by Dan Liddell . ---- -diff --git a/ChangeLog b/ChangeLog -index 067bf74..b02735f 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,12 @@ -+2015-10-12 Werner Lemberg -+ -+ [unix] Make MKDIR_P actually work. -+ -+ * builds/unix/configure.raw: Fix underquoting of `INSTALL' and -+ `MKDIR_P'. -+ -+ Problem reported by Dan Liddell . -+ - 2015-10-11 Werner Lemberg - - [sfnt] Improve extraction of number of named instances. -diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw -index 5a30c65..f28baff 100644 ---- a/builds/unix/configure.raw -+++ b/builds/unix/configure.raw -@@ -70,24 +70,25 @@ AC_SUBST(CC_BUILD) - AC_SUBST(EXEEXT_BUILD) - - --# Since this file will be finally moved to another directory we make --# the path of the install scripts absolute. This small code snippet has --# been taken from automake's `ylwrap' script. -+# Since these files will be eventually called from another directory (namely -+# from the top level) we make the path of the scripts absolute. -+# -+# This small code snippet has been taken from automake's `ylwrap' script. - - AC_PROG_INSTALL - case "$INSTALL" in --[\\/]* | ?:[\\/]*) -+[[\\/]]* | ?:[[\\/]]*) - ;; --*[\\/]*) -+*[[\\/]]*) - INSTALL="`pwd`/$INSTALL" - ;; - esac - - AC_PROG_MKDIR_P - case "$MKDIR_P" in --[\\/]* | ?:[\\/]*) -+[[\\/]]* | ?:[[\\/]]*) - ;; --*[\\/]*) -+*[[\\/]]*) - MKDIR_P="`pwd`/$MKDIR_P" - ;; - esac --- -cgit v0.9.0.2 diff -r e85c838301ad -r c460585add2a harfbuzz-dev/receipt --- a/harfbuzz-dev/receipt Sun Jul 10 12:10:59 2016 +0200 +++ b/harfbuzz-dev/receipt Sun Jul 10 20:40:05 2016 +0300 @@ -1,20 +1,19 @@ # SliTaz package receipt. PACKAGE="harfbuzz-dev" -VERSION="1.0.3" +VERSION="1.2.7" CATEGORY="development" SHORT_DESC="harfbuzz development files" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" +WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" +HOST_ARCH="i486 arm" + WANTED="harfbuzz" -HOST_ARCH="i486 arm" +DEPENDS="harfbuzz bzip2-dev freetype-dev glib-dev libffi-dev libpng-dev pcre-dev" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib + cook_copy_files *.h *.la *.pc } diff -r e85c838301ad -r c460585add2a harfbuzz/receipt --- a/harfbuzz/receipt Sun Jul 10 12:10:59 2016 +0200 +++ b/harfbuzz/receipt Sun Jul 10 20:40:05 2016 +0300 @@ -1,18 +1,18 @@ # SliTaz package receipt. PACKAGE="harfbuzz" -VERSION="1.0.3" +VERSION="1.2.7" CATEGORY="system-tools" SHORT_DESC="OpenType text shaping engine" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" +WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" -WGET_URL="http://www.freedesktop.org/software/harfbuzz/release/$TARBALL" +WGET_URL="https://www.freedesktop.org/software/harfbuzz/release/$TARBALL" HOST_ARCH="i486 arm" -DEPENDS="glib freetype cairo" -BUILD_DEPENDS="glib-dev freetype-dev cairo-dev" +DEPENDS="glib cairo freetype libffi pcre" +BUILD_DEPENDS="glib-dev cairo-dev fontconfig-dev freetype-dev" # Rules to configure and make the package. compile_rules() @@ -22,7 +22,7 @@ --with-freetype \ --with-gobject \ --with-icu=no \ - $CONFIGURE_ARGS && + $CONFIGURE_ARGS && make && make install }