From ac46e350e174e78a55a348eda775665ae0eb3277 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 24 Mar 2012 12:07:28 +0100
Subject: update gcc, glibc and fix build breakage

---
 package/ImageMagick/Makefile                       | 12 +++----
 package/ImageMagick/patches/patch-config_ltmain_sh | 39 ----------------------
 2 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 package/ImageMagick/patches/patch-config_ltmain_sh

(limited to 'package/ImageMagick')

diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 2f50ddf20..9b137a4a3 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		ImageMagick
-PKG_VERSION:=		6.6.5
-PKG_EXTRAVER:=		10
+PKG_VERSION:=		6.7.6
+PKG_EXTRAVER:=		1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a07a97cfb28b588cbcf83ffa9ec92e3f
+PKG_MD5SUM:=		8134257e3fbb43cc06fb32a6d725d3d0
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
 PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv libtool e2fsprogs
@@ -57,9 +57,9 @@ libimagemagick-install:
 	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
 	$(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \
 		$(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
-	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/config
-	$(INSTALL_DATA) $(WRKINST)/usr/share/${PKG_NAME}-${PKG_VERSION}/config/* \
-		$(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/config
+	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}
+	$(INSTALL_DATA) $(WRKINST)/usr/share/${PKG_NAME}-${PKG_VERSION}/* \
+		$(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/
 	$(CP) $(WRKINST)/usr/lib/libMagickCore.so* \
 		$(IDIR_LIBIMAGEMAGICK)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libMagickWand.so* \
diff --git a/package/ImageMagick/patches/patch-config_ltmain_sh b/package/ImageMagick/patches/patch-config_ltmain_sh
deleted file mode 100644
index 9ca2a4a6c..000000000
--- a/package/ImageMagick/patches/patch-config_ltmain_sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- ImageMagick-6.6.5-10.orig/config/ltmain.sh	2010-11-21 22:35:22.000000000 +0100
-+++ ImageMagick-6.6.5-10/config/ltmain.sh	2011-01-14 00:59:45.000000000 +0100
-@@ -5091,7 +5091,7 @@ func_mode_link ()
-       # @file                GCC response files
-       # -tp=*                Portland pgcc target processor selection
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-@@ -5843,27 +5843,6 @@ func_mode_link ()
- 	      esac
- 	    fi
- 
--	    # Hardcode the library path.
--	    # Skip directories that are in the system default run-time
--	    # search path.
--	    case " $sys_lib_dlsearch_path " in
--	    *" $absdir "*) ;;
--	    *)
--	      case "$compile_rpath " in
--	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
--	      esac
--	      ;;
--	    esac
--	    case " $sys_lib_dlsearch_path " in
--	    *" $libdir "*) ;;
--	    *)
--	      case "$finalize_rpath " in
--	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
--	      esac
--	      ;;
--	    esac
- 	  fi # $linkmode,$pass = prog,link...
- 
- 	  if test "$alldeplibs" = yes &&
-- 
cgit v1.2.3