Date: Wednesday, June 9, 2010 @ 11:59:29 Author: andrea Revision: 82232
upgpkg: fontforge 20100501-1 upstream release; enable python module (FS#19723) Modified: fontforge/trunk/PKGBUILD Deleted: fontforge/trunk/ChangeLog fontforge/trunk/libpng14.patch ----------------+ ChangeLog | 88 ----------------------------------------------------- PKGBUILD | 32 ++++++++++++------- libpng14.patch | 91 ------------------------------------------------------- 3 files changed, 20 insertions(+), 191 deletions(-) Deleted: ChangeLog =================================================================== --- ChangeLog 2010-06-09 15:58:11 UTC (rev 82231) +++ ChangeLog 2010-06-09 15:59:29 UTC (rev 82232) @@ -1,88 +0,0 @@ -2010-02-10 Eric Belanger <[email protected]> - - * fontforge 20090923-2 - * Added python interpreter - * Disabled dlopen - * Rebuilt against libpng 1.4.0 (close FS#18284) - -2009-10-14 Eric Belanger <[email protected]> - - * fontforge 20090923-1 - * Upstream update - -2009-09-25 Eric Belanger <[email protected]> - - * fontforge 20090914-2 - * Fixed problem with opening SVG fonts (close FS#16326) - * Fixed devicetables configure option - -2009-09-19 Eric Belanger <[email protected]> - - * fontforge 20090914-1 - * Upstream update - * Enabled double support (close FS#16038) - * Changed deprecated multilayer option to type3 - -2009-06-23 Eric Belanger <[email protected]> - - * fontforge 20090622-1 - * Upstream update - -2009-04-13 Eric Belanger <[email protected]> - - * fontforge 20090408-1 - * Upstream update - -2009-02-27 Eric Belanger <[email protected]> - - * fontforge 20090224-1 - * Upstream update - -2008-12-29 Eric Belanger <[email protected]> - - * fontforge 20081224-1 - * Upstream update - -2008-11-16 Eric Belanger <[email protected]> - - * fontforge 20081115-1 - * Upstream update - -2008-11-14 Eric Belanger <[email protected]> - - * fontforge 20080927-1 - * Upstream update - -2008-08-28 Eric Belanger <[email protected]> - - * fontforge 20080828-1 - * Upstream update - -2008-07-20 Eric Belanger <[email protected]> - - * fontforge 20080720-1 - * Upstream update - -2008-06-13 Eric Belanger <[email protected]> - - * fontforge 20080607-1 - * Upstream update - -2008-05-09 Eric Belanger <[email protected]> - - * fontforge 20080429-1 - * Upstream update - -2008-03-31 Eric Belanger <[email protected]> - - * fontforge 20080330-1 - * Upstream update - -2008-03-01 Eric Belanger <[email protected]> - - * fontforge 20080203-1 - * Upstream update - * Fixed license: custom -> BSD - * Disabled SMP build - * Added freetype2 makedepends - * FSH man pages Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-06-09 15:58:11 UTC (rev 82231) +++ PKGBUILD 2010-06-09 15:59:29 UTC (rev 82232) @@ -1,27 +1,35 @@ # $Id$ -# Maintainer: Eric Belanger <[email protected]> +# Maintainer: +# Contributor: Eric Belanger <[email protected]> # Contributor: William Rea <[email protected]> pkgname=fontforge -pkgver=20090923 -pkgrel=2 +pkgver=20100501 +pkgrel=1 pkgdesc="An outline and bitmap font editor" arch=('i686' 'x86_64') url="http://fontforge.sourceforge.net"; license=('BSD') -depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libpng' 'libtiff' 'libjpeg' 'python') +depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python') options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \ - libpng14.patch) -md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '7f69008310b6c1b8c1f2d617fc68d207') -sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' 'b25885ad555bb25736f25311a23b5b21fc5a2165') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2";) +md5sums=('5f3d20d645ec1aa2b7b4876386df8717') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../libpng14.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \ - --enable-devicetables --with-regular-link --with-python || return 1 + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-type3 \ + --enable-double \ + --enable-devicetables \ + --with-regular-link \ + --with-python \ + --enable-pyextension || return 1 make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 } Deleted: libpng14.patch =================================================================== --- libpng14.patch 2010-06-09 15:58:11 UTC (rev 82231) +++ libpng14.patch 2010-06-09 15:59:29 UTC (rev 82232) @@ -1,91 +0,0 @@ -diff -Naur fontforge-20090923-orig/gutils/gimagereadpng.c fontforge-20090923/gutils/gimagereadpng.c ---- fontforge-20090923-orig/gutils/gimagereadpng.c 2010-02-11 00:22:37.000000000 -0500 -+++ fontforge-20090923/gutils/gimagereadpng.c 2010-02-11 00:27:03.000000000 -0500 -@@ -220,13 +220,13 @@ - if ( (info_ptr->valid&PNG_INFO_tRNS) && info_ptr->num_trans>0 ) { - if ( info_ptr->color_type==PNG_COLOR_TYPE_RGB || info_ptr->color_type==PNG_COLOR_TYPE_RGB_ALPHA ) - base->trans = COLOR_CREATE( -- (info_ptr->trans_values.red>>8), -- (info_ptr->trans_values.green>>8), -- (info_ptr->trans_values.blue>>8)); -+ (info_ptr->trans_color.red>>8), -+ (info_ptr->trans_color.green>>8), -+ (info_ptr->trans_color.blue>>8)); - else if ( base->image_type == it_mono ) -- base->trans = info_ptr->trans[0]; -+ base->trans = info_ptr->trans_alpha[0]; - else -- base->clut->trans_index = base->trans = info_ptr->trans[0]; -+ base->clut->trans_index = base->trans = info_ptr->trans_alpha[0]; - } - - row_pointers = galloc(info_ptr->height*sizeof(png_bytep)); -diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c ---- fontforge-20090923-orig/gutils/gimagewritepng.c 2010-02-11 03:11:19.000000000 -0500 -+++ fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 03:17:15.000000000 -0500 -@@ -183,8 +183,8 @@ - if ( info_ptr->num_palette<=16 ) - _png_set_packing(png_ptr); - if ( base->trans!=-1 ) { -- info_ptr->trans = galloc(1); -- info_ptr->trans[0] = base->trans; -+ info_ptr->trans_alpha = galloc(1); -+ info_ptr->trans_alpha[0] = base->trans; - } - } else { - info_ptr->color_type = PNG_COLOR_TYPE_RGB; -@@ -192,9 +192,9 @@ - info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; - - if ( base->trans!=-1 ) { -- info_ptr->trans_values.red = COLOR_RED(base->trans); -- info_ptr->trans_values.green = COLOR_GREEN(base->trans); -- info_ptr->trans_values.blue = COLOR_BLUE(base->trans); -+ info_ptr->trans_color.red = COLOR_RED(base->trans); -+ info_ptr->trans_color.green = COLOR_GREEN(base->trans); -+ info_ptr->trans_color.blue = COLOR_BLUE(base->trans); - } - } - _png_write_info(png_ptr, info_ptr); -@@ -210,7 +210,7 @@ - - _png_write_end(png_ptr, info_ptr); - -- if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans); -+ if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha); - if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette); - _png_destroy_write_struct(&png_ptr, &info_ptr); - gfree(rows); -diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c ---- fontforge-20090923-orig/gutils/gimagewritepng.c 2010-02-11 17:10:41.000000000 -0500 -+++ fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 17:12:59.000000000 -0500 -@@ -314,15 +314,15 @@ - if ( info_ptr->num_palette<=16 ) - png_set_packing(png_ptr); - if ( base->trans!=-1 ) { -- info_ptr->trans = galloc(1); -- info_ptr->trans[0] = base->trans; -+ info_ptr->trans_alpha = galloc(1); -+ info_ptr->trans_alpha[0] = base->trans; - } - } else { - info_ptr->color_type = PNG_COLOR_TYPE_RGB; - if ( base->trans!=-1 ) { -- info_ptr->trans_values.red = COLOR_RED(base->trans); -- info_ptr->trans_values.green = COLOR_GREEN(base->trans); -- info_ptr->trans_values.blue = COLOR_BLUE(base->trans); -+ info_ptr->trans_color.red = COLOR_RED(base->trans); -+ info_ptr->trans_color.green = COLOR_GREEN(base->trans); -+ info_ptr->trans_color.blue = COLOR_BLUE(base->trans); - } - } - png_write_info(png_ptr, info_ptr); -@@ -338,7 +338,7 @@ - - png_write_end(png_ptr, info_ptr); - -- if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans); -+ if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha); - if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette); - png_destroy_write_struct(&png_ptr, &info_ptr); - gfree(rows);
