- updated to 0.2.2, removed obsolete gd patch

  (SONAME has changed, ImageMagick must be rebuild too)
- added segv patch with some ugly SEGV workarounds

Changed files:
    libwmf-gd.patch -> 1.2
    libwmf-segv.patch -> 1.1
    libwmf.spec -> 1.35

diff --git a/libwmf-gd.patch b/libwmf-gd.patch
deleted file mode 100644 (file)
index 7a149ff..0000000
--- a/libwmf-gd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwmf-0.2.1/src/ipa/gd.h.orig     Mon May 14 09:27:18 2001
-+++ libwmf-0.2.1/src/ipa/gd.h  Thu Aug 30 23:23:09 2001
-@@ -23,7 +23,7 @@
- /* I suppose I shouldn't call this file gd.h, but as long <gd.h> is included
-  * before any other "gd*.h" there's no problem...
-  */
--#include <gd.h>
-+#include "../extra/gd/gd.h"
- 
- extern int gdImageBoundsSafe (gdImage*,int,int);
- 

diff --git a/libwmf-segv.patch b/libwmf-segv.patch
new file mode 100644 (file)
index 0000000..b8c9b54
--- /dev/null
+++ b/libwmf-segv.patch
@@ -0,0 +1,33 @@
+--- libwmf-0.2.2/src/ipa/ipa/font.h.orig       Wed Feb 20 23:35:46 2002
++++ libwmf-0.2.2/src/ipa/ipa/font.h    Wed Feb 20 23:38:11 2002
+@@ -530,6 +530,8 @@
+ 
+       FT_Set_Transform (face,0,0);
+ 
++      if (!face)
++              return 0;
+       use_kerning = FT_HAS_KERNING (face);
+ 
+       previous = 0;
+@@ -579,6 +579,9 @@
+ 
+       FT_Set_Transform (face,0,0);
+ 
++      if (!face)
++              return 0;
++
+       use_kerning = FT_HAS_KERNING (face);
+ 
+       previous = 0;
+--- libwmf-0.2.2/src/ipa/xgd/font.h.orig       Tue Oct 16 10:11:43 2001
++++ libwmf-0.2.2/src/ipa/xgd/font.h    Wed Feb 20 23:49:50 2002
+@@ -119,6 +119,9 @@
+ 
+       FT_Load_Char (face,draw_text->str[0],FT_LOAD_RENDER);
+ 
++      if (!face)
++              return;
++
+       pt.x += face->glyph->bitmap_left;
+       pt.y -= face->glyph->bitmap_top;
+ 

diff --git a/libwmf.spec b/libwmf.spec
index 8efef250d72da8a7c237e16c1942213b65f1b8dd..5dbd7fc0e5ca594de5ee94160d0958fcece82a32 100644 (file)
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,19 +1,31 @@
 Summary:       libwmf - library to convert wmf files
 Summary(pl):   libwmf - biblioteka z funkcjami do konwersji plików wmf
 Name:          libwmf
-Version:       0.2.1
-Release:       2
+Version:       0.2.2
+Release:       1
 Epoch:         2
 License:       GPL
 Vendor:                Caolan McNamara <Caolan.McNamara@ul.ie>
 Group:         Applications/Text
+Group(cs):     Aplikace/Text
+Group(da):     Programmer/Tekst
 Group(de):     Applikationen/Text
-Group(fr):     Utilitaires/Texte
+Group(es):     Aplicaciones/Texto
+Group(fr):     Applications/Texte
+Group(is):     Forrit/Texti
+Group(it):     Applicazioni/Testo
+Group(ja):     ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥Æ¥­¥¹¥È
+Group(no):     Applikasjoner/Tekst
 Group(pl):     Aplikacje/Tekst
+Group(pt):     Aplicações/Texto
+Group(ru):     ðÒÉÌÏÖÅÎÉÑ/ôÅËÓÔÏ×ÙÅ ÕÔÉÌÉÔÙ
+Group(sl):     Programi/Besedilo
+Group(sv):     Tillämpningar/Text
+Group(uk):     ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/ôÅËÓÔÏצ ÕÔÉ̦ÔÉ
 Source0:       ftp://download.sourceforge.net/pub/sourceforge/wvware/%{name}-%{version}.tar.gz
 Patch0:                %{name}-fontmap-pld.patch
-Patch1:                %{name}-gd.patch
-Patch2:                %{name}-includes.patch
+Patch1:                %{name}-includes.patch
+Patch2:                %{name}-segv.patch
 URL:           http://wvware.sourceforge.net/
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
@@ -45,12 +57,21 @@ okienku oraz format xpm.
 Summary:       libwmf - header files
 Summary(pl):   libwmf - pliki nag³ówkowe
 Group:         Development/Libraries
-Group(de):     Entwicklung/Libraries
+Group(cs):     Vývojové prostøedky/Knihovny
+Group(da):     Udvikling/Biblioteker
+Group(de):     Entwicklung/Bibliotheken
 Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
+Group(is):     Þróunartól/Aðgerðasöfn
+Group(it):     Sviluppo/Librerie
+Group(ja):     ³«È¯/¥é¥¤¥Ö¥é¥ê
+Group(no):     Utvikling/Bibliotek
 Group(pl):     Programowanie/Biblioteki
 Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(pt):     Desenvolvimento/Bibliotecas
 Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(sl):     Razvoj/Knji¾nice
+Group(sv):     Utveckling/Bibliotek
 Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
@@ -64,12 +85,21 @@ Pakiet zawiera pliki nag
 Summary:       libwmf - static libraries
 Summary(pl):   libwmf - biblioteki statyczne
 Group:         Development/Libraries
-Group(de):     Entwicklung/Libraries
+Group(cs):     Vývojové prostøedky/Knihovny
+Group(da):     Udvikling/Biblioteker
+Group(de):     Entwicklung/Bibliotheken
 Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
+Group(is):     Þróunartól/Aðgerðasöfn
+Group(it):     Sviluppo/Librerie
+Group(ja):     ³«È¯/¥é¥¤¥Ö¥é¥ê
+Group(no):     Utvikling/Bibliotek
 Group(pl):     Programowanie/Biblioteki
 Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(pt):     Desenvolvimento/Bibliotecas
 Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(sl):     Razvoj/Knji¾nice
+Group(sv):     Utveckling/Bibliotek
 Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
@@ -91,7 +121,8 @@ aclocal
 automake -a -c
 autoconf
 %configure \
-       --with-plot
+       --with-plot \
+       --enable-magick
 %{__make}
 
 %install