From 44560ae20a191fc615fedb28c9c1e07853c377b9 Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Thu, 13 May 2010 00:39:02 +0200 Subject: office/calibre: Updated for version 0.5.14 --- office/calibre/patches/fix-libraries.diff | 37 ------------------ office/calibre/patches/fix-manpages.diff | 6 +-- office/calibre/patches/fix-postinstall.diff | 46 ----------------------- office/calibre/patches/post-install-removal.patch | 44 ++++++++++++++++++++++ office/calibre/patches/tagging-form.patch | 12 ++++++ 5 files changed, 59 insertions(+), 86 deletions(-) delete mode 100644 office/calibre/patches/fix-libraries.diff delete mode 100644 office/calibre/patches/fix-postinstall.diff create mode 100644 office/calibre/patches/post-install-removal.patch create mode 100644 office/calibre/patches/tagging-form.patch (limited to 'office/calibre/patches') diff --git a/office/calibre/patches/fix-libraries.diff b/office/calibre/patches/fix-libraries.diff deleted file mode 100644 index 33006a70c7..0000000000 --- a/office/calibre/patches/fix-libraries.diff +++ /dev/null @@ -1,37 +0,0 @@ -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 index 55e7ff8582..50129c6c92 100644 --- a/office/calibre/patches/fix-manpages.diff +++ b/office/calibre/patches/fix-manpages.diff @@ -1,6 +1,6 @@ -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 +diff -Naur calibre-0.5.12.orig/src/calibre/linux.py calibre-0.5.12/src/calibre/linux.py +--- calibre-0.5.12.orig/src/calibre/linux.py 2009-05-15 21:05:52.000000000 +0000 ++++ calibre-0.5.12/src/calibre/linux.py 2009-05-16 04:09:44.000000000 +0000 @@ -417,7 +417,7 @@ def install_man_pages(fatal_errors, use_destdir=False): from calibre.utils.help2man import create_man_page diff --git a/office/calibre/patches/fix-postinstall.diff b/office/calibre/patches/fix-postinstall.diff deleted file mode 100644 index 676cd38406..0000000000 --- a/office/calibre/patches/fix-postinstall.diff +++ /dev/null @@ -1,46 +0,0 @@ -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()] diff --git a/office/calibre/patches/post-install-removal.patch b/office/calibre/patches/post-install-removal.patch new file mode 100644 index 0000000000..6a47e957a0 --- /dev/null +++ b/office/calibre/patches/post-install-removal.patch @@ -0,0 +1,44 @@ +diff -Naur calibre-0.5.14.orig/setup.py calibre-0.5.14/setup.py +--- calibre-0.5.14.orig/setup.py 2009-05-29 17:25:45.000000000 +0000 ++++ calibre-0.5.14/setup.py 2009-06-27 03:26:58.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') + optional = [] + + +@@ -198,6 +196,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.14.orig/src/calibre/linux.py calibre-0.5.14/src/calibre/linux.py +--- calibre-0.5.14.orig/src/calibre/linux.py 2009-05-29 17:25:45.000000000 +0000 ++++ calibre-0.5.14/src/calibre/linux.py 2009-06-27 03:26:23.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()] diff --git a/office/calibre/patches/tagging-form.patch b/office/calibre/patches/tagging-form.patch new file mode 100644 index 0000000000..d1d76e2ff0 --- /dev/null +++ b/office/calibre/patches/tagging-form.patch @@ -0,0 +1,12 @@ +diff -Naur calibre-0.5.14.orig/src/tagging/forms.py calibre-0.5.14/src/tagging/forms.py +--- calibre-0.5.14.orig/src/tagging/forms.py 2009-05-29 17:25:45.000000000 +0000 ++++ calibre-0.5.14/src/tagging/forms.py 2009-07-01 22:58:17.000000000 +0000 +@@ -16,7 +16,7 @@ + value = self.cleaned_data['name'] + tag_names = parse_tag_input(value) + if len(tag_names) > 1: +- raise ValidationError(_('Multiple tags were given.')) ++ raise forms.ValidationError(_('Multiple tags were given.')) + elif len(tag_names[0]) > settings.MAX_TAG_LENGTH: + raise forms.ValidationError( + _('A tag may be no more than %s characters long.') % -- cgit v1.2.3