From 3c0d0ed10fd9d54954c21c24951aafbc00c11e0a Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Wed, 12 May 2010 23:32:59 +0200 Subject: office/calibre: Added to 12.2 repository --- office/calibre/patches/fix-libraries.diff | 37 +++++++++++++++++++++++ office/calibre/patches/fix-manpages.diff | 21 +++++++++++++ office/calibre/patches/fix-postinstall.diff | 46 +++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 office/calibre/patches/fix-libraries.diff create mode 100644 office/calibre/patches/fix-manpages.diff create mode 100644 office/calibre/patches/fix-postinstall.diff (limited to 'office/calibre/patches') diff --git a/office/calibre/patches/fix-libraries.diff b/office/calibre/patches/fix-libraries.diff new file mode 100644 index 0000000000..33006a70c7 --- /dev/null +++ b/office/calibre/patches/fix-libraries.diff @@ -0,0 +1,37 @@ +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']) diff --git a/office/calibre/patches/fix-manpages.diff b/office/calibre/patches/fix-manpages.diff new file mode 100644 index 0000000000..55e7ff8582 --- /dev/null +++ b/office/calibre/patches/fix-manpages.diff @@ -0,0 +1,21 @@ +diff -Naur calibre-0.5.6.orig/src/calibre/linux.py calibre-0.5.6/src/calibre/linux.py +--- calibre-0.5.6.orig/src/calibre/linux.py 2009-04-09 04:13:27.000000000 +0000 ++++ calibre-0.5.6/src/calibre/linux.py 2009-04-13 22:17:10.000000000 +0000 +@@ -417,7 +417,7 @@ + def install_man_pages(fatal_errors, use_destdir=False): + from calibre.utils.help2man import create_man_page + prefix = os.environ.get('DESTDIR', '/') if use_destdir else '/' +- manpath = os.path.join(prefix, 'usr/share/man/man1') ++ manpath = os.path.join(prefix, 'usr/man/man1') + if not os.path.exists(manpath): + os.makedirs(manpath) + print 'Installing MAN pages...' +@@ -431,7 +431,7 @@ + continue + parser = parser() + raw = create_man_page(prog, parser) +- manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') ++ manfile = os.path.join(manpath, prog+'.1'+'.bz2') + print '\tInstalling MAN page for', prog + open(manfile, 'wb').write(raw) + manifest.append(manfile) diff --git a/office/calibre/patches/fix-postinstall.diff b/office/calibre/patches/fix-postinstall.diff new file mode 100644 index 0000000000..676cd38406 --- /dev/null +++ b/office/calibre/patches/fix-postinstall.diff @@ -0,0 +1,46 @@ +diff -Naur calibre-0.5.6.orig/setup.py calibre-0.5.6/setup.py +--- calibre-0.5.6.orig/setup.py 2009-04-09 04:13:27.000000000 +0000 ++++ calibre-0.5.6/setup.py 2009-04-13 22:14:41.000000000 +0000 +@@ -55,8 +55,6 @@ + upload_to_pypi, stage3, stage2, stage1, upload, \ + upload_rss + +- entry_points['console_scripts'].append( +- 'calibre_postinstall = calibre.linux:post_install') + ext_modules = [ + Extension('calibre.plugins.lzx', + sources=['src/calibre/utils/lzx/lzxmodule.c', +--- calibre-0.5.6.orig/setup.py 2009-04-09 04:13:27.000000000 +0000 ++++ calibre-0.5.6/setup.py 2009-04-13 22:14:41.000000000 +0000 +@@ -179,6 +179,4 @@ + + if 'develop' in ' '.join(sys.argv) and islinux: + subprocess.check_call('calibre_postinstall --do-not-reload-udev-hal', shell=True) +- if 'install' in sys.argv and islinux: +- subprocess.check_call('calibre_postinstall', shell=True) + +diff -Naur calibre-0.5.6.orig/src/calibre/linux.py calibre-0.5.6/src/calibre/linux.py +--- calibre-0.5.6.orig/src/calibre/linux.py 2009-04-09 04:13:27.000000000 +0000 ++++ calibre-0.5.6/src/calibre/linux.py 2009-04-13 22:17:10.000000000 +0000 +@@ -444,7 +444,6 @@ + global use_destdir + use_destdir = opts.destdir + manifest = [] +- setup_desktop_integration(opts.fatal_errors) + if opts.no_root or os.geteuid() == 0: + manifest += install_man_pages(opts.fatal_errors, use_destdir) + manifest += setup_udev_rules(opts.group_file, not opts.dont_reload, opts.fatal_errors) +@@ -462,13 +461,6 @@ + if opts.save_manifest_to: + open(opts.save_manifest_to, 'wb').write('\n'.join(manifest)+'\n') + +- from calibre.utils.config import config_dir +- if os.path.exists(config_dir): +- os.chdir(config_dir) +- for f in os.listdir('.'): +- if os.stat(f).st_uid == 0: +- os.unlink(f) +- + def binary_install(): + manifest = os.path.join(getattr(sys, 'frozen_path'), 'manifest') + exes = [x.strip() for x in open(manifest).readlines()] -- cgit v1.2.3