OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 28-Oct-2009 21:49:31
Branch: HEAD Handle: 2009102820493000
Modified files:
openpkg-src/imagemagick imagemagick.patch imagemagick.spec
Log:
downgrade to 6.5.6.8 as this version still does not cause assertions
and at the same time fix Perl bindings once again
Summary:
Revision Changes Path
1.21 +13 -13 openpkg-src/imagemagick/imagemagick.patch
1.611 +2 -2 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.patch
============================================================================
$ cvs diff -u -r1.20 -r1.21 imagemagick.patch
--- openpkg-src/imagemagick/imagemagick.patch 28 Oct 2009 09:46:59 -0000
1.20
+++ openpkg-src/imagemagick/imagemagick.patch 28 Oct 2009 20:49:30 -0000
1.21
@@ -1,19 +1,19 @@
Index: PerlMagick/Makefile.PL.in
---- PerlMagick/Makefile.PL.in.orig 2009-10-21 15:12:00 +0200
-+++ PerlMagick/Makefile.PL.in 2009-10-25 18:50:11 +0100
-@@ -139,7 +139,7 @@
+--- PerlMagick/Makefile.PL.in.orig 2009-10-03 21:09:01 +0200
++++ PerlMagick/Makefile.PL.in 2009-10-04 19:05:17 +0200
+@@ -83,7 +83,7 @@
+ 'INSTALLBIN' => '@BIN_DIR@',
- # defaults for LIBS & INC & CCFLAGS params that we later pass to
Writemakefile
- my $INC_magick = '-I../ -...@top_srcdir@ @CPPFLAGS@ -I"' .
$Config{'usrinc'} . '/ImageMagick"';
--my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl @MATH_LIBS@';
-+my $LIBS_magick = '-L../magick/.libs -lMagickCore -lMagickWand -lperl
@MATH_LIBS@ @LDFLAGS@ -llcms -ltiff -lfreetype -llqr-1 -ljasper -ljpeg -lpng
-lbz2 -lxml2 -liconv -lz -lm';
- my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
- my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'}
@LDFLAGS@";
- my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'}
@LDFLAGS@";
+ # Library specification
+- 'LIBS' => [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lperl
@MATH_LIBS@' ],
++ 'LIBS' => [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand
-lperl @MATH_LIBS@ @LDFLAGS@ -llcms -ltiff -lfreetype -llqr-1 -ljasper -ljpeg
-lpng -lglib2 -lgobject2 -lgio2 -lbz2 -lxml2 -lintl -liconv -lz -lm' ],
+
+ # Perl binary name (if a Perl binary is built)
+ 'MAP_TARGET' => 'PerlMagick',
Index: configure
---- configure.orig 2009-10-24 04:34:56 +0200
-+++ configure 2009-10-25 18:49:09 +0100
-@@ -49536,7 +49536,7 @@
+--- configure.orig 2009-10-04 02:27:08 +0200
++++ configure 2009-10-04 19:00:27 +0200
+@@ -49565,7 +49565,7 @@
# Append VALUE to the end of shell variable VAR.
func_append ()
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.610 -r1.611 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 28 Oct 2009 09:45:21 -0000
1.610
+++ openpkg-src/imagemagick/imagemagick.spec 28 Oct 2009 20:49:30 -0000
1.611
@@ -22,8 +22,8 @@
##
# package version
-%define V_major 6.5.7
-%define V_minor 2
+%define V_major 6.5.6
+%define V_minor 8
%define V_dist %{V_major}-%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
