[magickthumbnail] Fix for FS#20147.

git-svn-id: svn+ssh://scm.narf.ssji.net/svn/archlinux-packages@250 df209809-8e4a-0410-9a64-c169741eb0fc

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = magickthumbnail
 	pkgdesc = Helper program for ROX-Filer that provides thumbnails for image and font files
-	pkgver = 1.0
+	pkgver = 0.5.2
 	pkgrel = 1
 	url = http://roxos.sunsite.dk/dev-contrib/guido/
 	install = magickthumbnail.install
@@ -9,8 +9,12 @@ pkgbase = magickthumbnail
 	license = GPL2
 	depends = rox
 	depends = rox-lib
-	source = http://roxos.sunsite.dk/dev-contrib/guido/MagickThumbnail.tar.bz2
-	md5sums = 7407cd73f085d13682ac82516988c37c
+	source = http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/MagickThumbnail-0.5.2.tar.bz2
+	source = magickthumb.py_PDF-FirstPage.patch
+	source = Python-Replace-MD5-Hashlib.patch
+	md5sums = 6cd87e393c860a6ce8e6f16164221815
+	md5sums = f6101f1f5fc0420d3ed00683e4863c91
+	md5sums = e17bc8ed4420de7ddfb779f044f4f30f
 
 pkgname = magickthumbnail
 

PKGBUILD

@@ -1,8 +1,9 @@
 # $Id$
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Maintainer: Olivier Mehani <shtrom-arch@ssji.net>
 
 pkgname=magickthumbnail
-pkgver=1.0
+pkgver=0.5.2
 pkgrel=1
 pkgdesc="Helper program for ROX-Filer that provides thumbnails for image and font files"
 arch=('i686' 'x86_64')
@@ -10,16 +11,22 @@ url="http://roxos.sunsite.dk/dev-contrib/guido/"
 license=("GPL2")
 depends=('rox' 'rox-lib')
 install=magickthumbnail.install
-source=(http://roxos.sunsite.dk/dev-contrib/guido/MagickThumbnail.tar.bz2)
-md5sums=('7407cd73f085d13682ac82516988c37c')
+source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/MagickThumbnail-${pkgver}.tar.bz2
+	magickthumb.py_PDF-FirstPage.patch
+	Python-Replace-MD5-Hashlib.patch)
 
 build() {
   mkdir -p $startdir/pkg/usr/share
-  cp -rp MagickThumbnail $startdir/pkg/usr/share
-
+  cd ${srcdir}/MagickThumbnail
+  patch -p1 < ${srcdir}/magickthumb.py_PDF-FirstPage.patch
+  patch -p1 < ${srcdir}/Python-Replace-MD5-Hashlib.patch
+  cp -rp ${srcdir}/MagickThumbnail $startdir/pkg/usr/share
    # create a shellscript which is known in the PATH
   mkdir -p $startdir/pkg/usr/bin
   echo "#!/bin/sh" > "$startdir/pkg/usr/bin/magickthumbnail"
   echo "exec /usr/share/MagickThumbnail/AppRun \"\$@\"" >> "$startdir/pkg/usr/bin/magickthumbnail"
   chmod a+x $startdir/pkg/usr/bin/magickthumbnail
 }
+md5sums=('6cd87e393c860a6ce8e6f16164221815'
+         'f6101f1f5fc0420d3ed00683e4863c91'
+         'e17bc8ed4420de7ddfb779f044f4f30f')

Python-Replace-MD5-Hashlib.patch

@@ -0,0 +1,44 @@
+Index: MagickThumbnail/magickthumb.py
+===================================================================
+--- MagickThumbnail.orig/magickthumb.py
++++ MagickThumbnail/magickthumb.py
+@@ -14,7 +14,7 @@ To use this in ROX-Filer, get a recent v
+ click on "Install handlers".  """
+ 
+ import os, sys
+-import md5
++import hashlib
+ import rox
+ 
+ import thumb
+@@ -111,7 +111,7 @@ def main(argv):
+     # Out file name is based on MD5 hash of the URI
+     if not outname:
+         uri='file://'+inname
+-        tmp=md5.new(uri).digest()
++        tmp=hashlib.md5(uri).digest()
+         leaf=''
+         for c in tmp:
+             leaf+='%02x' % ord(c)
+Index: MagickThumbnail/thumb.py
+===================================================================
+--- MagickThumbnail.orig/thumb.py
++++ MagickThumbnail/thumb.py
+@@ -9,7 +9,7 @@ useful implemetation is VideoThumbnail.
+ """
+ 
+ import os, sys
+-import md5
++import hashlib
+ 
+ import rox
+ 
+@@ -38,7 +38,7 @@ class Thumbnailler:
+         """
+         if not outname:
+             uri='file://'+inname
+-            tmp=md5.new(uri).digest()
++            tmp=hashlib.md5(uri).digest()
+             leaf=''
+             for c in tmp:
+                 leaf+='%02x' % ord(c)

magickthumb.py_PDF-FirstPage.patch

@@ -0,0 +1,11 @@
+--- MagickThumbnail.orig/magickthumb.py	2010-07-12 16:30:00.766803546 +1000
++++ MagickThumbnail/magickthumb.py	2010-07-12 16:34:50.893416657 +1000
+@@ -55,7 +55,7 @@
+ 	
+ 	#cmd='convert -mattecolor %s -frame "%s"x"%s" -size "%s"x"%s" "%s" -resize "%s"x"%s" +profile "*" "%s"'  % (bcolor, bwidth, bwidth, rsize, rsize, inname, rsize, rsize, frfname)
+ 	if frameit:
+-		cmd='convert -flatten -mattecolor "%s" -frame %sx%s+%s+%s -size %sx%s "%s" -resize %sx%s +profile "*" "%s"'  % (bcolor, frame_width, frame_width, outer_bevel, inner_bevel, rsize, rsize, inname, rsize, rsize, frfname)
++		cmd='convert -flatten -mattecolor "%s" -frame %sx%s+%s+%s -size %sx%s "%s[0]" -resize %sx%s +profile "*" "%s"'  % (bcolor, frame_width, frame_width, outer_bevel, inner_bevel, rsize, rsize, inname, rsize, rsize, frfname)
+ 		#cmd='convert -mattecolor "#697B8F" -frame 6x6+2+4 -size %sx%s %s -resize %sx%s +profile "*" %s'  % (rsize, rsize, inname, rsize, rsize, frfname)
+ 	else:
+ 		if '.xcf' in inname: