This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 966306c72529c88a39dc3d9ad031e725b90d5de3 (commit) via 951b7092390099630e8e2262a3c9b2922129cc1c (commit) via af0d46c5df5e58f4a24f982871edd30383de9cf8 (commit) via bee3a5c3dc1e7bf9ab61fa49d676cf1b783bb7ee (commit) via 1477f6d14bbf5989494d2ec9f840c9d86eb20d44 (commit) via 320df0d20b508ba0666089ac9208d3790c44eece (commit) via f0e1ad5463be36cdf41bca0342a9cee54d9002a6 (commit) via f7b4d9606fda62eac86b31c25a47bedc1613de7c (commit) via 9c76728e22100cf20ee65ab5ad6d2fed5618c686 (commit) via b775d8b1f0f66fb03c74b2ace90815a401692752 (commit) via 46c25c13c0fd0c519b3d80edd7fa2b385c573372 (commit) via 8179e8c553909e69d7a06a176a36a30b232cdca9 (commit) from dac79561085739c0e1104257ba95eb3afb812705 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 966306c72529c88a39dc3d9ad031e725b90d5de3 Merge: 951b709 9c76728 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 19 22:52:51 2012 +0200
Merge remote-tracking branch 'stevee/dejavu-fonts'
commit 951b7092390099630e8e2262a3c9b2922129cc1c Merge: af0d46c b775d8b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 19 22:52:21 2012 +0200
Merge remote-tracking branch 'stevee/perl-Font-TTF'
commit af0d46c5df5e58f4a24f982871edd30383de9cf8 Merge: bee3a5c f7b4d96 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 19 22:51:49 2012 +0200
Merge remote-tracking branch 'stevee/unicode-ucd'
commit bee3a5c3dc1e7bf9ab61fa49d676cf1b783bb7ee Merge: 1477f6d f0e1ad5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 19 22:51:15 2012 +0200
Merge remote-tracking branch 'stevee/fontforge'
commit 1477f6d14bbf5989494d2ec9f840c9d86eb20d44 Merge: 320df0d 8179e8c Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 19 22:50:09 2012 +0200
Merge remote-tracking branch 'stevee/cairo'
commit 320df0d20b508ba0666089ac9208d3790c44eece Merge: dac7956 46c25c1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 19 22:50:05 2012 +0200
Merge remote-tracking branch 'stevee/pixman'
commit f0e1ad5463be36cdf41bca0342a9cee54d9002a6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat May 19 22:37:34 2012 +0200
fontforge: New package.
commit f7b4d9606fda62eac86b31c25a47bedc1613de7c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat May 19 22:20:24 2012 +0200
unicode-ucd: New package.
commit 9c76728e22100cf20ee65ab5ad6d2fed5618c686 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat May 19 22:34:01 2012 +0200
dejavu-fonts: New package.
commit b775d8b1f0f66fb03c74b2ace90815a401692752 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat May 19 20:17:10 2012 +0200
perl-Font-TTF: New package.
commit 46c25c13c0fd0c519b3d80edd7fa2b385c573372 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat May 19 19:44:19 2012 +0200
pixman: Update to 0.25.6.
Update pixman to latest release. Enable support for PNG.
commit 8179e8c553909e69d7a06a176a36a30b232cdca9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat May 19 19:44:53 2012 +0200
cairo: Update to 1.12.2.
Update to latest stable version. Also activate support for Xlib and XML2.
-----------------------------------------------------------------------
Summary of changes: cairo/cairo.nm | 15 ++- dejavu-fonts/dejavu-fonts.nm | 184 ++++++++++++++++++++ fontforge/fontforge.nm | 56 ++++++ .../patches/fontforge-20090224-pythondl.patch | 41 +++++ .../fontforge-20100501-select-points-crash.patch | 11 ++ .../patches/fontforge-20110222-libpng15.patch | 176 +++++++++++++++++++ .../perl-DBI.nm => perl-Font-TTF/perl-Font-TTF.nm | 24 ++-- pixman/pixman.nm | 13 +- unicode-ucd/unicode-ucd.nm | 50 ++++++ 9 files changed, 551 insertions(+), 19 deletions(-) create mode 100644 dejavu-fonts/dejavu-fonts.nm create mode 100644 fontforge/fontforge.nm create mode 100644 fontforge/patches/fontforge-20090224-pythondl.patch create mode 100644 fontforge/patches/fontforge-20100501-select-points-crash.patch create mode 100644 fontforge/patches/fontforge-20110222-libpng15.patch copy perl-DBI/perl-DBI.nm => perl-Font-TTF/perl-Font-TTF.nm (56%) create mode 100644 unicode-ucd/unicode-ucd.nm
Difference in files: diff --git a/cairo/cairo.nm b/cairo/cairo.nm index 5cafa62..56bc324 100644 --- a/cairo/cairo.nm +++ b/cairo/cairo.nm @@ -4,8 +4,8 @@ ###############################################################################
name = cairo -version = 1.10.2 -release = 3 +version = 1.12.2 +release = 1
groups = System/Graphics url = http://cairographics.org @@ -18,17 +18,26 @@ description end
source_dl = http://cairographics.org/releases/ +sources = %{thisapp}.tar.xz
build requires binutils>=2.21.51.0.8-2 fontconfig-devel freetype-devel + libX11-devel + libxml2-devel libpng-devel - pixman-devel + pixman-devel>=0.22 pkg-config zlib-devel end + + configure_options += \ + --enable-freetype \ + --enable-xlib \ + --enable-xml \ + --disable-static end
packages diff --git a/dejavu-fonts/dejavu-fonts.nm b/dejavu-fonts/dejavu-fonts.nm new file mode 100644 index 0000000..24a77fa --- /dev/null +++ b/dejavu-fonts/dejavu-fonts.nm @@ -0,0 +1,184 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = dejavu-fonts +version = 2.33 +release = 1 +arch = noarch + +groups = System/Fonts +url = http://www.dejavu-fonts.org/ +license = Bitstream Vera and Public Domain +summary = DejaVu fonts. + +description + The DejaVu font set is based on the "Bitstream Vera" fonts, release 1.10. Its + purpose is to provide a wider range of characters, while maintaining the + original style, using an open collaborative development process. +end + +source_dl = http://sourceforge.net/projects/dejavu/files/dejavu/%%7Bversion%7D/ +sources = %{thisapp}.tar.bz2 + +fontname = dejavu +fontdir = %{datadir}/fonts/%{fontname}/ +fontconfig_templatedir = %{datadir}/fontconfig/conf.avail/ +fontconfig_confdir = %{sysconfdir}/fonts/conf.d/ + +build + requires + perl(Font::TTF) + bzip2 + fontforge + unicode-ucd + end + + make_build_targets += \ + VERSION=%{version} \ + FC-LANG="" \ + BLOCKS=/usr/share/unicode/ucd/Blocks.txt \ + UNICODEDATA=/usr/share/unicode/ucd/UnicodeData.txt + + test + make check + end + + install + # Compress the huge state.txt. + bzip2 -9 build/status.txt + + # Create directories and install font files. + install -m 0755 -d %{BUILDROOT}%{fontdir} + install -m 0644 -p build/*.ttf %{BUILDROOT}%{fontdir} + + # Create directories for configuration files. + install -m 0755 -d %{BUILDROOT}%{fontconfig_templatedir} \ + %{BUILDROOT}%{fontconfig_confdir} + + # Install config files and symlink them to /etc. + cd fontconfig + for fontconf in *conf; do + install -m 0644 -p $fontconf %{BUILDROOT}%{fontconfig_templatedir} + ln -s ../../..%{fontconfig_templatedir}$fontconf \ + %{BUILDROOT}%{fontconfig_confdir}/$fontconf + + done + end +end + +packages + # Template for fonts. + template FONT + requires + %{name} = %{thisver} + end + end + + package %{name} + + package %{name}-sans-fonts + template FONT + + summary = Variable-width sans-serif font faces. + description + This package consists of the DejaVu sans-serif variable-width font faces, in + their unabridged version. + end + + files + %{fontdir}DejaVuSans.ttf + %{fontdir}DejaVuSans-*.ttf + %{fontdir}DejaVuSansCondensed*.ttf + %{fontconfig_templatedir}*-sans.conf + %{fontconfig_confdir}*-sans.conf + end + end + + package %{name}-serif-fonts + template FONT + + summary = Variable-width serif font faces. + description + This package consists of the DejaVu serif variable-width font faces, in + their unabridged version. + end + + files + %{fontdir}DejaVuSerif.ttf + %{fontdir}DejaVuSerif-*.ttf + %{fontdir}DejaVuSerifCondensed*.ttf + %{fontconfig_templatedir}*-serif.conf + %{fontconfig_confdir}*-serif.conf + end + end + + package %{name}-sans-mono-fonts + template FONT + + summary = Monospace sans-serif fon faces. + description + This package consists of the DejaVu sans-serif monospace font faces, in their + unabridged version. + end + + files + %{fontdir}DejaVuSansMono.ttf + %{fontconfig_templatedir}*-sans-mono.conf + %{fontconfig_confdir}*-sans-mono.conf + end + end + + package %{name}-lgc-sans-fonts + template FONT + + summary = Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset. + description + This package consists of the DejaVu sans-serif variable-width font faces, with + unicode coverage restricted to Latin, Greek and Cyrillic. + end + + files + %{fontdir}DejaVuLGCSans.ttf + %{fontdir}DejaVuLGCSans-*.ttf + %{fontdir}DejaVuLGCSansCondensed*.ttf + %{fontconfig_templatedir}*-lgc-sans.conf + %{fontconfig_confdir}*-lgc-sans.conf + end + end + + package %{name}-lgc-serif-fonts + template FONT + + summary = Variable-width serif font faces, Latin-Greek-Cyrillic subset. + description + This package consists of the DejaVu serif variable-width font faces, with + unicode coverage restricted to Latin, Greek and Cyrillic. + end + + files + %{fontdir}DejaVuLGCSerif.ttf + %{fontdir}DejaVuLGCSerif-*.ttf + %{fontdir}DejaVuLGCSerifCondensed*.ttf + %{fontconfig_templatedir}*-lgc-serif.conf + %{fontconfig_confdir}*-lgc-serif.conf + end + end + + package %{name}-lgc-sans-mono-fonts + template FONT + + summary = Monospace sans-serif font faces, Latin-Greek-Cyrillic subset. + description + This package consists of the DejaVu sans-serif monospace font faces, with + unicode coverage restricted to Latin, Greek and Cyrillic. + end + + files + %{fontdir}DejaVuLGCSansMono*.ttf + %{fontconfig_templatedir}*-lgc-sans-mono.conf + %{fontconfig_confdir}*-lgc-sans-mono.conf + end + end +end diff --git a/fontforge/fontforge.nm b/fontforge/fontforge.nm new file mode 100644 index 0000000..b281856 --- /dev/null +++ b/fontforge/fontforge.nm @@ -0,0 +1,56 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = fontforge +version = 20110222 +release = 1 + +groups = Applications/Publishing +url = http://fontforge.sourceforge.net/ +license = BSD +summary = Outline and bitmap font editor. + +description + FontForge (former PfaEdit) is a font editor for outline and bitmap + fonts. It supports a range of font formats, including PostScript + (ASCII and binary Type 1, some Type 3 and Type 0), TrueType, OpenType + (Type2) and CID-keyed fonts. +end + +source_dl = http://sourceforge.net/projects/fontforge/files/fontforge-source/ +sources = %{name}_full-%{version}.tar.bz2 + +build + requires + cairo-devel>=1.12.2 + freetype-devel + gettext + libjpeg-devel + libpng-devel + libtiff-devel + libXt-devel + libxml2-devel + pango-devel + python-devel + xorg-x11-proto-devel + end + + configure_options += \ + --with-freetype-bytecode=no \ + --with-regular-link \ + --enable-pyextension +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/fontforge/patches/fontforge-20090224-pythondl.patch b/fontforge/patches/fontforge-20090224-pythondl.patch new file mode 100644 index 0000000..45e04bf --- /dev/null +++ b/fontforge/patches/fontforge-20090224-pythondl.patch @@ -0,0 +1,41 @@ +diff -Nur fontforge-20090224.orig/configure fontforge-20090224/configure +--- fontforge-20090224.orig/configure 2008-12-24 14:04:18.000000000 -0700 ++++ fontforge-20090224/configure 2009-04-01 22:56:07.000000000 -0600 +@@ -26670,6 +26670,7 @@ + else + PYLIBS="" + fi ++ PYDEFINES="$PYDEFINES, ('SOLIBDIR','"$libdir/"')" + PY=pyhook/setup.py + fi + +diff -Nur fontforge-20090224.orig/pyhook/loadfontforge.h fontforge-20090224/pyhook/loadfontforge.h +--- fontforge-20090224.orig/pyhook/loadfontforge.h 2007-12-23 19:28:35.000000000 -0700 ++++ fontforge-20090224/pyhook/loadfontforge.h 2009-04-01 22:49:08.000000000 -0600 +@@ -11,7 +11,7 @@ + + if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) { + #ifdef PREFIX +- lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY); ++ lib = dlopen( SOLIBDIR "libgunicode.so.3" ,RTLD_LAZY); + #endif + } + if ( lib==NULL ) { +@@ -21,7 +21,7 @@ + + if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) { + #ifdef PREFIX +- lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY); ++ lib = dlopen( SOLIBDIR "libgutils.so.1" ,RTLD_LAZY); + #endif + } + if ( lib==NULL ) { +@@ -31,7 +31,7 @@ + + if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) { + #ifdef PREFIX +- lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY); ++ lib = dlopen( SOLIBDIR "libfontforge.so.1" ,RTLD_LAZY); + #endif + } + if ( lib==NULL ) { diff --git a/fontforge/patches/fontforge-20100501-select-points-crash.patch b/fontforge/patches/fontforge-20100501-select-points-crash.patch new file mode 100644 index 0000000..90c9bde --- /dev/null +++ b/fontforge/patches/fontforge-20100501-select-points-crash.patch @@ -0,0 +1,11 @@ +--- fontforge-20100501.orig/fontforge/charview.c 2010-04-15 03:26:28.000000000 +0100 ++++ fontforge-20100501/fontforge/charview.c 2011-03-01 15:09:22.821753002 +0000 +@@ -8597,7 +8597,7 @@ + static int CVNumForePointsSelected(CharView *cv, BasePoint **bp) { + SplineSet *spl; + SplinePoint *test, *first; +- BasePoint *bps[4]; ++ BasePoint *bps[5]; + int i, cnt; + + if ( cv->b.drawmode!=dm_fore ) diff --git a/fontforge/patches/fontforge-20110222-libpng15.patch b/fontforge/patches/fontforge-20110222-libpng15.patch new file mode 100644 index 0000000..156e3c1 --- /dev/null +++ b/fontforge/patches/fontforge-20110222-libpng15.patch @@ -0,0 +1,176 @@ +From e76a8a537dbf8c47024f5863f9f18ed55ad686d3 Mon Sep 17 00:00:00 2001 +From: michal-n michal-n@users.sourceforge.net +Date: Sat, 17 Dec 2011 15:24:12 +0100 +Subject: [PATCH] There was no need to panic... + The patch from Paul contained errant reference to 'png_color16'. + The correct form is 'png_color_16'. So, patch reapplied. + +--- + gutils/gimagewritepng.c | 100 +++++++++++++++++++++++----------------------- + 1 files changed, 50 insertions(+), 50 deletions(-) + +diff --git a/gutils/gimagewritepng.c b/gutils/gimagewritepng.c +index 43fa097..a88ec63 100644 +--- a/gutils/gimagewritepng.c ++++ b/gutils/gimagewritepng.c +@@ -236,6 +236,7 @@ return(false); + } + } else { + if ( base->trans!=-1 ) { ++ trans_color = galloc(sizeof(png_color_16)); + trans_color->red = COLOR_RED(base->trans); + trans_color->green = COLOR_GREEN(base->trans); + trans_color->blue = COLOR_BLUE(base->trans); +@@ -258,6 +259,7 @@ return(false); + _png_write_end(png_ptr, info_ptr); + + if ( trans_alpha!=NULL ) gfree(trans_alpha); ++ if ( trans_color!=NULL ) gfree(trans_color); + if ( palette!=NULL ) gfree(palette); + _png_destroy_write_struct(&png_ptr, &info_ptr); + gfree(rows); +@@ -296,7 +298,7 @@ static void user_error_fn(png_structp png_ptr, png_const_charp error_msg) { + #if (PNG_LIBPNG_VER < 10500) + longjmp(png_ptr->jmpbuf,1); + #else +- _png_longjmp (png_ptr, 1); ++ png_longjmp (png_ptr, 1); + #endif + } + +@@ -310,6 +312,12 @@ int GImageWrite_Png(GImage *gi, FILE *fp, int progressive) { + png_infop info_ptr; + png_byte **rows; + int i; ++ int bit_depth; ++ int color_type; ++ int num_palette; ++ png_bytep trans_alpha = NULL; ++ png_color_16p trans_color = NULL; ++ png_colorp palette = NULL; + + png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, + (void *)NULL, user_error_fn, user_warning_fn); +@@ -336,65 +344,60 @@ return(false); + + png_init_io(png_ptr, fp); + +- info_ptr->width = base->width; +- info_ptr->height = base->height; +- info_ptr->bit_depth = 8; +- info_ptr->valid = 0; +- info_ptr->interlace_type = progressive; +- if ( base->trans!=-1 ) { +- info_ptr->num_trans = 1; +- info_ptr->valid |= PNG_INFO_tRNS; ++ bit_depth = 8; ++ num_palette = base->clut==NULL?2:base->clut->clut_len; ++ if ( base->image_type==it_index || base->image_type==it_bitmap ) { ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ if ( num_palette<=2 ) ++ bit_depth=1; ++ else if ( num_palette<=4 ) ++ bit_depth=2; ++ else if ( num_palette<=16 ) ++ bit_depth=4; ++ } else { ++ color_type = PNG_COLOR_TYPE_RGB; ++ if ( base->image_type == it_rgba ) ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; + } ++ ++ png_set_IHDR(png_ptr, info_ptr, base->width, base->height, ++ bit_depth, color_type, progressive, ++ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + if ( base->image_type==it_index || base->image_type==it_bitmap ) { +- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; +- info_ptr->valid |= PNG_INFO_PLTE; +- info_ptr->num_palette = base->clut==NULL?2:base->clut->clut_len; +- info_ptr->palette = (png_color *) galloc(info_ptr->num_palette*sizeof(png_color)); ++ palette = (png_color *) galloc(num_palette*sizeof(png_color)); + if ( base->clut==NULL ) { +- info_ptr->palette[0].red = info_ptr->palette[0].green = info_ptr->palette[0].blue = 0; +- info_ptr->palette[1].red = info_ptr->palette[1].green = info_ptr->palette[1].blue = 0xff; ++ palette[0].red = palette[0].green = palette[0].blue = 0; ++ palette[1].red = palette[1].green = palette[1].blue = 0xff; + } else { +- for ( i=0; i<info_ptr->num_palette; ++i ) { ++ for ( i=0; i<num_palette; ++i ) { + long col = base->clut->clut[i]; +- info_ptr->palette[i].red = COLOR_RED(col); +- info_ptr->palette[i].green = COLOR_GREEN(col); +- info_ptr->palette[i].blue = COLOR_BLUE(col); ++ palette[i].red = COLOR_RED(col); ++ palette[i].green = COLOR_GREEN(col); ++ palette[i].blue = COLOR_BLUE(col); + } + } +- if ( info_ptr->num_palette<=2 ) +- info_ptr->bit_depth=1; +- else if ( info_ptr->num_palette<=4 ) +- info_ptr->bit_depth=2; +- else if ( info_ptr->num_palette<=16 ) +- info_ptr->bit_depth=4; +- if ( info_ptr->num_palette<=16 ) ++ png_set_PLTE(png_ptr, info_ptr, palette, num_palette); ++ if ( num_palette<=16 ) + png_set_packing(png_ptr); ++ + if ( base->trans!=-1 ) { +-#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 ) +- info_ptr->trans_alpha = galloc(1); +- info_ptr->trans_alpha[0] = base->trans; +-#else +- info_ptr->trans = galloc(1); +- info_ptr->trans[0] = base->trans; +-#endif ++ trans_alpha = galloc(1); ++ trans_alpha[0] = base->trans; + } + } else { +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; + if ( base->trans!=-1 ) { +-#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 ) +- 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); +-#else +- 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); +-#endif ++ trans_color = galloc(sizeof(png_color_16)); ++ trans_color->red = COLOR_RED(base->trans); ++ trans_color->green = COLOR_GREEN(base->trans); ++ trans_color->blue = COLOR_BLUE(base->trans); + } + } ++ if ( base->trans!=-1 ) { ++ png_set_tRNS(png_ptr, info_ptr, trans_alpha, 1, trans_color); ++ } + png_write_info(png_ptr, info_ptr); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++ if (color_type == PNG_COLOR_TYPE_RGB) + png_set_filler(png_ptr, '\0', PNG_FILLER_BEFORE); + + rows = galloc(base->height*sizeof(png_byte *)); +@@ -405,12 +408,9 @@ return(false); + + png_write_end(png_ptr, info_ptr); + +-#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 ) +- if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha); +-#else +- if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans); +-#endif +- if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette); ++ if ( trans_alpha!=NULL ) gfree(trans_alpha); ++ if ( trans_color!=NULL ) gfree(trans_color); ++ if ( palette!=NULL ) gfree(palette); + png_destroy_write_struct(&png_ptr, &info_ptr); + gfree(rows); + return( 1 ); +-- +1.7.4.1 + diff --git a/perl-Font-TTF/perl-Font-TTF.nm b/perl-Font-TTF/perl-Font-TTF.nm new file mode 100644 index 0000000..fc0fd19 --- /dev/null +++ b/perl-Font-TTF/perl-Font-TTF.nm @@ -0,0 +1,60 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = perl-Font-TTF +version = 0.48 +release = 1 +arch = noarch +thisapp = Font-TTF-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/Font-TTF/ +license = Artistic 2.0 +summary = Perl library for modifying TTF font files. + +description + Perl module for TrueType font hacking. Supports reading, processing and writing + of the following tables: GDEF, GPOS, GSUB, LTSH, OS/2, PCLT, bsln, cmap, cvt, + fdsc, feat, fpgm, glyf, hdmx, head, hhea, hmtx, kern, loca, maxp, mort, name, + post, prep, prop, vhea, vmtx and the reading and writing of all other table + types. +end + +source_dl = http://search.cpan.org/CPAN/authors/id/M/MH/MHOSKEN/ + +build + requires + perl(ExtUtils::MakeMaker) + perl(ExtUtils::ParseXS) + perl(Test::Simple) + end + + build + perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}" + make %{PARALLELISMFLAGS} + end + + test + make test + end + + make_install_targets = pure_install DESTDIR=%{BUILDROOT} +end + +packages + package %{name} + filter_requires + Win32 + end + + requires + perl + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/pixman/pixman.nm b/pixman/pixman.nm index fa24080..573d343 100644 --- a/pixman/pixman.nm +++ b/pixman/pixman.nm @@ -4,11 +4,11 @@ ###############################################################################
name = pixman -version = 0.18.4 -release = 2 +version = 0.25.6 +release = 1
groups = System/Libraries -url = http://xorg.freedesktop.org/archive/individual/lib/ +url = http://www.X.org/ license = MIT summary = Pixel manipulation library.
@@ -16,18 +16,21 @@ description Pixman is a pixel manipulation library for X and cairo. end
-source_dl = +source_dl = http://xorg.freedesktop.org/archive/individual/lib/
build requires + libpng-devel perl pkg-config end + + configure_options += \ + --disable-arm-iwmmxt end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/unicode-ucd/unicode-ucd.nm b/unicode-ucd/unicode-ucd.nm new file mode 100644 index 0000000..520edec --- /dev/null +++ b/unicode-ucd/unicode-ucd.nm @@ -0,0 +1,50 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = unicode-ucd +version = 6.1.0 +release = 1 +arch = noarch + +groups = Development/System +url = http://www.unicode.org/ucd/ +license = MIT +summary = Unicode Character Database. + +description + The Unicode Character Database (UCD) consists of a number of data files listing + Unicode character properties and related data. It also includes data files + containing test data for conformance to several important Unicode algorithms. +end + +source_dl = http://www.unicode.org/Public/zipped/%%7Bversion%7D/ +sources = UCD.zip + +build + requires + unzip>=6.0-3 + end + + prepare + # Manually create DIR_APP because the + # soucre archive doesn't contain any folder. + mkdir -pv %{DIR_APP} + + # Manually extract zip compressed source archive. + cd %{DIR_APP} && unzip %{DIR_DL}/%{sources} + end + + build = # Nothing to do + + install + # Create install folder and copy files. + mkdir -pv %{BUILDROOT}%{datadir}/unicode/ucd/ + cp -arvf . %{BUILDROOT}%{datadir}/unicode/ucd/ + end +end + +packages + package %{name} +end
hooks/post-receive -- IPFire 3.x development tree