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

[Eric Bélanger]

    Date: Thursday, February 11, 2010 @ 22:04:38
  Author: eric
Revision: 68255

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

........
  r68254 | eric | 2010-02-11 22:04:19 -0500 (Thu, 11 Feb 2010) | 2 lines
  
  upgpkg: fontforge 20090923-2
      Added python interpreter, Disabled dlopen
........

Modified:
  fontforge/repos/extra-i686/	(properties)
  fontforge/repos/extra-i686/ChangeLog
  fontforge/repos/extra-i686/PKGBUILD
  fontforge/repos/extra-i686/libpng14.patch

----------------+
 ChangeLog      |    2 ++
 PKGBUILD       |    9 ++++-----
 libpng14.patch |   33 +++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)


Property changes on: fontforge/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /fontforge/trunk:1-68227
   + /fontforge/trunk:1-68254

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2010-02-12 03:04:19 UTC (rev 68254)
+++ extra-i686/ChangeLog	2010-02-12 03:04:38 UTC (rev 68255)
@@ -1,6 +1,8 @@
 2010-02-10  Eric Belanger  <eric at archlinux.org>
 
 	* fontforge 20090923-2
+	* Added python interpreter
+	* Disabled dlopen
 	* Rebuilt against libpng 1.4.0 (close FS#18284)
 
 2009-10-14  Eric Belanger  <eric at archlinux.org>

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-12 03:04:19 UTC (rev 68254)
+++ extra-i686/PKGBUILD	2010-02-12 03:04:38 UTC (rev 68255)
@@ -9,19 +9,18 @@
 arch=('i686' 'x86_64')
 url="http://fontforge.sourceforge.net"
 license=('BSD')
-depends=('libxkbui' 'libxi')
-makedepends=('freetype2' 'libxml2' 'pango')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libpng' 'libtiff' 'libjpeg' 'python')
 options=('!libtool' '!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \
         libpng14.patch)
-md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877')
-sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd')
+md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '7f69008310b6c1b8c1f2d617fc68d207')
+sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' 'b25885ad555bb25736f25311a23b5b21fc5a2165')
 
 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
+    --enable-devicetables --with-regular-link --with-python || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1

Modified: extra-i686/libpng14.patch
===================================================================
--- extra-i686/libpng14.patch	2010-02-12 03:04:19 UTC (rev 68254)
+++ extra-i686/libpng14.patch	2010-02-12 03:04:38 UTC (rev 68255)
@@ -56,3 +56,36 @@
      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);