From fc2899354d69be1980ea3dcfd4a44b4641c11768 Mon Sep 17 00:00:00 2001 From: larryhaja Date: Sun, 16 Sep 2012 22:20:27 -0700 Subject: office/calibre: Updated calibre to 0.8.69. Signed-off-by: Robby Workman --- office/calibre/patches/fix-shebangs.patch | 27 +++++++++++++ office/calibre/patches/manpages-installation.patch | 44 ---------------------- .../patches/remove-desktop-integration.patch | 12 +++--- 3 files changed, 33 insertions(+), 50 deletions(-) create mode 100644 office/calibre/patches/fix-shebangs.patch delete mode 100644 office/calibre/patches/manpages-installation.patch (limited to 'office/calibre/patches') diff --git a/office/calibre/patches/fix-shebangs.patch b/office/calibre/patches/fix-shebangs.patch new file mode 100644 index 0000000000000..e742926d37194 --- /dev/null +++ b/office/calibre/patches/fix-shebangs.patch @@ -0,0 +1,27 @@ +diff -Naur calibre.orig/src/calibre/ebooks/markdown/extensions/def_list.py calibre/src/calibre/ebooks/markdown/extensions/def_list.py +--- calibre.orig/src/calibre/ebooks/markdown/extensions/def_list.py 2012-06-29 04:53:39.000000000 +0000 ++++ calibre/src/calibre/ebooks/markdown/extensions/def_list.py 2012-07-03 03:31:12.127833772 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env Python ++#!/usr/bin/env python + """ + Definition List Extension for Python-Markdown + ============================================= +diff -Naur calibre.orig/src/calibre/ebooks/markdown/extensions/meta.py calibre/src/calibre/ebooks/markdown/extensions/meta.py +--- calibre.orig/src/calibre/ebooks/markdown/extensions/meta.py 2012-06-29 04:53:39.000000000 +0000 ++++ calibre/src/calibre/ebooks/markdown/extensions/meta.py 2012-07-03 03:31:34.910833575 +0000 +@@ -1,4 +1,4 @@ +-#!usr/bin/python ++#!/usr/bin/python + + """ + Meta Data Extension for Python-Markdown +diff -Naur calibre.orig/src/calibre/ebooks/markdown/extensions/tables.py calibre/src/calibre/ebooks/markdown/extensions/tables.py +--- calibre.orig/src/calibre/ebooks/markdown/extensions/tables.py 2012-06-29 04:53:39.000000000 +0000 ++++ calibre/src/calibre/ebooks/markdown/extensions/tables.py 2012-07-03 03:31:45.957833583 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env Python ++#!/usr/bin/env python + """ + Tables Extension for Python-Markdown + ==================================== diff --git a/office/calibre/patches/manpages-installation.patch b/office/calibre/patches/manpages-installation.patch deleted file mode 100644 index 60172acd1f60f..0000000000000 --- a/office/calibre/patches/manpages-installation.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py ---- calibre.orig/src/calibre/linux.py 2010-06-20 00:32:31.000000000 +0000 -+++ calibre/src/calibre/linux.py 2010-06-20 19:45:45.000000000 +0000 -@@ -288,8 +288,8 @@ - def install_man_pages(self): - try: - from calibre.utils.help2man import create_man_page -- if isfreebsd: -- manpath = os.path.join(self.opts.staging_root, 'man/man1') -+ if islinux or isfreebsd: -+ manpath = os.path.join(self.opts.staging_root, 'usr/man/man1') - else: - manpath = os.path.join(self.opts.staging_sharedir, 'man/man1') - if not os.path.exists(manpath): -@@ -304,7 +304,7 @@ - continue - parser = parser() - raw = create_man_page(prog, parser) -- if isfreebsd: -+ if islinux or isfreebsd: - manfile = os.path.join(manpath, prog+'.1') - else: - manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2') -diff -Naur calibre.orig/src/calibre/utils/help2man.py calibre/src/calibre/utils/help2man.py ---- calibre.orig/src/calibre/utils/help2man.py 2010-06-20 00:32:32.000000000 +0000 -+++ calibre/src/calibre/utils/help2man.py 2010-06-20 19:52:20.000000000 +0000 -@@ -4,7 +4,7 @@ - __docformat__ = 'restructuredtext en' - - import time, bz2 --from calibre.constants import isfreebsd -+from calibre.constants import islinux, isfreebsd - - from calibre.constants import __version__, __appname__, __author__ - -@@ -58,7 +58,7 @@ - lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for - x in lines] - -- if not isfreebsd: -+ if not islinux and not isfreebsd: - return bz2.compress((u'\n'.join(lines)).encode('utf-8')) - else: - return (u'\n'.join(lines)).encode('utf-8') diff --git a/office/calibre/patches/remove-desktop-integration.patch b/office/calibre/patches/remove-desktop-integration.patch index c1fe516f364d5..dbf54d6cb09fe 100644 --- a/office/calibre/patches/remove-desktop-integration.patch +++ b/office/calibre/patches/remove-desktop-integration.patch @@ -1,11 +1,11 @@ diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py ---- calibre.orig/src/calibre/linux.py 2010-06-11 22:28:24.000000000 +0000 -+++ calibre/src/calibre/linux.py 2010-06-13 23:07:49.000000000 +0000 -@@ -133,9 +133,6 @@ - if islinux: +--- calibre.orig/src/calibre/linux.py 2012-06-29 04:53:39.000000000 +0000 ++++ calibre/src/calibre/linux.py 2012-07-03 02:57:13.834849391 +0000 +@@ -177,9 +177,6 @@ + self.mime_resources = [] + if islinux or isbsd: self.setup_completion() - self.install_man_pages() -- if islinux: +- if islinux or isbsd: - self.setup_desktop_integration() - self.create_uninstaller() -- cgit v1.2.3