pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- consider urw-base35-fonts [bsc#1088463]

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=355
This commit is contained in:
Petr Gajdos 2018-04-10 17:22:37 +00:00 committed by Git OBS Bridge
parent 0c45dc9f92
commit f913edfbae
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ImageMagick.changes
View File

@ -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 Tue Apr 10 08:23:27 UTC 2018 - tchvatal@suse.com

21
ImageMagick.spec
View File

@ -25,6 +25,9 @@
%define cwandver 5 %define cwandver 5
%define cxxlibver 4 %define cxxlibver 4
%define libspec -%{maj}_Q%{quantum_depth}HDRI %define libspec -%{maj}_Q%{quantum_depth}HDRI
# bsc#1088463
%define urw_base35_fonts 0
Name: ImageMagick Name: ImageMagick
Version: %{mfr_version}.%{mfr_revision} Version: %{mfr_version}.%{mfr_revision}
Release: 0 Release: 0
@ -92,6 +95,13 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pango)
%if 0%{?suse_version} > 1315 %if 0%{?suse_version} > 1315
BuildRequires: pkgconfig(ijs) BuildRequires: pkgconfig(ijs)
# bsc#1088463
%if %{urw_base35_fonts}
BuildRequires: urw-base35-fonts
%else
BuildRequires: ghostscript-fonts-other
BuildRequires: ghostscript-fonts-std
%endif
%else %else
BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-other
BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-fonts-std
@ -305,6 +315,12 @@ HTML documentation for ImageMagick library and scene examples.
%endif %endif
%build %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 # make library binary package parallel installable
export MODULES_DIRNAME="modules%{libspec}%{clibver}" export MODULES_DIRNAME="modules%{libspec}%{clibver}"
export SHAREARCH_DIRNAME="config%{libspec}%{clibver}" export SHAREARCH_DIRNAME="config%{libspec}%{clibver}"
@ -316,6 +332,11 @@ export CONFIGURE_RELATIVE_PATH="ImageMagick%{libspec}%{clibver}"
--with-magick_plus_plus \ --with-magick_plus_plus \
--with-modules \ --with-modules \
--with-threads \ --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 \
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='gcc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='gcc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
--disable-static \ --disable-static \