From f913edfbae4a081c47b8f8d9028079102d83b0b06fa1ce3be94395e937ac2e62 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 10 Apr 2018 17:22:37 +0000 Subject: [PATCH] - consider urw-base35-fonts [bsc#1088463] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=355 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index 903d797..a49dfde 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 10 08:36:17 UTC 2018 - pgajdos@suse.com + +- consider urw-base35-fonts [bsc#1088463] + ------------------------------------------------------------------- Tue Apr 10 08:23:27 UTC 2018 - tchvatal@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index e7efc48..b0c70bb 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -25,6 +25,9 @@ %define cwandver 5 %define cxxlibver 4 %define libspec -%{maj}_Q%{quantum_depth}HDRI +# bsc#1088463 +%define urw_base35_fonts 0 + Name: ImageMagick Version: %{mfr_version}.%{mfr_revision} Release: 0 @@ -92,6 +95,13 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pango) %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(ijs) +# bsc#1088463 +%if %{urw_base35_fonts} +BuildRequires: urw-base35-fonts +%else +BuildRequires: ghostscript-fonts-other +BuildRequires: ghostscript-fonts-std +%endif %else BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std @@ -305,6 +315,12 @@ HTML documentation for ImageMagick library and scene examples. %endif %build +# bsc#1088463 +%if %{urw_base35_fonts} +sed -i 's:type1:otf:' config/type-urw-base35.xml.in +sed -i 's:metrics=[^ ]*::' config/type-urw-base35.xml.in +sed -i 's:\.t1:.otf:' config/type-urw-base35.xml.in +%endif # make library binary package parallel installable export MODULES_DIRNAME="modules%{libspec}%{clibver}" export SHAREARCH_DIRNAME="config%{libspec}%{clibver}" @@ -316,6 +332,11 @@ export CONFIGURE_RELATIVE_PATH="ImageMagick%{libspec}%{clibver}" --with-magick_plus_plus \ --with-modules \ --with-threads \ +%if %{urw_base35_fonts} + --with-urw-base35-font-dir=/usr/share/fonts/truetype \ +%else + --with-gs-font-dir=/usr/share/fonts/ghostscript \ +%endif --with-perl \ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='gcc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --disable-static \