From a68a98bf0f91c02290c19da3dc67c156db54c0ef Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 26 Apr 2011 15:02:27 -0500 Subject: [PATCH] delegates.mgk could use some care (#527117) perl build is bad (#527143) wrong default font paths (#661664) need for 16-bit support, f16+ for now (#699414) tighten subpkg deps via %_isa --- GraphicsMagick-1.3.12-perl_linkage.patch | 12 +++++++ GraphicsMagick.spec | 41 +++++++++++++++++------- 2 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 GraphicsMagick-1.3.12-perl_linkage.patch diff --git a/GraphicsMagick-1.3.12-perl_linkage.patch b/GraphicsMagick-1.3.12-perl_linkage.patch new file mode 100644 index 0000000..5814c4d --- /dev/null +++ b/GraphicsMagick-1.3.12-perl_linkage.patch @@ -0,0 +1,12 @@ +diff -up GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in.perl_linkage GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in +--- GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in.perl_linkage 2009-07-24 14:34:32.000000000 -0500 ++++ GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in 2011-04-26 14:22:47.101574777 -0500 +@@ -67,7 +67,7 @@ WriteMakefile + 'INSTALLBIN' => '@BIN_DIR@', + + # Library specification +- 'LIBS' => ['-L@MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'], ++ 'LIBS' => ['-L@MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'], + + # Perl binary name (if a Perl binary is built) + 'MAP_TARGET' => 'PerlMagick', diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index e4c18cc..186fd4e 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -1,14 +1,22 @@ +%if 0%{?fedora} > 15 +# should seriously consider using this as default everywhere -- Rex +%global quantum_depth 16 +%endif + Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick Version: 1.3.12 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: Applications/Multimedia Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma Url: http://www.graphicsmagick.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +## upstreamable patches +Patch50: GraphicsMagick-1.3.12-perl_linkage.patch + BuildRequires: bzip2-devel BuildRequires: freetype-devel BuildRequires: jasper-devel @@ -36,7 +44,7 @@ of the software. %package devel Summary: Libraries and header files for GraphicsMagick app development Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ghostscript-devel, bzip2-devel, libtiff-devel, libjpeg-devel Requires: lcms-devel, pkgconfig, libX11-devel, libXext-devel, libXt-devel @@ -53,7 +61,7 @@ however. %package perl Summary: GraphicsMagick perl bindings Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl @@ -65,7 +73,7 @@ GraphicsMagick. %package c++ Summary: GraphicsMagick Magick++ library (C++ bindings) Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description c++ This package contains the GraphicsMagick++ library, a C++ binding to the @@ -77,8 +85,8 @@ GraphicsMagick++. %package c++-devel Summary: C++ bindings for the GraphicsMagick library Group: Development/Libraries -Requires: %{name}-c++ = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-c++%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description c++-devel GraphicsMagick-devel contains the Libraries and header files you'll @@ -95,6 +103,8 @@ however. %prep %setup -q +%patch50 -p1 -b .perl_linkage + iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8 mv -f ChangeLog.utf8 ChangeLog @@ -103,14 +113,18 @@ mv -f ChangeLog.utf8 ChangeLog sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %endif +sed -i -e "s|BrowseDelegateDefault=.*|BrowseDelegateDefault=\'xdg-open\'|" configure + %build +BrowseDelegate=xdg-open \ %configure --enable-shared --disable-static \ --with-lcms \ --with-magick_plus_plus \ --with-modules \ --with-perl \ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix}" \ + %{?quantum_depth:--with-quantum-depth=%{quantum_depth}} \ --with-threads \ --with-wmf \ --with-x \ @@ -118,8 +132,7 @@ sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure --without-dps \ --without-gslib \ --with-windows-font-dir=%{_datadir}/fonts/msttcorefonts \ - --with-gs-font-dir=%{_datadir}/fonts/default/ghostscript - + --with-gs-font-dir=%{_datadir}/fonts/default/Type1 make %{?_smp_mflags} make %{?_smp_mflags} perl-build @@ -187,9 +200,8 @@ EOF %check -## expect (at least) 6 FAIL, one PerlMagic, 5 in Magick++/demo -## TODO: wtf? :) -- Rex -make check ||: +make check +make check-perl %clean @@ -251,6 +263,13 @@ rm -rf %{buildroot} %changelog +* Tue Apr 26 2011 Rex Dieter 1.3.12-4 +- delegates.mgk could use some care (#527117) +- -perl build is bad (#527143) +- wrong default font paths (#661664) +- need for 16-bit support, f16+ for now (#699414) +- tighten subpkg deps via %%_isa + * Mon Feb 07 2011 Fedora Release Engineering - 1.3.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild