Browse Source

imagemagick: Updated (6.4.3-5 -> 6.6.3-9)

user/karasz/next/updates
Christian Wiese 14 years ago
parent
commit
4bf5f4b059
  1. 6
      graphic/imagemagick/imagemagick.desc
  2. 34
      graphic/imagemagick/multilib-fix.patch

6
graphic/imagemagick/imagemagick.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../imagemagick/imagemagick.desc [COPY] Filename: package/.../imagemagick/imagemagick.desc
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] [COPY]
@ -33,7 +33,7 @@
[L] OpenSource [L] OpenSource
[S] Stable [S] Stable
[V] 6.4.3-5 [V] 6.6.3-9
[P] X -----5-7-9 133.900 [P] X -----5-7-9 133.900
[D] 3995810492 ImageMagick-6.4.3-5.tar.bz2 ftp://ftp.imagemagick.org/pub/ImageMagick/ [D] 2902956298 ImageMagick-6.6.3-9.tar.bz2 ftp://ftp.imagemagick.org/pub/ImageMagick/

34
graphic/imagemagick/multilib-fix.patch

@ -1,34 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../imagemagick/multilib-fix.patch
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
On 64bit multilib-systems this had caused linking to 32bit libs.
-- jsaw
re-diffed for 6.2.8 and then for 6.3 version - Aldas (Baldzius)
diff -Nur ImageMagick-6.3.8-orig/configure.ac ImageMagick-6.3.8/configure.ac
--- ImageMagick-6.3.8-orig/configure.ac 2008-02-18 11:50:29.000000000 +0100
+++ ImageMagick-6.3.8/configure.ac 2008-02-18 11:52:24.000000000 +0100
@@ -2170,7 +2170,7 @@
CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
fi
if test "${xml2_prefix}" != '/usr'; then
- LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
+ LDFLAGS="$LDFLAGS"
fi
fi
failed=0;
Loading…
Cancel
Save