rpms/fontforge/devel fontforge-20081215-pangocairo.patch, NONE, 1.1 sources, 1.22, 1.23 .cvsignore, 1.22, 1.23 fontforge.spec, 1.37, 1.38

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21535

Modified Files:
	sources .cvsignore fontforge.spec 
Added Files:
	fontforge-20081215-pangocairo.patch 
Log Message:
Upgrade to 20081215
Build with cairo and pango


fontforge-20081215-pangocairo.patch:

--- NEW FILE fontforge-20081215-pangocairo.patch ---
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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	8 Nov 2008 10:52:34 -0000	1.22
+++ sources	16 Dec 2008 22:12:42 -0000	1.23
@@ -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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	8 Nov 2008 10:52:34 -0000	1.22
+++ .cvsignore	16 Dec 2008 22:12:42 -0000	1.23
@@ -1,2 +1,2 @@
-fontforge_full-20080927.tar.bz2
-fontforge_htdocs-20080927.tar.bz2
+fontforge_full-20081215.tar.bz2
+fontforge_htdocs-20081215.tar.bz2


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fontforge.spec	1 Dec 2008 15:00:24 -0000	1.37
+++ fontforge.spec	16 Dec 2008 22:12:42 -0000	1.38
@@ -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 @@
 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:  libXt-devel
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gettext
+BuildRequires:  pango-devel
+BuildRequires:  cairo-devel
 
 
 %description
@@ -50,6 +53,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch1 -p1
+
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
 rm -rf htdocs/scripts
@@ -63,7 +68,7 @@
 %{__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 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Dec 16 2008 Kevin Fenzi <kevin at tummy.com> - 20081215-1
+- Upgrade to 20081215
+- Build with cairo and pango
+
+* Mon Dec 01 2008 Kevin Fenzi <kevin at tummy.com> - 20081117-1
+- Upgrade to 20081117
+
 * Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 20080927-2
 - Rebuild for Python 2.6