- 20100501

Changed files:
    fontforge-libpng.patch -> 1.2
    fontforge.spec -> 1.22

diff --git a/fontforge-libpng.patch b/fontforge-libpng.patch
deleted file mode 100644 (file)
index 8dd7391..0000000
--- a/fontforge-libpng.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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);

diff --git a/fontforge.spec b/fontforge.spec
index 6a7d3e602cf55bc1ffa9e875d94950a866ae8274..b6de3aa8e054b37fe3c1c9625b9855e249d8021e 100644 (file)
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -1,14 +1,13 @@
 Summary:       An outline font editor
 Summary(pl.UTF-8):     Edytor fontów rysowanych
 Name:          fontforge
-Version:       20090923
-Release:       7
+Version:       20100501
+Release:       0.1
 License:       BSD
 Group:         X11/Applications/Publishing
 Source0:       http://dl.sourceforge.net/fontforge/%{name}_full-%{version}.tar.bz2
-# Source0-md5: ea9d8dc38de79235fbe6add725b38ffe
+# Source0-md5: 5f3d20d645ec1aa2b7b4876386df8717
 Patch0:                %{name}-sonames.patch
-Patch1:                %{name}-libpng.patch
 URL:           http://fontforge.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -51,7 +50,6 @@ FontForge wcześniej nazywał się PfaEdit.
 %setup -q
 # hardcoded in code is +- same as hardcoded at compile time
 #%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}