9 files changed, 67 insertions, 57 deletions

diff --git a/deskutils/calibre/files/patch-setup_extensions.py b/deskutils/calibre/files/patch-setup_extensions.py
index c95f8b00cdba..2c7be42ec381 100644
--- a/deskutils/calibre/files/patch-setup_extensions.py
+++ b/deskutils/calibre/files/patch-setup_extensions.py
@@ -1,5 +1,5 @@
---- setup/extensions.py.orig	2009-10-10 06:15:00.000000000 +0400
-+++ setup/extensions.py	2009-10-11 19:37:56.000000000 +0400
+--- setup/extensions.py.orig	2009-12-11 15:04:40.000000000 -0800
++++ setup/extensions.py	2009-12-14 18:25:26.000000000 -0800
 @@ -11,7 +11,7 @@
  
  from PyQt4.pyqtconfig import QtGuiModuleMakefile
@@ -18,7 +18,19 @@
  
  make = 'make' if isunix else NMAKE
  
-@@ -146,6 +146,13 @@
+@@ -141,6 +141,11 @@
+         ['calibre/devices/libusb.c'],
+         ldflags=['-lusb-1.0']))
+ 
++if isfreebsd:
++    if os.environ.get('WITH_USB', 'no') == 'yes':
++        extensions.append(Extension('libusb',
++            ['calibre/devices/libusb.c'],
++            ldflags=['-lusb']))
+ 
+ if isunix:
+     cc = os.environ.get('CC', 'gcc')
+@@ -160,6 +165,13 @@
      ldflags.append('-lpython'+sysconfig.get_python_version())
  
  
diff --git a/deskutils/calibre/files/patch-src_calibre_constants.py b/deskutils/calibre/files/patch-src_calibre_constants.py
index 8fc00e86fb5b..b9f39faf78d8 100644
--- a/deskutils/calibre/files/patch-src_calibre_constants.py
+++ b/deskutils/calibre/files/patch-src_calibre_constants.py
@@ -1,5 +1,5 @@
---- src/calibre/constants.py.orig	2009-10-11 17:23:28.000000000 +0400
-+++ src/calibre/constants.py	2009-10-11 18:02:53.000000000 +0400
+--- src/calibre/constants.py.orig	2009-12-11 15:04:40.000000000 -0800
++++ src/calibre/constants.py	2009-12-13 17:39:53.000000000 -0800
 @@ -22,7 +22,8 @@
  iswindows = 'win32' in sys.platform.lower() or 'win64' in sys.platform.lower()
  isosx     = 'darwin' in sys.platform.lower()
@@ -10,3 +10,11 @@
  isfrozen  = hasattr(sys, 'frozen')
  
  try:
+@@ -58,6 +59,7 @@
+             'fontconfig', 'pdfreflow', 'progress_indicator'] + \
+                     (['winutil'] if iswindows else []) + \
+                     (['libusb'] if islinux else []) + \
++                    (['libusb'] if isfreebsd else []) + \
+                     (['usbobserver'] if isosx else []):
+             try:
+                 p, err = __import__(plugin), ''
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_libusb.c b/deskutils/calibre/files/patch-src_calibre_devices_libusb.c
new file mode 100644
index 000000000000..9440151b421b
--- /dev/null
+++ b/deskutils/calibre/files/patch-src_calibre_devices_libusb.c
@@ -0,0 +1,11 @@
+--- src/calibre/devices/libusb.c.orig	2009-12-13 17:36:03.000000000 -0800
++++ src/calibre/devices/libusb.c	2009-12-13 17:36:08.000000000 -0800
+@@ -12,7 +12,7 @@
+ 
+ #define PY_SSIZE_T_CLEAN
+ #include <Python.h>
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ 
+ libusb_context *ctxt = NULL;
+ 
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_images.cpp b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_images.cpp
deleted file mode 100644
index 1e47cb97a7f6..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_images.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/ebooks/pdf/images.cpp.orig	2009-10-11 23:25:44.000000000 +0400
-+++ src/calibre/ebooks/pdf/images.cpp	2009-10-11 23:25:51.000000000 +0400
-@@ -157,7 +157,7 @@
-         delete writer;
- 
-         free(row);
--        imgStr->close();
-+//        imgStr->close();
-         delete imgStr;
- 
-     }
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp
deleted file mode 100644
index 307e5089d151..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/ebooks/pdf/reflow.cpp.orig	2009-10-11 23:21:41.000000000 +0400
-+++ src/calibre/ebooks/pdf/reflow.cpp	2009-10-11 23:25:18.000000000 +0400
-@@ -669,7 +669,7 @@
- 				  int width, int height, GBool invert,
- 				  GBool interpolate, GBool inlineImg) {
-     OutputDev::drawImageMask(state, ref, str, width, height,
--            invert, interpolate, inlineImg);
-+            invert, inlineImg);
-     //this->images->add_mask();
-     cerr << "mask requested" << endl;
- }
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py
index 8860155f080d..8048ac460006 100644
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py
+++ b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py
@@ -1,9 +1,9 @@
---- src/calibre/ebooks/pdf/writer.py.orig	2009-10-11 23:06:22.000000000 +0400
-+++ src/calibre/ebooks/pdf/writer.py	2009-10-11 23:18:59.000000000 +0400
+--- src/calibre/ebooks/pdf/writer.py.orig	2009-12-11 15:04:41.000000000 -0800
++++ src/calibre/ebooks/pdf/writer.py	2009-12-13 16:45:34.000000000 -0800
 @@ -19,7 +19,7 @@
  from PyQt4 import QtCore
  from PyQt4.Qt import QUrl, QEventLoop, SIGNAL, QObject, \
-     QApplication, QPrinter, QMetaObject, QSizeF, Qt
+     QPrinter, QMetaObject, QSizeF, Qt
 -from PyQt4.QtWebKit import QWebView
 +from PyQt4.QtWebKit import *
  
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2___init__.py b/deskutils/calibre/files/patch-src_calibre_gui2___init__.py
index f2762ea35947..0fdbd2e806ed 100644
--- a/deskutils/calibre/files/patch-src_calibre_gui2___init__.py
+++ b/deskutils/calibre/files/patch-src_calibre_gui2___init__.py
@@ -1,5 +1,5 @@
---- src/calibre/gui2/__init__.py.orig	2009-10-11 19:17:36.000000000 +0400
-+++ src/calibre/gui2/__init__.py	2009-10-11 19:17:55.000000000 +0400
+--- src/calibre/gui2/__init__.py.orig	2009-12-11 15:04:41.000000000 -0800
++++ src/calibre/gui2/__init__.py	2009-12-13 16:46:37.000000000 -0800
 @@ -9,7 +9,7 @@
  
  ORG_NAME = 'KovidsBrain'
@@ -9,12 +9,12 @@
  from calibre.utils.config import Config, ConfigProxy, dynamic
  from calibre.utils.localization import set_qt_translator
  from calibre.ebooks.metadata.meta import get_metadata, metadata_from_formats
-@@ -522,7 +522,7 @@
+@@ -535,7 +535,7 @@
  
  def is_ok_to_use_qt():
-     global gui_thread
+     global gui_thread, _store_app
 -    if islinux and ':' not in os.environ.get('DISPLAY', ''):
 +    if (islinux or isfreebsd) and ':' not in os.environ.get('DISPLAY', ''):
          return False
-     if QApplication.instance() is None:
-         QApplication([])
+     if _store_app is None and QApplication.instance() is None:
+         _store_app = QApplication([])
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_main.py b/deskutils/calibre/files/patch-src_calibre_gui2_main.py
index 69922c4aefba..9015b0536f5f 100644
--- a/deskutils/calibre/files/patch-src_calibre_gui2_main.py
+++ b/deskutils/calibre/files/patch-src_calibre_gui2_main.py
@@ -1,11 +1,11 @@
---- src/calibre/gui2/main.py.orig	2009-10-11 19:12:53.000000000 +0400
-+++ src/calibre/gui2/main.py	2009-10-11 19:13:28.000000000 +0400
-@@ -16,7 +16,7 @@
+--- src/calibre/gui2/main.py.orig	2009-12-11 15:04:41.000000000 -0800
++++ src/calibre/gui2/main.py	2009-12-13 16:47:27.000000000 -0800
+@@ -6,7 +6,7 @@
+ from PyQt4.Qt import QCoreApplication, QIcon, QMessageBox
  
- from calibre import  prints, patheq
- from calibre.constants import __version__, __appname__, isfrozen, islinux, \
--                    iswindows, isosx, filesystem_encoding
-+                    iswindows, isosx, isfreebsd, filesystem_encoding
- from calibre.utils.filenames import ascii_filename
- from calibre.ptempfile import PersistentTemporaryFile
- from calibre.utils.config import prefs, dynamic
+ from calibre import prints
+-from calibre.constants import iswindows, __appname__, isosx
++from calibre.constants import iswindows, __appname__, isosx, isfreebsd
+ from calibre.utils.ipc import ADDRESS, RC
+ from calibre.gui2 import ORG_NAME, APP_UID, initialize_file_icon_provider, \
+     Application
diff --git a/deskutils/calibre/files/patch-src_calibre_linux.py b/deskutils/calibre/files/patch-src_calibre_linux.py
index 5614a76e87c2..d3192a434cdc 100644
--- a/deskutils/calibre/files/patch-src_calibre_linux.py
+++ b/deskutils/calibre/files/patch-src_calibre_linux.py
@@ -1,6 +1,6 @@
---- src/calibre/linux.py.orig	2009-10-10 06:15:01.000000000 +0400
-+++ src/calibre/linux.py	2009-10-12 14:10:34.000000000 +0400
-@@ -128,10 +128,7 @@
+--- src/calibre/linux.py.orig	2009-12-11 15:04:41.000000000 -0800
++++ src/calibre/linux.py	2009-12-14 17:29:52.000000000 -0800
+@@ -128,20 +128,12 @@
          self.icon_resources = []
          self.menu_resources = []
          self.mime_resources = []
@@ -11,16 +11,17 @@
          self.create_uninstaller()
  
          from calibre.utils.config import config_dir
-@@ -140,8 +137,6 @@
-             for f in os.listdir('.'):
-                 if os.stat(f).st_uid == 0:
-                     os.rmdir(f) if os.path.isdir(f) else os.unlink(f)
--        if os.stat(config_dir).st_uid == 0:
--            os.rmdir(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.rmdir(f) if os.path.isdir(f) else os.unlink(f)
+-            if os.stat(config_dir).st_uid == 0:
+-                os.rmdir(config_dir)
  
          if warn is None and self.warnings:
              self.info('There were %d warnings'%len(self.warnings))
-@@ -319,7 +314,7 @@
+@@ -318,7 +310,7 @@
      def install_man_pages(self):
          try:
              from calibre.utils.help2man import create_man_page
@@ -29,7 +30,7 @@
              if not os.path.exists(manpath):
                  os.makedirs(manpath)
              self.info('Installing MAN pages...')
-@@ -332,7 +327,7 @@
+@@ -331,7 +323,7 @@
                      continue
                  parser = parser()
                  raw = create_man_page(prog, parser)