From 5d800d0d1999f8b89eafb26b03aec853ea502617 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 1 Aug 2009 16:17:32 -0600
Subject: [PATCH] IGN:...

---
 installer/linux/freeze.py             | 1 +
 installer/osx/freeze.py               | 5 +++--
 src/calibre/utils/poppler/__init__.py | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py
index 352211379b..193d8183ed 100644
--- a/installer/linux/freeze.py
+++ b/installer/linux/freeze.py
@@ -36,6 +36,7 @@ def freeze():
                        '/lib/libz.so.1',
                        '/lib/libbz2.so.1',
                        '/usr/lib/libpoppler.so.4',
+                       '/usr/lib/libpoppler-qt4.so.3',
                        '/usr/lib/libxml2.so.2',
                        '/usr/lib/libdbus-1.so.3',
                        '/usr/lib/libopenjpeg.so.2',
diff --git a/installer/osx/freeze.py b/installer/osx/freeze.py
index 914864de62..b9dc2ebe39 100644
--- a/installer/osx/freeze.py
+++ b/installer/osx/freeze.py
@@ -237,8 +237,9 @@ _check_symlinks_prescript()
         print
         print 'Adding poppler'
         for x in ('pdftohtml', 'libpoppler.4.dylib', 'libpoppler-qt4.3.dylib'):
-            os.link(os.path.join(os.path.expanduser('~/poppler'), x),
-                    os.path.join(frameworks_dir, x))
+            tgt = os.path.join(frameworks_dir, x)
+            os.link(os.path.join(os.path.expanduser('~/poppler'), x), tgt)
+            self.fix_qt_dependencies(tgt, self.qt_dependencies(tgt))
 
 
 
diff --git a/src/calibre/utils/poppler/__init__.py b/src/calibre/utils/poppler/__init__.py
index e696dd79ad..388e4df905 100644
--- a/src/calibre/utils/poppler/__init__.py
+++ b/src/calibre/utils/poppler/__init__.py
@@ -35,6 +35,12 @@ def get_metadata(stream, cover=True):
     if creator:
         mi.book_producer = creator
 
+    if doc.subject:
+        mi.category = doc.subject
+
+    if doc.keywords:
+        mi.tags = [x.strip() for x in doc.keywords.split(',')]
+
     if cover:
         from calibre.gui2 import is_ok_to_use_qt
         cdata = None