Date: Monday, July 19, 2010 @ 09:01:22 Author: jgc Revision: 85761 upgpkg: freetype2 2.4.1-1 Update to 2.4.1 - remove old patches and install scriptlet
Modified: freetype2/trunk/PKGBUILD Deleted: freetype2/trunk/bytecode.patch freetype2/trunk/freetype-2.2.1-memcpy-fix.patch freetype2/trunk/freetype2.install ---------------------------------+ PKGBUILD | 14 ++++---------- bytecode.patch | 29 ----------------------------- freetype-2.2.1-memcpy-fix.patch | 14 -------------- freetype2.install | 23 ----------------------- 4 files changed, 4 insertions(+), 76 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-07-19 13:00:31 UTC (rev 85760) +++ PKGBUILD 2010-07-19 13:01:22 UTC (rev 85761) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=freetype2 -pkgver=2.3.12 +pkgver=2.4.1 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64) @@ -11,22 +11,16 @@ depends=('zlib') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - bytecode.patch freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch - freetype-2.2.1-memcpy-fix.patch) -md5sums=('e974a82e5939be8e05ee65f07275d7c5' - '9ff19e742968c29e3ba52b08d6bf0a50' + freetype-2.2.1-enable-valid.patch) +md5sums=('567a27e5189ed581396f69fb51faf2d8' '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680' - '6fb6606d28082ecb8e0c6d986b0b26aa') + '214119610444c9b02766ccee5e220680') build() { cd "${srcdir}/freetype-${pkgver}" - patch -Np0 -i "${srcdir}/bytecode.patch" || return 1 patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" || return 1 patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" || return 1 - patch -Np1 -i "${srcdir}/freetype-2.2.1-memcpy-fix.patch" || return 1 ./configure --prefix=/usr || return 1 make || return 1 Deleted: bytecode.patch =================================================================== --- bytecode.patch 2010-07-19 13:00:31 UTC (rev 85760) +++ bytecode.patch 2010-07-19 13:01:22 UTC (rev 85761) @@ -1,29 +0,0 @@ ---- include/freetype/config/ftoption.h.old 2006-05-12 02:05:49.000000000 +0800 -+++ include/freetype/config/ftoption.h 2006-10-02 01:22:50.000000000 +0800 -@@ -436,7 +436,7 @@ - /* Do not #undef this macro here, since the build system might */ - /* define it for certain configurations only. */ - /* */ --/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ -+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER - - - /*************************************************************************/ -@@ -448,7 +448,7 @@ - /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */ - /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated. */ - /* */ --#define TT_CONFIG_OPTION_UNPATENTED_HINTING -+#undef TT_CONFIG_OPTION_UNPATENTED_HINTING - - - /*************************************************************************/ -@@ -480,7 +480,7 @@ - /* http://partners.adobe.com/asn/developer/opentype/glyf.html */ - /* http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html */ - /* */ --#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED -+#define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED - - - /*************************************************************************/ Deleted: freetype-2.2.1-memcpy-fix.patch =================================================================== --- freetype-2.2.1-memcpy-fix.patch 2010-07-19 13:00:31 UTC (rev 85760) +++ freetype-2.2.1-memcpy-fix.patch 2010-07-19 13:01:22 UTC (rev 85761) @@ -1,14 +0,0 @@ ---- freetype-2.2.1/src/psaux/psobjs.c~ 2006-04-26 16:38:17.000000000 +0200 -+++ freetype-2.2.1/src/psaux/psobjs.c 2006-09-10 15:01:13.000000000 +0200 -@@ -165,6 +165,11 @@ - return PSaux_Err_Invalid_Argument; - } - -+ if ( length < 0 ) { -+ FT_ERROR(( "ps_table_add: invalid length\n" )); -+ return PSaux_Err_Invalid_Argument; -+ } -+ - /* grow the base block if needed */ - if ( table->cursor + length > table->capacity ) - { Deleted: freetype2.install =================================================================== --- freetype2.install 2010-07-19 13:00:31 UTC (rev 85760) +++ freetype2.install 2010-07-19 13:01:22 UTC (rev 85761) @@ -1,23 +0,0 @@ -# arg 1: the new package version -post_install() { - echo -n "updating font cache... " - /sbin/ldconfig -r . - /usr/bin/fc-cache -f - echo "done." -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -op=$1 -shift - -$op $*
