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: 15-Jul-2007 20:00:12
Branch: HEAD Handle: 2007071519001000
Added files:
openpkg-src/imagemagick imagemagick.patch
Modified files:
openpkg-src/imagemagick imagemagick.spec
Log:
upgrading package: imagemagick 6.3.5.0 -> 6.3.5.1
Summary:
Revision Changes Path
1.2 +30 -0 openpkg-src/imagemagick/imagemagick.patch
1.379 +4 -2 openpkg-src/imagemagick/imagemagick.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.patch
============================================================================
$ cvs diff -u -r0 -r1.2 imagemagick.patch
--- /dev/null 2007-07-15 20:00:05 +0200
+++ imagemagick.patch 2007-07-15 20:00:12 +0200
@@ -0,0 +1,30 @@
+Index: PerlMagick/Makefile.PL
+--- PerlMagick/Makefile.PL 2007-06-17 20:18:49 +0200
++++ PerlMagick/Makefile.PL 2007-06-13 02:28:39 +0200
+@@ -18,7 +18,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 wmf x11 xml wmf zlib/) {
++foreach $delegate (qw/bzlib fontconfig freetype gvc jpeg lcms openexr png
rsvg tiff x11 xml zlib/) {
+ if( -d "t/$delegate" ) {
+ $delegate_tests .= " t/$delegate/*.t";
+ }
+@@ -41,7 +41,7 @@
+ 'VERSION' => '6.3.4',
+
+ # Preprocessor defines
+- 'DEFINE' => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H', # e.g.,
'-DHAVE_SOMETHING'
++ 'DEFINE' => ' -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -DHAVE_CONFIG_H',
# e.g., '-DHAVE_SOMETHING'
+
+ # Header search specfication and preprocessor flags
+ 'INC' => '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2',
+@@ -62,7 +62,7 @@
+ 'INSTALLBIN' => '/usr/bin',
+
+ # Library specification
+- 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick -L/usr/lib64
-lfreetype -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11
-lXt -lbz2 -lz -lpthread -lm -lpthread' ],
++ 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick -lfreetype -llcms
-ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz
-lpthread -lm -lpthread' ],
+
+ # Perl binary name (if a Perl binary is built)
+ 'MAP_TARGET' => 'PerlMagick',
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.378 -r1.379 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 6 Jul 2007 15:18:50 -0000
1.378
+++ openpkg-src/imagemagick/imagemagick.spec 15 Jul 2007 18:00:10 -0000
1.379
@@ -24,7 +24,7 @@
# package version
%define V_major 6.3.5
-%define V_minor 0
+%define V_minor 1
%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: 20070706
+Release: 20070715
# package options
%option with_perl no
@@ -47,6 +47,7 @@
# list of sources
Source0:
ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{V_dist}.tar.bz2
+Patch0: imagemagick.patch
# build information
Prefix: %{l_prefix}
@@ -86,6 +87,7 @@
%prep
%setup -q -n ImageMagick-%{V_major}
+ %patch -p0
%{l_shtool} subst \
-e 's/^\(MagickLibSubdir="\)[^"]*\("\)/\1imagemagick\2/' \
-e 's/\(-lxml2\)/\1 -liconv/' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
