From ef4f68c6b6292066d24f786e38e75d479cade425 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 24 Dec 2009 18:07:03 -0700 Subject: [PATCH] Fix #4286 (--tags is apparently ignored for lrf output.) --- setup/installer/windows/freeze.py | 5 ++--- src/calibre/ebooks/lrf/output.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index 55e49d1f9b..006345e229 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -13,8 +13,8 @@ from setup import Command, modules, functions, basenames, __version__, \ from setup.build_environment import msvc, MT, RC from setup.installer.windows.wix import WixMixIn -QT_DIR = 'C:\\Qt\\4.5.2' -QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'phonon'] +QT_DIR = 'C:\\Qt\\4.6.0' +QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns', 'phonon'] LIBUSB_DIR = 'C:\\libusb' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' SW = r'C:\cygwin\home\kovid\sw' @@ -347,7 +347,6 @@ class Win32Freeze(Command, WixMixIn): cmd = [msvc.cc] + xflags + ['/Tc'+src, '/Fo'+dest] self.run_builder(cmd) exe = self.j(self.base, bname+'.exe') - manifest = exe+'.manifest' lib = dll.replace('.dll', '.lib') if self.newer(exe, [dest, lib, self.rc_template, __file__]): self.info('Linking', bname) diff --git a/src/calibre/ebooks/lrf/output.py b/src/calibre/ebooks/lrf/output.py index cbac0351b2..4d6b248db5 100644 --- a/src/calibre/ebooks/lrf/output.py +++ b/src/calibre/ebooks/lrf/output.py @@ -33,7 +33,7 @@ class LRFOptions(object): if unicode(x.file_as): self.title_sort = unicode(x.file_as) self.freetext = f2s(m.description) - self.category = f2s(m.tags) + self.category = f2s(m.subject) self.cover = None self.use_metadata_cover = True self.output = output