Author: arekm Date: Tue Feb 2 21:18:50 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; libpng fix; update configure options.
---- Files affected: packages/fontforge: fontforge.spec (1.14 -> 1.15) , fontforge-libpng.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/fontforge/fontforge.spec diff -u packages/fontforge/fontforge.spec:1.14 packages/fontforge/fontforge.spec:1.15 --- packages/fontforge/fontforge.spec:1.14 Sun Oct 25 21:39:55 2009 +++ packages/fontforge/fontforge.spec Tue Feb 2 22:18:45 2010 @@ -3,12 +3,13 @@ Summary(pl.UTF-8): Edytor fontów rysowanych Name: fontforge Version: 20090923 -Release: 2 +Release: 3 License: BSD Group: X11/Applications/Publishing Source0: http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2 # Source0-md5: ea9d8dc38de79235fbe6add725b38ffe Patch0: %{name}-sonames.patch +Patch1: %{name}-libpng.patch URL: http://fontforge.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -49,15 +50,18 @@ %setup -q # hardcoded in code is +- same as hardcoded at compile time #%patch0 -p1 -#%patch2 -p1 +%patch1 -p1 %build %{__libtoolize} %{__aclocal} %{__autoconf} %configure \ + --enable-type3 \ + --enable-devicetables \ + --enable-longdouble \ --with-freetype-bytecode \ - --with-multilayer \ + --with-regular-link \ --without-freetype-src %{__make} @@ -96,6 +100,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2010/02/02 21:18:45 arekm +- rel 3; libpng fix; update configure options. + Revision 1.14 2009/10/25 20:39:55 arekm - rel 2 ================================================================ Index: packages/fontforge/fontforge-libpng.patch diff -u /dev/null packages/fontforge/fontforge-libpng.patch:1.1 --- /dev/null Tue Feb 2 22:18:50 2010 +++ packages/fontforge/fontforge-libpng.patch Tue Feb 2 22:18:45 2010 @@ -0,0 +1,53 @@ +--- fontforge-20090923/gutils/gimagereadpng.c.org 2010-02-02 22:11:46.311972507 +0100 ++++ fontforge-20090923/gutils/gimagereadpng.c 2010-02-02 22:12:47.331770721 +0100 +@@ -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)); +--- fontforge-20090923/gutils/gimagewritepng.c.org 2010-02-02 22:12:59.071757326 +0100 ++++ fontforge-20090923/gutils/gimagewritepng.c 2010-02-02 22:13:34.171767176 +0100 +@@ -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); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fontforge/fontforge.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
