OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Dec-2007 19:55:58
Branch: HEAD Handle: 2007121918555800
Modified files:
openpkg-src/imagemagick imagemagick.patch imagemagick.spec
Log:
upgrading package: imagemagick 6.3.7.5 -> 6.3.7.6
Summary:
Revision Changes Path
1.11 +0 -12 openpkg-src/imagemagick/imagemagick.patch
1.407 +5 -2 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 imagemagick.patch
--- openpkg-src/imagemagick/imagemagick.patch 13 Dec 2007 09:25:54 -0000
1.10
+++ openpkg-src/imagemagick/imagemagick.patch 19 Dec 2007 18:55:58 -0000
1.11
@@ -1,15 +1,3 @@
-Index: PerlMagick/Makefile.PL
---- PerlMagick/Makefile.PL.orig 2007-12-13 01:43:53 +0100
-+++ PerlMagick/Makefile.PL 2007-12-13 09:33:24 +0100
-@@ -27,7 +27,7 @@
- # Compute test specification
- my $delegate_tests='t/*.t';
- my $delegate;
--foreach $delegate (qw/bzlib fontconfig freetype gs gvc jpeg jp2 lcms
openexr png tiff x11 xml zlib/) {
-+foreach $delegate (qw/bzlib fontconfig freetype gs gvc jpeg lcms
openexr png tiff x11 xml zlib/) {
- if ( -d "t/$delegate" ) {
- if ($delegate =~ /x11/) {
- if ( defined $ENV{'DISPLAY'} ) {
Index: configure
--- configure.orig 2007-12-13 09:34:07 +0100
+++ configure 2007-12-13 10:17:10 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.406 -r1.407 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 16 Dec 2007 08:46:26 -0000
1.406
+++ openpkg-src/imagemagick/imagemagick.spec 19 Dec 2007 18:55:58 -0000
1.407
@@ -24,7 +24,7 @@
# package version
%define V_major 6.3.7
-%define V_minor 5
+%define V_minor 6
%define V_dist %{V_major}-%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Graphics
License: GPL
Version: %{V_opkg}
-Release: 20071216
+Release: 20071219
# package options
%option with_perl no
@@ -93,6 +93,9 @@
-e 's/\(-lxml2\)/\1 -liconv/' \
configure
%{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' \
PerlMagick/Makefile.PL.in
%{l_shtool} subst \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
