rpms/fontforge
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to 20081215 Build with cairo and pango

Browse Source
This commit is contained in:
Kevin Fenzi 2008-12-16 22:12:42 +00:00
parent f86ff77967
commit 0df4d2bbb6
4 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,2 +1,2 @@
fontforge_full-20080927.tar.bz2
fontforge_htdocs-20080927.tar.bz2
fontforge_full-20081215.tar.bz2
fontforge_htdocs-20081215.tar.bz2

16
fontforge-20081215-pangocairo.patch Normal file
View File

@ -0,0 +1,16 @@
diff -Nur fontforge-20081215.orig/gdraw/gxcdraw.c fontforge-20081215/gdraw/gxcdraw.c
--- fontforge-20081215.orig/gdraw/gxcdraw.c 2008-11-17 09:19:44.000000000 -0700
+++ fontforge-20081215/gdraw/gxcdraw.c 2008-12-16 13:59:58.000000000 -0700
@@ -1782,9 +1782,10 @@
# if !defined(_NO_LIBCAIRO) && PANGO_VERSION_MINOR>=10
# include <pango/pangocairo.h>
# define _pango_cairo_layout_path pango_cairo_layout_path
-# define _pango_font_map_create_context pango_font_map_create_context
+# define _pango_cairo_font_map_create_context pango_cairo_font_map_create_context
# define _pango_cairo_font_map_get_default pango_cairo_font_map_get_default
-# define _pango_cairo_context_set_resolution _pango_cairo_context_set_resolution
+# define _pango_cairo_context_set_resolution pango_cairo_context_set_resolution
+# define _pango_cairo_show_glyph_string pango_cairo_show_glyph_string
# endif
# undef GTimer
# if PANGO_VERSION_MINOR>=8

20
fontforge.spec
View File

@ -1,9 +1,9 @@
%define docs_version 20080927
%define docs_version 20081215
%define gettext_package FontForge
Name: fontforge
Version: 20080927
Release: 2%{?dist}
Version: 20081215
Release: 1%{?dist}
Summary: Outline and bitmap font editor
Group: Applications/Publishing
@ -13,6 +13,7 @@ Source0: http://downloads.sourceforge.net/fontforge/fontforge_full-%{vers
Source1: fontforge.desktop
Source2: http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
Source3: fontforge.xml
Patch1: fontforge-20081215-pangocairo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xdg-utils
@ -29,6 +30,8 @@ BuildRequires: libuninameslist-devel
BuildRequires: libXt-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: gettext
BuildRequires: pango-devel
BuildRequires: cairo-devel
%description
@ -50,6 +53,8 @@ to compile applications against fontforge.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
mkdir htdocs
tar xjf %{SOURCE2} -C htdocs
rm -rf htdocs/scripts
@ -63,7 +68,7 @@ rm -rf htdocs/flags/CVS
%{__sed} -i 's/\r//' htdocs/corpchar.txt
%build
%configure --with-freetype-bytecode=no
%configure --with-freetype-bytecode=no --with-regular-link
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -134,6 +139,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/*.pc
%changelog
* Tue Dec 16 2008 Kevin Fenzi <kevin@tummy.com> - 20081215-1
- Upgrade to 20081215
- Build with cairo and pango
* Mon Dec 01 2008 Kevin Fenzi <kevin@tummy.com> - 20081117-1
- Upgrade to 20081117
* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 20080927-2
- Rebuild for Python 2.6

4
sources
View File

@ -1,2 +1,2 @@
8866595d4dac77c0c093ed1e104515d3 fontforge_full-20080927.tar.bz2
cc3e292e75250e8318cb098c1552c98e fontforge_htdocs-20080927.tar.bz2
fdbca231134755fd0cf20572d955855f fontforge_full-20081215.tar.bz2
f41861cdef84e282da5a765f644582e8 fontforge_htdocs-20081215.tar.bz2