1 --- calibre/setup/build_environment.py~ 2013-06-14 14:05:26.545918167 +0200
2 +++ calibre/setup/build_environment.py 2013-06-14 14:08:05.417786156 +0200
5 png_inc_dirs = pkgconfig_include_dirs('libpng', 'PNG_INC_DIR',
7 - magick_inc_dirs = pkgconfig_include_dirs('MagickWand', 'MAGICK_INC', '/usr/include/ImageMagick')
8 + magick_inc_dirs = pkgconfig_include_dirs('MagickWand', 'MAGICK_INC', '/usr/include/ImageMagick-6')
11 png_lib_dirs = pkgconfig_lib_dirs('libpng', 'PNG_LIB_DIR', '/usr/lib64')
12 --- calibre/src/calibre/utils/magick/generate.py~ 2013-06-14 04:43:40.000000000 +0200
13 +++ calibre/src/calibre/utils/magick/generate.py 2013-06-14 14:08:45.158252817 +0200
16 import os, textwrap, re, subprocess
18 -INC = '/usr/include/ImageMagick'
19 +INC = '/usr/include/ImageMagick-6'
22 Various constants defined in the ImageMagick header files. Note that
25 with open('/tmp/ig.c','wb') as f:
27 - subprocess.check_call(['gcc', '-I/usr/include/ImageMagick', '/tmp/ig.c', '-o', '/tmp/ig', '-lMagickWand'])
28 + subprocess.check_call(['gcc', '-I/usr/include/ImageMagick-6', '/tmp/ig.c', '-o', '/tmp/ig', '-lMagickWand'])
29 return int(subprocess.Popen(["/tmp/ig"],
30 stdout=subprocess.PIPE).communicate()[0].strip())