[arch-commits] Commit in fontforge/repos (4 files)

[Eric Bélanger]

    Date: Thursday, February 11, 2010 @ 16:18:19
  Author: eric
Revision: 68234

Merged revisions 68227 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/fontforge/trunk

........
  r68227 | eric | 2010-02-11 16:15:44 -0500 (Thu, 11 Feb 2010) | 2 lines
  
  upgpkg: fontforge 20090923-2
      Rebuilt against libpng 1.4.0 (close FS#18284)
........

Added:
  fontforge/repos/extra-x86_64/libpng14.patch
    (from rev 68227, fontforge/trunk/libpng14.patch)
Modified:
  fontforge/repos/extra-x86_64/	(properties)
  fontforge/repos/extra-x86_64/ChangeLog
  fontforge/repos/extra-x86_64/PKGBUILD

----------------+
 ChangeLog      |    5 ++++
 PKGBUILD       |   10 +++++----
 libpng14.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 4 deletions(-)


Property changes on: fontforge/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /fontforge/trunk:1-55853
   + /fontforge/trunk:1-68232

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2010-02-11 21:18:09 UTC (rev 68233)
+++ extra-x86_64/ChangeLog	2010-02-11 21:18:19 UTC (rev 68234)
@@ -1,3 +1,8 @@
+2010-02-10  Eric Belanger  <eric at archlinux.org>
+
+	* fontforge 20090923-2
+	* Rebuilt against libpng 1.4.0 (close FS#18284)
+
 2009-10-14  Eric Belanger  <eric at archlinux.org>
 
 	* fontforge 20090923-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-11 21:18:09 UTC (rev 68233)
+++ extra-x86_64/PKGBUILD	2010-02-11 21:18:19 UTC (rev 68234)
@@ -4,7 +4,7 @@
 
 pkgname=fontforge
 pkgver=20090923
-pkgrel=1
+pkgrel=2
 pkgdesc="An outline and bitmap font editor"
 arch=('i686' 'x86_64')
 url="http://fontforge.sourceforge.net"
@@ -12,12 +12,14 @@
 depends=('libxkbui' 'libxi')
 makedepends=('freetype2' 'libxml2' 'pango')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2)
-md5sums=('ea9d8dc38de79235fbe6add725b38ffe')
-sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd')
+source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \
+        libpng14.patch)
+md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877')
+sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../libpng14.patch || return 1
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \
     --enable-devicetables --without-python || return 1
   make || return 1

Copied: fontforge/repos/extra-x86_64/libpng14.patch (from rev 68227, fontforge/trunk/libpng14.patch)
===================================================================
--- extra-x86_64/libpng14.patch	                        (rev 0)
+++ extra-x86_64/libpng14.patch	2010-02-11 21:18:19 UTC (rev 68234)
@@ -0,0 +1,58 @@
+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);