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: 10-Oct-2009 20:05:04
Branch: HEAD Handle: 2009101019050300
Modified files:
openpkg-src/imagemagick imagemagick.patch imagemagick.spec
Log:
upgrading package: imagemagick 6.5.6.9 -> 6.5.6.10
Summary:
Revision Changes Path
1.18 +11 -11 openpkg-src/imagemagick/imagemagick.patch
1.608 +2 -2 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 imagemagick.patch
--- openpkg-src/imagemagick/imagemagick.patch 4 Oct 2009 17:13:23 -0000
1.17
+++ openpkg-src/imagemagick/imagemagick.patch 10 Oct 2009 18:05:03 -0000
1.18
@@ -1,18 +1,18 @@
Index: PerlMagick/Makefile.PL.in
---- 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@',
+--- 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 @@
- # 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 -ljasper -ljpeg -lpng
-lbz2 -lxml2 -liconv -lz -lm' ],
+ # 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 $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
- # Perl binary name (if a Perl binary is built)
- 'MAP_TARGET' => 'PerlMagick',
+ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
Index: configure
---- configure.orig 2009-10-04 02:27:08 +0200
-+++ configure 2009-10-04 19:00:27 +0200
+--- configure.orig 2009-10-10 05:02:45 +0200
++++ configure 2009-10-10 19:53:10 +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.607 -r1.608 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 7 Oct 2009 06:06:53 -0000
1.607
+++ openpkg-src/imagemagick/imagemagick.spec 10 Oct 2009 18:05:03 -0000
1.608
@@ -23,7 +23,7 @@
# package version
%define V_major 6.5.6
-%define V_minor 9
+%define V_minor 10
%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: 20091007
+Release: 20091010
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
