Merge remote-tracking branch 'stevee/unicode-ucd'

diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm
index 53d74bcf4e41b29937b1577949298a9d165eeb8a..acf65d0c3c8f3bde24bc6f7673fb3a953bd494c4 100644 (file)
--- a/c_icap/c_icap.nm
+++ b/c_icap/c_icap.nm
@@ -5,7 +5,7 @@
 
 name       = c_icap
 version    = 0.1.7
-release    = 2
+release    = 3
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -33,7 +33,7 @@ build
        configure_options += \
                --enable-large-files \
                --enable-ipv6 \
-               --sysconfdir=/etc \
+               --sysconfdir=/etc/c-icap \
                --localstatedir=/var
 
        prepare_cmds
@@ -50,6 +50,13 @@ end
 packages
        package %{name}
                requires = %{name}_modules
+
+               configfiles
+                       /etc/c-icap/c-icap.conf
+                       /etc/c-icap/c-icap.conf.default
+                       /etc/c-icap/c-icap.magic
+                       /etc/c-icap/c-icap.magic.default
+               end
        end
 
        package %{name}-debuginfo

diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm
index 5f34d46a64c10256e10f738d68ad6e2805a8bbec..d6e2911c8c0c60f9999a58f955cbf5f2cb3edaa0 100644 (file)
--- a/c_icap_modules/c_icap_modules.nm
+++ b/c_icap_modules/c_icap_modules.nm
@@ -5,7 +5,7 @@
 
 name       = c_icap_modules
 version    = 0.1.6
-release    = 1
+release    = 2
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -25,14 +25,14 @@ build
        requires
                autoconf
                automake
-               c_icap
+               c_icap >= 0.1.7-3
                clamav-devel
                db4-devel
                libtool-devel
        end
 
        configure_options += \
-               --sysconfdir=/etc \
+               --sysconfdir=/etc/c-icap \
                --localstatedir=/var
 
        prepare_cmds
@@ -40,13 +40,19 @@ build
        end
 
        install
-               mkdir -pv %{BUILDROOT}/etc
+               mkdir -pv %{BUILDROOT}/etc/c-icap
                make install DESTDIR=%{BUILDROOT}
        end
 end
 
 packages
        package %{name}
+               configfiles
+                       /etc/c-icap/srv_clamav.conf
+                       /etc/c-icap/srv_clamav.conf.default
+                       /etc/c-icap/srv_url_check.conf
+                       /etc/c-icap/srv_url_check.conf.default
+               end
        end
 
        package %{name}-debuginfo

diff --git a/cairo/cairo.nm b/cairo/cairo.nm
index 5cafa622c5694a48d9308dce68023e30ef536338..56bc324be048109e43c3b2b3cf8b8b4b5f41c9f4 100644 (file)
--- 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/fontforge/fontforge.nm b/fontforge/fontforge.nm
new file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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/pixman/pixman.nm b/pixman/pixman.nm
index fa240805a50ae6eb4ffaeaf6f42f6e7a6e0ad005..573d3438d0d06dedb2871d70509f83d42faed94e 100644 (file)
--- 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