OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontforge?expand=0&rev=11

fontforge-array-fix.diff

@@ -0,0 +1,15 @@
+---
+ fontforge/scstylesui.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fontforge/scstylesui.c
++++ b/fontforge/scstylesui.c
+@@ -2795,7 +2795,7 @@
+     label[k].text_is_1byte = true;
+     label[k].text_in_resource = true;
+     gcd[k].gd.label = &label[k];
+-    gcd[k].gd.pos.x = 5; gcd[k].gd.pos.y = gcd[k-1].gd.pos.y+31;
++    gcd[k].gd.pos.x = 5; gcd[k].gd.pos.y = 31;
+     gcd[k].gd.flags = gg_visible | gg_enabled ;
+     gcd[k++].creator = GLabelCreate;
+ 

fontforge-missing-closedir.diff

@@ -0,0 +1,14 @@
+---
+ fontforge/cvimages.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/fontforge/cvimages.c
++++ b/fontforge/cvimages.c
+@@ -1116,6 +1116,7 @@
+ 	    ++tot;
+ 	}
+     }
++    closedir(dir);
+     if ( tot==0 )
+ 	ff_post_error(_("Nothing Loaded"),_("Nothing Loaded"));
+ return( true );

fontforge.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 27 16:57:52 CEST 2009 - tiwai@suse.de
+
+- fix missing closedir() (bnc#525022)
+
+-------------------------------------------------------------------
+Mon Jul 27 15:29:55 CEST 2009 - tiwai@suse.de
+
+- updated to version 20090622
+  lots of changes.  See changelog.html for details
+
 -------------------------------------------------------------------
 Thu Jan 22 00:51:12 CET 2009 - crrodriguez@suse.de
 

fontforge.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package fontforge (Version 20080429)
+# spec file for package fontforge (Version 20090622)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,20 +20,22 @@
 
 Name:           fontforge
 BuildRequires:  dos2unix freetype2-devel giflib-devel libpng-devel libtiff-devel libxml2-devel update-desktop-files xorg-x11-devel
-License:        BSD 3-Clause
+License:        BSD 3-clause (or similar)
 Group:          Productivity/Graphics/Vector Editors
 AutoReqProv:    on
 Obsoletes:      PfaEdit
 Provides:       PfaEdit
-Version:        20080429
+Version:        20090622
-Release:        40
+Release:        1
 Url:            http://fontforge.sourceforge.net/
-Source0:        http://dfn.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-20080429.tar.bz2
+Source0:        http://dfn.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-%{version}.tar.bz2
-Source1:        http://surfnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_htdocs-20080429.tar.bz2
+Source1:        http://surfnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_htdocs-%{version}.tar.bz2
 Source2:        http://belnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_ja_htdocs-20060822.tar.bz2
 Source10:       %{name}.desktop
 Source11:       %name.png
 Patch0:         docdir.patch
+Patch1:         fontforge-array-fix.diff
+Patch2:         fontforge-missing-closedir.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Font Editor
 
@@ -48,11 +50,10 @@ some Type 0s), TrueType, OpenType (Type2), and CID-keyed fonts.
 Authors:
 --------
     George Williams <gww@silcom.com>
-    
     Scott Pakin <pakin@uiuc.edu>
 
 %package devel
-License:        BSD 3-Clause
+License:        BSD 3-clause (or similar)
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version} freetype2-devel
@@ -67,12 +68,13 @@ to develop applications that require these.
 Authors:
 --------
     George Williams <gww@silcom.com>
-    
     Scott Pakin <pakin@uiuc.edu>
 
 %prep
 %setup -q -T -n fontforge-%{version} -b 0
 %patch0 -p 1 -b .docdir
+%patch1 -p1
+%patch2 -p1
 mkdir docs
 tar jxvf $RPM_SOURCE_DIR/fontforge_htdocs-%{version}.tar.bz2 -C docs
 tar jxvf $RPM_SOURCE_DIR/fontforge_ja_htdocs-20060822.tar.bz2 -C docs
@@ -106,6 +108,8 @@ popd
 install -m 644 Adobe* $RPM_BUILD_ROOT/usr/share/fontforge
 install -d $RPM_BUILD_ROOT%_datadir/pixmaps
 install -m644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT%_datadir/pixmaps/%name.png
+# fix wrong locale name
+mv $RPM_BUILD_ROOT%{_datadir}/locale/mal $RPM_BUILD_ROOT%{_datadir}/locale/ml
 %find_lang FontForge
 %suse_update_desktop_file -i %{name} VectorGraphics
 %{__rm} -f %{buildroot}%{_libdir}/*.la
@@ -136,131 +140,3 @@ install -m644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT%_datadir/pixmaps/%name.p
 %{_libdir}/lib*.so
 
 %changelog
-* Thu Jan 22 2009 crrodriguez@suse.de
-- remove "la" files and static libraries
-- add missing freetype2-devel dependency to -devel package
-* Mon May 26 2008 mfabian@suse.de
-- bnc#246804: update to 20080429 (needed to build recent versions
-  of the DejaVu fonts and freefont).
-* Fri Feb 29 2008 coolo@suse.de
-- fix typo
-* Thu Feb 21 2008 mfabian@suse.de
-- update to 20080203 (bugfix release, fixes also bnc#363014).
-- create -devel sub-package.
-* Thu Aug 02 2007 mfabian@suse.de
-- update to 20070723 (user interace redesigned, many bugfixes).
-- add ldconfig post scripts.
-- remove executable flags from documentation.
-- remove DOS line-endings from documentation.
-* Tue Jul 24 2007 coolo@suse.de
-- remove BuildPreRequires
-* Tue Feb 06 2007 mfabian@suse.de
-- Bugzilla #242363: uninitialized variable.
-* Wed Jan 03 2007 mfabian@suse.de
-- update to 20061220.
-- remove fontforge-strncat.patch,
-  bugzilla-221210-locale-variable-used-before-set.patch,
-  bugzilla-225616-local-variable-used-before-set.patch
-  (included upstream).
-- fix bugzilla #231126: "array subscript out of range".
-* Tue Dec 19 2006 mfabian@suse.de
-- update to 20061025.
-  • fontimage program has been added.
-- fix bugzilla #225616 ("local variable used before set").
-* Fri Nov 17 2006 mfabian@suse.de
-- Bugzilla #221210: "local variable used before set"
-* Mon Nov 06 2006 ro@suse.de
-- fix permissions on icon file
-- fix gcc warning for strncat
-* Tue Oct 17 2006 mfabian@suse.de
-- update to 20061014.
-  remove bugzilla-203490-local-variable-used-before-set.patch
-  (included upstream).
-- Fix Bugzilla #211543 ("array subscript out of range).
-- Fix invalid operation (like x = x++;)
-* Thu Sep 07 2006 mfabian@suse.de
-- fix bugzilla #203490: "local variable used before set".
-- add Japanese documentation.
-* Wed Sep 06 2006 mfabian@suse.de
-- update to 20060822.
-  remove bugzilla-197499-local-variable-used-before-set.patch
-  (included upstream).
-* Thu Aug 10 2006 mfabian@suse.de
-- Bugzilla 197499: "local variable used before set".
-* Tue Jul 18 2006 mfabian@suse.de
-- update to 20060715.
-  fixes a crash when building freefont.
-* Fri Mar 17 2006 mfabian@suse.de
-- Bugzilla #158759: "locale variable used before set".
-  (already fixed in latest upstream version).
-* Thu Mar 09 2006 mfabian@suse.de
-- Bugzilla #153958: "array subscript out of range".
-  (already fixed in latest upstream version).
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Sun Oct 02 2005 stbinner@suse.de
-- fix capitalization of .desktop GenericName entry
-* Thu Aug 04 2005 mfabian@suse.de
-- update to 20050803.
-  cannot update documentation because the download link for the
-  documentation is currently dead.
-* Wed May 11 2005 mfabian@suse.de
-- update to 20050502.
-- all .html and .png files should have mode 644.
-- fix fontforge.desktop file (thanks to
-  Thomas Schraitle<thomas.schraitle@suse.de>).
-* Tue Dec 14 2004 hvogel@suse.de
-- install icon
-* Thu Nov 11 2004 ro@suse.de
-- fixed file list
-* Wed Aug 18 2004 mfabian@suse.de
-- rename: PfaEdit -> fontforge (has been renamed upstream).
-- update to 20040808.
-* Sun Apr 25 2004 ro@suse.de
-- use no-strict-aliasing
-* Thu Feb 26 2004 mfabian@suse.de
-- update to 040224.
-* Sat Jan 10 2004 adrian@suse.de
-- build as user
-* Sat Aug 23 2003 mfabian@suse.de
-- make it build on older distributions.
-* Mon Aug 18 2003 mfabian@suse.de
-- update to 030817.
-- add desktop file.
-* Fri May 16 2003 mfabian@suse.de
-- update binaries and documentation to 030512
-- add .so and .la file to file list
-- add "freetype2 freetype2-devel" to neededforbuild
-* Wed Feb 12 2003 mfabian@suse.de
-- update binaries and documentation to 030211
-* Wed Nov 13 2002 mfabian@suse.de
-- update to 021105
-- use x-devel-packages instead of xf86 in # neededforbuild
-- use dynamic linking
-* Tue Oct 22 2002 mfabian@suse.de
-- update to 021021 and update documentation to 020910.
-* Fri Jul 26 2002 mfabian@suse.de
-- update to version 020724
-- include documentation, remove cidmaps.tar.bz2 and use updated
-  cidmaps.tgz from the documentation tar ball
-* Fri Feb 01 2002 ro@suse.de
-- changed neededforbuild <libpng> to <libpng-devel-packages>
-* Tue Jan 22 2002 mfabian@suse.de
-- update to version 020121.
-- updated cidmaps.tar.bz2
-* Wed Sep 05 2001 mfabian@suse.de
-- adapted for SuSE, version 010905
-* Thu May 10 2001 George Williams <gww@silcom.com>
-- My first attempt at rpm, updated to 10 May sources
-* Tue May 01 2001 Scott Pakin <pakin@uiuc.edu>
-- Removed (unused) dynamic library files
-* Sun Apr 29 2001 Scott Pakin <pakin@uiuc.edu>
-- Upgraded from 220401 to 280401.
-* Tue Apr 24 2001 Scott Pakin <pakin@uiuc.edu>
-- Upgraded from 190401 to 220401.
-* Fri Apr 20 2001 Scott Pakin <pakin@uiuc.edu>
-- Upgraded from 020401 to 190401.
-* Tue Apr 10 2001 Scott Pakin <pakin@uiuc.edu>
-- Upgraded from 210301 to 020401.
-  Thu Mar 22 2001 Scott Pakin <pakin@uiuc.edu>
-- Initial release

fontforge_full-20080429.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b47a104c3c68644528f98ef4399b7c825f4c9c4fba3242d388f6c375b5ca2fe
-size 4797332

fontforge_full-20090622.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf0f1fd76f47646252853c1d86d119a9638a9a6be5c42d12e2f35b6b5c120d3f
+size 5359385

fontforge_htdocs-20080429.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab243fd670842eb0e428de356bb1e1b098ba839eb32e939026e139db399f8287
-size 2834375

fontforge_htdocs-20090622.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44c7b8fdbf2472a15ceeda4d827557c04c7559f3bcd3ab2800eebcd293324763
+size 2764464