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 10:45:21
Branch: HEAD Handle: 2009102809452100
Modified files:
openpkg-src/imagemagick imagemagick.patch imagemagick.spec
Log:
upgrading package: imagemagick 6.5.7.0 -> 6.5.7.2
Summary:
Revision Changes Path
1.19 +10 -10 openpkg-src/imagemagick/imagemagick.patch
1.610 +2 -2 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 imagemagick.patch
--- openpkg-src/imagemagick/imagemagick.patch 10 Oct 2009 18:05:03 -0000
1.18
+++ openpkg-src/imagemagick/imagemagick.patch 28 Oct 2009 09:45:21 -0000
1.19
@@ -1,19 +1,19 @@
Index: PerlMagick/Makefile.PL.in
---- PerlMagick/Makefile.PL.in.orig 2009-10-09 03:49:39 +0200
-+++ PerlMagick/Makefile.PL.in 2009-10-10 19:56:09 +0200
-@@ -140,7 +140,7 @@
+--- 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 @@
# 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 -L../wand/.libs -lperl
@MATH_LIBS@';
-+my $LIBS_magick = '-L../magick/.libs -lMagickCore -L../wand/.libs
-lMagickWand -lperl @MATH_LIBS@ @LDFLAGS@ -llcms -ltiff -lfreetype -ljasper
-ljpeg -lpng -lbz2 -lxml2 -liconv -lz -lm';
+-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 -ljasper -ljpeg -lpng -lbz2
-lxml2 -liconv -lz -lm';
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
-
- if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
+ my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'}
@LDFLAGS@";
+ my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'}
@LDFLAGS@";
Index: configure
---- configure.orig 2009-10-10 05:02:45 +0200
-+++ configure 2009-10-10 19:53:10 +0200
-@@ -49565,7 +49565,7 @@
+--- configure.orig 2009-10-24 04:34:56 +0200
++++ configure 2009-10-25 18:49:09 +0100
+@@ -49536,7 +49536,7 @@
# Append VALUE to the end of shell variable VAR.
func_append ()
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.609 -r1.610 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 17 Oct 2009 19:58:49 -0000
1.609
+++ openpkg-src/imagemagick/imagemagick.spec 28 Oct 2009 09:45:21 -0000
1.610
@@ -23,7 +23,7 @@
# package version
%define V_major 6.5.7
-%define V_minor 0
+%define V_minor 2
%define V_dist %{V_major}-%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -38,7 +38,7 @@
Group: Graphics
License: ImageMagick
Version: %{V_opkg}
-Release: 20091017
+Release: 20091028
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
