[gnuplot/f13/master] Resolves: #537960 Could not find/open font when opening font "arial"
Ivana Varekova
varekova at fedoraproject.org
Tue Aug 17 09:02:09 UTC 2010
commit 3ebb60e373cf6e70628662b3d33defd811e59f1b
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date: Tue Aug 17 11:05:20 2010 +0200
Resolves: #537960
Could not find/open font when opening font "arial"
gnuplot-4.2.6-fonts.patch | 12 ++++++++++++
gnuplot.spec | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/gnuplot-4.2.6-fonts.patch b/gnuplot-4.2.6-fonts.patch
new file mode 100644
index 0000000..0f9d368
--- /dev/null
+++ b/gnuplot-4.2.6-fonts.patch
@@ -0,0 +1,12 @@
+diff -up gnuplot-4.2.6/term/gd.trm.pom gnuplot-4.2.6/term/gd.trm
+--- gnuplot-4.2.6/term/gd.trm.pom 2009-03-03 03:43:52.000000000 +0100
++++ gnuplot-4.2.6/term/gd.trm 2010-08-17 10:58:06.000000000 +0200
+@@ -929,7 +929,7 @@ PNG_options()
+ if (external_default)
+ png_state.ttffont = gp_strdup(external_default);
+ else /* Might as well try some plausible font; it's no worse than failing immediately */
+- png_state.ttffont = gp_strdup("arial");
++ png_state.ttffont = gp_strdup("/usr/share/fonts/dejavu/DejaVuSans.ttf");
+
+ free(png_state.default_ttffont);
+ png_state.default_ttffont = gp_strdup(png_state.ttffont);
diff --git a/gnuplot.spec b/gnuplot.spec
index 9d425f1..2f89701 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -17,7 +17,7 @@
Summary: A program for plotting mathematical expressions and data
Name: gnuplot
Version: %{major}.%{minor}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
# Modifications are to be distributed as patches to the released version.
License: gnuplot and GPLv2
Group: Applications/Engineering
@@ -25,10 +25,12 @@ URL: http://www.gnuplot.info/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source2: gnuplot-init.el
Patch1: gnuplot-4.2.0-refers_to.patch
+Patch2: gnuplot-4.2.6-fonts.patch
BuildRequires: libpng-devel, tex(latex), zlib-devel, libX11-devel, emacs
BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel, wxGTK-devel
BuildRequires: latex2html
Requires: %{name}-common = %{version}-%{release}
+Requires: dejavu-sans-fonts
Requires(post): %{_sbindir}/alternatives
Requires(preun): %{_sbindir}/alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -120,6 +122,7 @@ plotting tool.
%prep
%setup -q
%patch1 -p1 -b .refto
+%patch2 -p1 -b .font
sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux
mv ChangeLog.aux ChangeLog
@@ -246,6 +249,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/texmf/tex/latex/gnuplot/gnuplot.cfg
%changelog
+* Tue Aug 17 2010 Ivana Hutarova Varekova <varekova at redhat.com> 4.2.6-2
+- Resolves: #537960
+ Could not find/open font when opening font "arial"
+
* Tue Sep 15 2009 Ivana Varekova <varekova at redhat.com> 4.2.6-1
- update to 4.2.6
More information about the scm-commits
mailing list