From bfae8280f532750ea60f114ea74c297f075f555d2f3839c07fd00371b4bc1e9b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 2 Aug 2007 22:15:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontforge?expand=0&rev=5 --- ...-231126-array-subscript-out-of-range.patch | 12 ------- bugzilla-242363-uninitialized-variable.patch | 11 ------ fontforge.changes | 8 +++++ fontforge.spec | 36 ++++++++++--------- fontforge_full-20061220.tar.bz2 | 3 -- fontforge_full-20070723.tar.bz2 | 3 ++ fontforge_htdocs-20061220.tar.bz2 | 3 -- fontforge_htdocs-20070723.tar.bz2 | 3 ++ ...d-operation-same-variable-used-twice.patch | 12 ------- 9 files changed, 33 insertions(+), 58 deletions(-) delete mode 100644 bugzilla-231126-array-subscript-out-of-range.patch delete mode 100644 bugzilla-242363-uninitialized-variable.patch delete mode 100644 fontforge_full-20061220.tar.bz2 create mode 100644 fontforge_full-20070723.tar.bz2 delete mode 100644 fontforge_htdocs-20061220.tar.bz2 create mode 100644 fontforge_htdocs-20070723.tar.bz2 delete mode 100644 invalid-operation-same-variable-used-twice.patch diff --git a/bugzilla-231126-array-subscript-out-of-range.patch b/bugzilla-231126-array-subscript-out-of-range.patch deleted file mode 100644 index d346060..0000000 --- a/bugzilla-231126-array-subscript-out-of-range.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru fontforge-20061220/fontforge/displayfonts.c fontforge-20061220.new/fontforge/displayfonts.c ---- fontforge-20061220/fontforge/displayfonts.c 2006-11-19 22:03:11.000000000 +0100 -+++ fontforge-20061220.new/fontforge/displayfonts.c 2007-01-03 12:25:54.000000000 +0100 -@@ -469,7 +469,7 @@ - void DisplayDlg(SplineFont *sf) { - GRect pos; - GWindowAttrs wattrs; -- GGadgetCreateData gcd[15], boxes[5], *harray[8], *farray[6], *barray[4], *varray[9]; -+ GGadgetCreateData gcd[15], boxes[5], *harray[8], *farray[7], *barray[4], *varray[9]; - GTextInfo label[15]; - DI di; - char buf[10]; diff --git a/bugzilla-242363-uninitialized-variable.patch b/bugzilla-242363-uninitialized-variable.patch deleted file mode 100644 index 19804b8..0000000 --- a/bugzilla-242363-uninitialized-variable.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru fontforge-20061220/Unicode/ustring.c fontforge-20061220.new/Unicode/ustring.c ---- fontforge-20061220/Unicode/ustring.c 2006-03-13 00:16:56.000000000 +0100 -+++ fontforge-20061220.new/Unicode/ustring.c 2007-02-06 17:00:57.000000000 +0100 -@@ -683,6 +683,7 @@ - - len = strlen(utf8buf); - lbuf = galloc(len+1); -+ pt = lbuf; - for ( upt=utf8buf; (ch=utf8_ildb(&upt))!='\0'; ) - if ( ch>=0xff ) - *pt++ = '?'; diff --git a/fontforge.changes b/fontforge.changes index a10aa99..88d3ecd 100644 --- a/fontforge.changes +++ b/fontforge.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 02 16:33:43 CEST 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 12:49:54 CEST 2007 - coolo@suse.de diff --git a/fontforge.spec b/fontforge.spec index 6ea5079..4fec97d 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,5 +1,5 @@ # -# spec file for package fontforge (Version 20061220) +# spec file for package fontforge (Version 20070723) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: fontforge %if %{suse_version} > 910 -BuildRequires: freetype2-devel giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel +BuildRequires: dos2unix freetype2-devel giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel %else BuildRequires: XFree86-devel freetype2-devel libpng-devel libtiff-devel libungif update-desktop-files %endif @@ -21,18 +21,15 @@ Group: Productivity/Graphics/Vector Editors Autoreqprov: on Obsoletes: PfaEdit Provides: PfaEdit -Version: 20061220 -Release: 40 +Version: 20070723 +Release: 1 URL: http://fontforge.sourceforge.net/ -Source0: fontforge_full-20061220.tar.bz2 -Source1: fontforge_htdocs-20061220.tar.bz2 +Source0: fontforge_full-20070723.tar.bz2 +Source1: fontforge_htdocs-20070723.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 -Patch2: invalid-operation-same-variable-used-twice.patch -Patch3: bugzilla-231126-array-subscript-out-of-range.patch -Patch4: bugzilla-242363-uninitialized-variable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Font Editor @@ -53,13 +50,14 @@ Authors: %prep %setup -q -T -n fontforge-%{version} -b 0 %patch0 -p 1 -b .docdir -%patch2 -p 1 -%patch3 -p 1 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 +chmod 644 docs/quadraticspline.gif +dos2unix docs/ja/*html docs/ja/nonBMP/index.html docs/corpchar.txt docs/Big5.txt tar zxvf docs/cidmaps.tgz find . -name "*.html" -o -name "*.png" | xargs chmod 644 +find . -name CVS -type d | xargs rm -rf %build %{?suse_update_config} @@ -86,30 +84,34 @@ pushd $RPM_BUILD_ROOT/usr/bin popd # install CMaps to be able to edit CID-keyed fonts: install -m 644 Adobe* $RPM_BUILD_ROOT/usr/share/fontforge -%if %suse_version > 820 install -d $RPM_BUILD_ROOT%_datadir/pixmaps install -m644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT%_datadir/pixmaps/%name.png %find_lang FontForge %suse_update_desktop_file -i %{name} VectorGraphics -%endif %clean -#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files -f FontForge.lang %defattr(-,root,root) -%doc AUTHORS VERSION INSTALL LICENSE README* docs +%doc AUTHORS VERSION LICENSE README* docs %{_bindir}/* %{_libdir}/lib* %{_libdir}/pkgconfig/* /usr/share/fontforge/ %doc %{_mandir}/man1/*.1* -%if %suse_version > 820 /usr/share/applications/%{name}.desktop %_datadir/pixmaps/%name.png -%endif %changelog +* 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 diff --git a/fontforge_full-20061220.tar.bz2 b/fontforge_full-20061220.tar.bz2 deleted file mode 100644 index 5ccc151..0000000 --- a/fontforge_full-20061220.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d715043e30395795e65d91a2ca81ad1552da24153e704927d591a746d856887 -size 3664186 diff --git a/fontforge_full-20070723.tar.bz2 b/fontforge_full-20070723.tar.bz2 new file mode 100644 index 0000000..e646b31 --- /dev/null +++ b/fontforge_full-20070723.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36fd3754560d883f6ecf3ac8c73675aa93543ea62418863135f2fc5a64e7acb9 +size 3942914 diff --git a/fontforge_htdocs-20061220.tar.bz2 b/fontforge_htdocs-20061220.tar.bz2 deleted file mode 100644 index f9ab15d..0000000 --- a/fontforge_htdocs-20061220.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:425a09f4dcb800e464dc18987e4e8bd81d99766f2d852ae947013d4e44184251 -size 2308221 diff --git a/fontforge_htdocs-20070723.tar.bz2 b/fontforge_htdocs-20070723.tar.bz2 new file mode 100644 index 0000000..9026893 --- /dev/null +++ b/fontforge_htdocs-20070723.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1af8037ddb8ac8f65b88969dde583eb017a4c4e2ab28e221f5a7ce09e6cf8a73 +size 2520708 diff --git a/invalid-operation-same-variable-used-twice.patch b/invalid-operation-same-variable-used-twice.patch deleted file mode 100644 index 7c1d304..0000000 --- a/invalid-operation-same-variable-used-twice.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru fontforge-20061014.orig/fontforge/metricsview.c fontforge-20061014/fontforge/metricsview.c ---- fontforge-20061014.orig/fontforge/metricsview.c 2006-09-17 21:58:28.000000000 +0200 -+++ fontforge-20061014/fontforge/metricsview.c 2006-10-17 15:27:55.000000000 +0200 -@@ -1487,7 +1487,7 @@ - break; - } - if ( i!=0 ) { -- for ( kp=kp=mv->vertical ? mv->perchar[i-1].sc->vkerns:mv->perchar[i-1].sc->kerns; kp!=NULL; kp=kp->next ) { -+ for ( kp = mv->vertical ? mv->perchar[i-1].sc->vkerns:mv->perchar[i-1].sc->kerns; kp!=NULL; kp=kp->next ) { - if ( kp->sc==mv->perchar[i].sc ) { - kp->sli = mv->cur_sli; - break;