From fa6ee5b84b6a950ddea6bcad2d15925403779a91 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 22 Feb 2011 14:03:16 -0700 Subject: [PATCH 1/3] Update to 20110222 --- .gitignore | 2 ++ fontforge.spec | 18 ++++++------------ sources | 4 ++-- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index d117d2f..7b446a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ fontforge_htdocs-20100429.tar.bz2 fontforge_full-20100501.tar.bz2 +/fontforge_full-20110222.tar.bz2 +/fontforge_htdocs-20110221.tar.bz2 diff --git a/fontforge.spec b/fontforge.spec index acd3dea..52c9cad 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,11 +1,11 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%global docs_version 20100429 +%global docs_version 20110221 %global gettext_package FontForge Name: fontforge -Version: 20100501 -Release: 7%{?dist} +Version: 20110222 +Release: 1%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -16,11 +16,6 @@ Source1: fontforge.desktop Source2: http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2 Source3: fontforge.xml Patch1: fontforge-20090224-pythondl.patch -# See Bug https://bugzilla.redhat.com/show_bug.cgi?id=536920 -Patch2: fontforge-20100501-splinesets.patch -Patch3: fontforge-20100501-python27.patch -Patch4: fontforge-20100501-CVE-2010-4259.patch -Patch5: fontforge-20100501-unicode-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: xdg-utils @@ -62,10 +57,6 @@ to compile applications against fontforge. %setup -q -n %{name}-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 mkdir htdocs tar xjf %{SOURCE2} -C htdocs @@ -156,6 +147,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 22 2011 Kevin Fenzi - 20110222-1 +- Update to 20110222 + * Wed Feb 16 2011 Kevin Fenzi - 20100501-7 - Fix patch for python. Fixes bug #677917 - Add patch for unicode glyph crash. Fixes bug #631172 diff --git a/sources b/sources index cb1cf52..7acdd20 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7ff67bcb694b673dbe0b8ca3dfd4675e fontforge_htdocs-20100429.tar.bz2 -5f3d20d645ec1aa2b7b4876386df8717 fontforge_full-20100501.tar.bz2 +5be4dda345b5d73a27cc399df96e463a fontforge_full-20110222.tar.bz2 +7fd1870acebb7637f0b1e723a6455558 fontforge_htdocs-20110221.tar.bz2 From 05c3270a63cdf052b9468475099aada0798c09df Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 Mar 2011 10:32:12 -0600 Subject: [PATCH 2/3] Drop sources that are now upstream. Fixes bug #688470 --- fontforge.desktop | 10 ---------- fontforge.spec | 13 +++++++------ fontforge.xml | 11 ----------- 3 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 fontforge.desktop delete mode 100644 fontforge.xml diff --git a/fontforge.desktop b/fontforge.desktop deleted file mode 100644 index 456e1dd..0000000 --- a/fontforge.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=FontForge -Comment=An outline font editor -Exec=fontforge -Icon=fontforge.png -Terminal=false -Type=Application -Categories=Application;Graphics; -Encoding=UTF-8 -MimeType=application/vnd.font-fontforge-sfd diff --git a/fontforge.spec b/fontforge.spec index 52c9cad..b4f9d11 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -5,16 +5,14 @@ Name: fontforge Version: 20110222 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ Source0: http://downloads.sourceforge.net/fontforge/fontforge_full-%{version}.tar.bz2 -Source1: fontforge.desktop Source2: http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2 -Source3: fontforge.xml Patch1: fontforge-20090224-pythondl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -86,14 +84,14 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so} -install -Dpm 644 htdocs/ffanvil32.png \ +install -Dpm 644 Packaging/fontforge.png \ $RPM_BUILD_ROOT%{_datadir}/pixmaps/fontforge.png desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ - %{SOURCE1} + Packaging/fontforge.desktop # The fontforge makefiles install htdocs as well, but we # prefer to have them under the standard RPM location, so @@ -109,7 +107,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages -install -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages/ +install -p Packaging/fontforge.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/ %clean rm -rf $RPM_BUILD_ROOT @@ -147,6 +145,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 17 2011 Kevin Fenzi - 20110222-2 +- Drop sources that are now upstream. Fixes bug #688470 + * Tue Feb 22 2011 Kevin Fenzi - 20110222-1 - Update to 20110222 diff --git a/fontforge.xml b/fontforge.xml deleted file mode 100644 index af84a5a..0000000 --- a/fontforge.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Fontforge Spline Font Database - - - - - - From 963e5f15f26cd30989f6a1fc29c1de1df4bcd645 Mon Sep 17 00:00:00 2001 From: Paul Flo Williams Date: Thu, 31 Mar 2011 15:41:29 +0100 Subject: [PATCH 3/3] Add patch for charview crash. Fixes bug #660376 --- fontforge-20100501-select-points-crash.patch | 11 +++++++++++ fontforge.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 fontforge-20100501-select-points-crash.patch diff --git a/fontforge-20100501-select-points-crash.patch b/fontforge-20100501-select-points-crash.patch new file mode 100644 index 0000000..90c9bde --- /dev/null +++ b/fontforge-20100501-select-points-crash.patch @@ -0,0 +1,11 @@ +--- fontforge-20100501.orig/fontforge/charview.c 2010-04-15 03:26:28.000000000 +0100 ++++ fontforge-20100501/fontforge/charview.c 2011-03-01 15:09:22.821753002 +0000 +@@ -8597,7 +8597,7 @@ + static int CVNumForePointsSelected(CharView *cv, BasePoint **bp) { + SplineSet *spl; + SplinePoint *test, *first; +- BasePoint *bps[4]; ++ BasePoint *bps[5]; + int i, cnt; + + if ( cv->b.drawmode!=dm_fore ) diff --git a/fontforge.spec b/fontforge.spec index b4f9d11..435eba1 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -5,7 +5,7 @@ Name: fontforge Version: 20110222 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -14,6 +14,7 @@ URL: http://fontforge.sourceforge.net/ Source0: http://downloads.sourceforge.net/fontforge/fontforge_full-%{version}.tar.bz2 Source2: http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2 Patch1: fontforge-20090224-pythondl.patch +Patch2: fontforge-20100501-select-points-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: xdg-utils @@ -55,6 +56,7 @@ to compile applications against fontforge. %setup -q -n %{name}-%{version} %patch1 -p1 +%patch2 -p1 mkdir htdocs tar xjf %{SOURCE2} -C htdocs @@ -145,6 +147,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 31 2011 Paul Flo Williams - 20110222-3 +- Add patch for charview crash. Fixes bug #660376 + * Thu Mar 17 2011 Kevin Fenzi - 20110222-2 - Drop sources that are now upstream. Fixes bug #688470