OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Nov-2008 14:37:27
Branch: HEAD Handle: 2008112813372600
Modified files:
openpkg-src/imagemagick imagemagick.spec
Log:
fix Perl bindings
Summary:
Revision Changes Path
1.503 +8 -12 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.502 -r1.503 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 26 Nov 2008 19:18:32 -0000
1.502
+++ openpkg-src/imagemagick/imagemagick.spec 28 Nov 2008 13:37:26 -0000
1.503
@@ -38,7 +38,7 @@
Group: Graphics
License: GPL
Version: %{V_opkg}
-Release: 20081126
+Release: 20081128
# package options
%option with_perl no
@@ -53,8 +53,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, grep, sed
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, lcms, libxml,
libiconv
-PreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, lcms, libxml,
libiconv
+BuildPreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, fontconfig,
lcms, libxml, libiconv
+PreReq: tiff, jpeg, jasper, bzip2, zlib, png, freetype, fontconfig,
lcms, libxml, libiconv
%if "%{with_perl}" == "yes"
BuildPreReq: perl, perl-openpkg
PreReq: perl
@@ -91,18 +91,14 @@
-e 's/^\(MagickLibSubdir="\)[^"]*\("\)/\1imagemagick\2/' \
-e 's/\(-lxml2\)/\1 -liconv/' \
configure
+%if "%{with_x11}" == "yes"
%{l_shtool} subst \
- -e 's;^\(foreach $delegate (.* \)jp2 \(.*\)$;\1\2;' \
- PerlMagick/Makefile.PL
- %{l_shtool} subst \
- -e 's;\([EMAIL PROTECTED]@\);-L../magick/.libs \1;g' \
+ -e "s;\\(-lMagickWand\\);\\1 -L`%{l_rc} --query x11_libdir` -lX11
-lXext;" \
PerlMagick/Makefile.PL.in
+%endif
%{l_shtool} subst \
- -e 's; && !defined(HAVE_STRLCPY_PROTOTYPE);;g' \
- -e 's; && !defined(HAVE_VSNPRINTF_PROTOTYPE);;g' \
- -e 's;^#if \(defined(HAVE_STRLCPY)\);#if !\1;g' \
- -e 's;^#if \(defined(HAVE_VSNPRINTF)\);#if !\1;g' \
- magick/studio.h
+ -e "s;\\(-lMagickWand\\);\\1 `pkg-config fontconfig --libs`;" \
+ PerlMagick/Makefile.PL.in
%build
cppflags=""
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
