slackbuilds_ponce/office/calibre/patches/fix-libraries.diff
2010-05-12 23:32:59 +02:00

37 lines
2 KiB
Diff

diff -Naur calibre-0.5.6.orig/installer/linux/freeze.py calibre-0.5.6/installer/linux/freeze.py
--- calibre-0.5.6.orig/installer/linux/freeze.py 2009-04-02 22:51:20.000000000 +0000
+++ calibre-0.5.6/installer/linux/freeze.py 2009-04-08 03:30:37.000000000 +0000
@@ -31,17 +31,17 @@
'/usr/lib/libsqlite3.so.0',
'/usr/lib/libsqlite3.so.0',
'/usr/lib/libmng.so.1',
- '/lib/libz.so.1',
+ '/usr/lib/libz.so.1',
'/lib/libbz2.so.1',
'/lib/libbz2.so.1',
- '/usr/lib/libpoppler.so.4',
+ '/usr/lib/libpoppler.so.3',
'/usr/lib/libxml2.so.2',
'/usr/lib/libdbus-1.so.3',
- '/usr/lib/libopenjpeg.so.2',
+ '/usr/lib/libopenjpeg.so.1.3',
'/usr/lib/libxslt.so.1',
'/usr/lib/libxslt.so.1',
'/usr/lib/libgthread-2.0.so.0',
- '/usr/lib/gcc/i686-pc-linux-gnu/4.3.3/libstdc++.so.6',
+ '/usr/lib/libstdc++.so.6',
'/usr/lib/libpng12.so.0',
'/usr/lib/libexslt.so.0',
'/usr/lib/libMagickWand.so',
diff -Naur calibre-0.5.6.orig/src/calibre/libwand.py calibre-0.5.6/src/calibre/libwand.py
--- calibre-0.5.6.orig/src/calibre/libwand.py 2009-04-09 04:13:27.000000000 +0000
+++ calibre-0.5.6/src/calibre/libwand.py 2009-04-14 17:04:11.000000000 +0000
@@ -7,7 +7,7 @@
class WandException(Exception):
pass
-_lib_name = 'CORE_RL_wand_.dll' if iswindows else 'libWand.dylib' if isosx else 'libWand.so'
+_lib_name = 'CORE_RL_wand_.dll' if iswindows else 'libWand.dylib' if isosx else 'libMagickWand.so'
if iswindows and hasattr(sys, 'frozen'):
im_dir = os.path.join(os.path.dirname(sys.executable), 'ImageMagick')
os.putenv('PATH', im_dir + ';' + os.environ['PATH'])