From fe3c7ec33d0e004cf4ba8e1db8996c49207afbd6 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 26 Nov 2012 14:02:49 +0000 Subject: [PATCH] Update to 0.9.7 * Add dependency to net/py-netifaces Changelog: Release: 0.9.7 [23 Nov, 2012] New Features Edit metadata dialog: Show the size of the current book cover in the edit metadata dialog. Closes tickets: 1079781 Get Books: Allow easy searching by title and author in addition to any keyword, to prevent large numbers of spurious matches. An option to automatically convert any added book to the current output format, found under Preferences->Adding books E-book viewer: Allow viewing tables in a separate popup window by right clicking on the table and selecting 'View table'. Useful for reference books that have lots of large tables. Closes tickets: 1080710 Catalogs: Add the current library name as an available field when generating catalogs in csv/xml format. Closes tickets: 1078422 Enable colored text in the output from the command line tools on windows E-book viewer: Add an option to hide the help message when entering full screen mode E-book viewer: Add an option to always start the viewer in full screen mode E-book viewer: Add many more controls to the context menu, particularly useful in full screen mode E-book viewer: Allow easy searching of the selected word or phrase in google via the context menu Add a new type of FileType plugin, postimport, that runs after a book has been added to the database. Get Books: Remove Gandalf store, add Publio store. Update the Legimi store plugin for website changes Bug Fixes Conversion: Correctly handle values of left and right for the deprecated align attribute of images, mapping them to the CSS float property instead of to text-align. Closes tickets: 1081094 MOBI Output: When generating joint MOBI6/KF8 files do not set incorrect display CSS values for tables in the KF8 part Connect to iTunes: Ignore AAC audio files. Closes tickets: 1081096 E-book viewer: Fix restoring from fullscreen not respecting maximized window state Fix rows in the device books view sometimes being too high Catalogs: Fixed a problem occurring when merging comments with a custom field whose type is a list. Linux binary: Use exec in the wrapper shell scripts that are used to set env vars and launch calibre utilities. Closes tickets: 1077884 E-book viewer: Fix blank pages after every page when viewing some comic files in paged mode E-book viewer: When printing, respect the specified page range. Closes tickets: 1074220 Font subsetting: Parse the GSUB table for glyph substitution rules and do not remove any glyphs that could act as substitutes. Keep zero length glyphs like the glyphs for non printable characters when subsetting TrueType outlines. Smarten punctuation: Fix self closing script tags causing smarten punctuation to fail New news sources Various Czech and Hungarian news sources by bubak Various Polish recipes by Artur Stachecki Buchreport by a.peter Red Voltaire by atordo Autosport by Mr Stefan House News by Eddie Lau Improved news sources Arguments and facts Business Standard The New Yorker Release: 0.9.6 [10 Nov, 2012] New Features Experimental support for subsetting fonts Subsetting a font means reducing the font to contain only the glyphs for the text actually present in the book. This can easily halve the size of the font. calibre can now do this for all embedded fonts during a conversion. Turn it on via the 'Subset all embedded fonts' option under the Look & Feel section of the conversion dialog. calibre can subset both TrueType and OpenType fonts. Note that this code is very new and likely has bugs, so please check the output if you turn on subsetting. The conversion log will have info about the subsetting operations. EPUB Input: Try to workaround EPUBs that have missing or damaged ZIP central directories. calibre should now be able to read/convert such an EPUB file, provided it does not suffer from further corruption. Allow using identifiers in save to disk templates. Closes tickets: 1074623 calibredb: Add an option to not notify the GUI Catalogs: Fix long tags causing catalog generation to fail on windows. Add the ability to cross-reference authors, i.e. to relist the authors for a book with multiple authors separately. Closes tickets: 1074931 Edit metadata dialog: Add a clear tags button to remove all tags with a single click Add search to the font family chooser dialog Bug Fixes Windows: Fix a long standing bug in the device eject code that for some reason only manifested in 0.9.5. Closes tickets: 1075782 Get Books: Fix Amazon stores, Google Books store and libri.de Kobo driver: More fixes for on device book matching, and list books as being on device even if the Kobo has not yet indexed them. Also some performance improvements. Closes tickets: 1069617 EPUB Output: Remove duplicate id and name attributes to eliminate pointless noise from the various epub check utilities Ask for confirmation before removing plugins Fix bulk convert queueing dialog becoming very long if any of the books have a very long title. Closes tickets: 1076191 Fix deleting custom column tags like data from the Tag browser not updating the last modified timestamp for affected books Closes tickets: 1075476 When updating a previously broken plugin, do not show an error message because the previous version of the plugin cannot be loaded Fix regression that broke the Template Editor New news sources Various Polish news sources by Artur Stachecki Improved news sources Various updated Polish recipes London Review of Books Yemen Times Release: 0.9.5 [02 Nov, 2012] New Features Font embedding: Add support for the CSS 3 Fonts module, which means you can embed font families that have more that the usual four faces, with the full set of font-stretch and font-weight variations. Of course, whether the fonts actually show up on a reader will depend on the readers' support for CSS 3. Sharing by email: Allow specifying an 'alias' or friendly name by which to identify each email recipient. Closes tickets: 1069076 Embedding fonts: Allow adding ttf/otf font files to calibre directly to be used for embedding. That way the fonts do not have to be installed system wide. You can add a font to calibre via the 'Add fonts' button in the font chooser dialog for embedding fonts. E-book viewer: Add the ability to rotate images to the popup image viewer. Closes tickets: 1073513 Generate cover: Speedup searching the system for a font that can render special characters A new custom font scanner to locate all fonts on the system. Faster and less crash prone that fontconfig/freetype Font family chooser: Show the faces available for a family when clicking on the family Bug Fixes Get Books: Fix eHarlequin and Kobo stores. Closes tickets: 1072702 Kobo driver: Fix a bug that could cause the on device book matching to fail in certain circumstances. Closes tickets: 1072437 Kobo driver: When using a SD card do not delete shelves that contain on books on the card (there might be books in the shelf in the main memory). Closes tickets: 1073792 Workaround for bug in the windows API CreateHardLink function that breaks using calibre libraries on some networked filesystems. Template editor: Use dummy metadata instead of blank/unknown values Windows: abort setting of title/author if any of the books' files are in use. Results in less surprising behavior than before, when the title/author would be changed, but the on disk location would not. New news sources Pravda in english, italian and portuguese by Darko Miletic Delco Times by Krittika Goyal Improved news sources Financial Times UK Science AAAS The Atlantic Release: 0.9.4 [26 Oct, 2012] New Features Conversion: Add an option to embed a font family into the book. The embedded font is used as the base font for all text that does not specify its own font family in the input document. Works only with output formats that support font embedding, principally EPUB/AZW3. Option is found under Look & Feel in the conversion dialog. You can ensure that the font is used for all text, regardless of the input document's styles by filtering out font family styles via the Filter Style Information option in the Conversion dialog. When changing the title/author of a book, use hard links instead of copying the books' files, for a large speedup. Only works on filesystems that support hardlinks. Linux installer: Resume interrupted downloads and verify the SHA-512 signature of the downloaded file before installing it. Bug Fixes Windows: Check if any of the files of a book are in use before changing the title/author, this prevents the creation of duplicate files if one of the files is open in another program Kobo driver: Fix the ondevice status for some books getting lost. Closes tickets: 1069403 Catalogs: Fix regression that broke use of prefix rules. Closes tickets: 1070086 Tag Browser: Fix sorting incorrect for accented letters Closes tickets: 1069835 Make the bundled Liberation fonts available on all platforms for embedding Use mimetype for fonts from the EPUB 3 specification Get Books: Handle website change that broke the SONY Store plugin Generate cover: If the default font cannot render characters in the metadata (for example for east asian languages) try to automatically find a font on the system that is capable of rendering the characters Fix regression that broke certain types of CSS selectors. Closes tickets: 1068937 Use font-weight:bold instead of font-weight:bolder for the and tags as ADE cant handle bolder when embedded fonts are used New news sources Yazihane by A Erdogan Improved news sources New York Post PC World TIME Magazine Associated Press Release: 0.9.3 [19 Oct, 2012] New Features Conversion: Add support for CSS 3 selectors by switching to the new cssselect module Drivers for the WayteQ xBook and the Topwise Android tablet Closes tickets: 1066083, 1067105 Add an output profile for the Kindle PaperWhite Kobo driver: Improve performance when a large number of shelves are created on the device. Closes tickets: 1066633 Catalogs: Put catalog sections at top level of ToC for EPUB/AZW3 catalogs. Adding books: When duplicates are found, show the list of possible duplicates in calibre with title and author. Bug Fixes KF8 Input: Fix conversion/viewing of KF8 files generated with the unreleased? kindlegen 2.7. Closes tickets: 1067310 Kindle driver: Increase the size of the cover thumbnails sent by calibre to the device. This fixes the problem of cover thumbnails not showing up on the PaperWhite MTP driver: Fix sorting on the title column of the device view. Closes tickets: 1067562 Catalogs: Fix regression that caused authors and titles to be be incorrectly listed under symbols on OSX < 10.8. Catalogs: Fix error when generating catalog in non English locale and the user has specified a prefix rule using a Yes/no column. Closes tickets: 1065452 E-book viewer: Remove the reload entry from the context menu as it is not supported in paged mode. Closes tickets: 1065615 New news sources Various Polish news sources by fenuks Improved news sources Richmond Times Dispatch Various Polish news sources Aksiyon dergisi Spektrum der Wissenschaft Zeit Online Baltimore Sun LWN Weekly The Sun Release: 0.9.2 [11 Oct, 2012] New Features Wireless driver: Speed up deleting of multiple books E-book viewer: Add options to hide the scrollbar and show reading position in full screen mode. Closes tickets: 1047450 News download: Add a field to allow recipe authors to tell calibre to remove duplicate articles that a re present in more than one section from the download. Metadata download: Turn off the use of the published date for the earliest edition a book as the published date. The earliest edition was identified via worldcat.org, which has rather poor data, leading to the occasional incorrect result. If you want this feature back, you can turn it on again via Preferences->Metadata download. Bug Fixes ODT Input: More workarounds for the image positioning markup produced by newer versions of LibreOffice. Closes tickets: 1063207 Metadata download dialog: Fix selected cover being changed when covers are re-sorted after download completes MTP driver: Ignore errors when getting the driveinfo.calibre file from the device and simply regenerate it E-book viewer: Use the system locale settings to display the 24/12 hour clock in full screen mode Closes tickets: 1063209 Content Server: Make OPDS initial page respect the fields to display tweak Fix regression that caused calibre to not use OPF files when adding books recursively from directories with multiple books per directory KF8 Output: Fix handling of input documents that have URL unsafe characters in the file names of their images. Closes tickets: 1062477 Fix enumeration type custom column not being merged. Closes tickets: 1061602 New news sources PVP Online, Mobile Nations, The Verge and Television Without Pity by Krittika Goyal Improved news sources Pubblico Giornale Der Spiegel Shortlist FHM UK Countryfile Cosmo UK The Sun UK NME Release: 0.9.1 [05 Oct, 2012] New Features New driver for the Kobo Touch version 2.0+ firmware and Kobo Glo and Mini. See http://www.mobileread.com/forums/showthread.php?t=192863 for details Closes tickets: 1024983, 1059585 Driver for Motorola Defy XT Closes tickets: 1061903 Wireless driver: Always use automatic metadata management, regardless of the setting in Preferences->Devices Sending books by email: Allow sending to multiple email addresses at once separated by commas. Closes tickets: 1052332 KF8 Output: Add the css passed in through the extra css conversion option to the generated inline ToC. Closes tickets: 1052343 Windows: No longer use fontconfig to scan the system for available fonts. Instead use the Windows API. Should fix crashes/instability caused by fonts that fontconfig cannot handle When editing a blank (undefined) published date in the edit metadata dialog, have the calendar popup jump to the current date instead of the date 1-1-101 Closes tickets: 1058531 FB2 Input: Add support for th, code and strikethrough tags and also rowspan, colspan and align attributes. Closes tickets: 1059351, 1058591 Bug Fixes Get Books: Update Woblink Position the next selected book better after deleting multiple books from the library view Closes tickets: 1051135 Allow using the Enter key to select the cover in the metadata download dialog Closes tickets: 1060472 PDF Output: Handle embedded fonts better on linux HTML Input: Guess mimetype correctly for references to image files without file extensions. Closes tickets: 1059349 Catalog generation: Workaround for bug in the ICU library on older OS X systems that caused catalog generation to fail when certain non-ascii characters are present in the metadata. Closes tickets: 1057862 Wireless driver: Do not abort if BonJour registration fails, as we can still use broadcast to connect KF8 Output: Fix invalid output being generated for some files with very large blocks of contiguous non-ascii text New news sources IOL News and The New Age by Darko Miletic Improved news sources FC Knudde Stamgaten Foreign Policy Washington Post Twitch Films Nature News Release: 0.9.0 [28 Sep, 2012] New Features For a summary of the major changes in calibre between 0.8 and 0.9, see http://calibre-ebook.com/new-in/nine Bug Fixes KF8 Output: Fix handling of & < and > entities in the text. They were sometimes being incorrectly unescaped. Calibre portable: Add a manifest to the portable installer exe to prevent the application compatibility wizard from warning about a possible failed installation on windows 7. Also fixes installer requiring admin privileges on some computers Closes tickets: 1057042 EPUB metadata: Fix book producer not being set when updating EPUB metadata EPUB metadata: Fix incorrect namespace on the role attribute of tags when updating the metadata in EPUB Get Books: Fix incorrect price retrieval from ebooks.com. Closes tickets: 1055785 MTP windows driver: Fix main memory and storage card sometimes swapped Closes tickets: 1055129 PDF Output: On windows, remove any embedded fonts before generating the PDF as on windows, Qt generates image based PDFs when embedded fonts are present. Closes tickets: 1053906 MTP windows driver: Do not try to connect to unsuitable devices such as the iPhone. Closes tickets: 1054562 KF8 Input: Handle files that use non ascii paths/anchor names in the guide entries. Closes tickets: 1053751 New news sources Pubblico Giornale by iusvar Improved news sources Monitor Online El Pais Chronicle of Higher Education Baltimore Sun Mac World Maximum PC Financial Times UK Release: 0.8.70 [21 Sep, 2012] New Features Support for connecting MTP (non disk based) devices via USB, such as the Nexus 7 and the Kindle Fire HD (Windows Vista and newer and Linux only) calibre can now detect and connect to devices that do not present themselves as USB disks to the operating system. Newer Android devices all use the 'MTP' protocol when connected via USB. calibre now supports devices using this protocol on both Windows (Vista and newer) and Linux. Calibre Portable: Create a new installer that does not require manually unzipping the Calibre Portable folder. Instead just run the installer and point it to the location you want to install to. Calibre Portable: Add support for multiple libraries created inside the 'Calibre Portable' folder. In the main book list when editing a blank published date, use a default value of Jan 2000 so that changing the date it easier Template language: Add function approximate_formats() to get list of formats saved in the db for a book as opposed to the formats that actually exist on disk Template language: Add a couple of new functions to get the path to individual book formats and the calibre library as a whole Drivers for HTC Flyer and Trekstor 4ink Bug Fixes Conversion: Do not error out when tags have unparseable color attributes. Closes tickets: 1053583 AZW3 Output: Do not error out if the input document contains embedded fonts of less than 1040 bytes. Closes tickets: 1052892 Catalogs: Fix AZW3 output not properly indexed Get Books: Remove Beam Books due to lack of response to issues with the store. Windows: Ignore drives A: and B: when scanning for the drives belonging to a device Kindle driver: Fix generation of apnx files for newer kindle firmware. News download: If the output format is set to azw3, generate periodicals in mobi format as amazon does not support azw3 periodicals. New news sources Various Hungarian recipes by laca NSFW Corp by Darko Miletic. FC Knudde and Stamgasten by drMerry Improved news sources Indian Express Anadtech London Review of Books (subscrption version) Livemint xkcd Doghouse Diaries --- misc/calibre/Makefile | 6 +- misc/calibre/PLIST | 129 ++++++++++++++++-- misc/calibre/distinfo | 10 +- .../patches/patch-src_calibre_linux_py | 24 +++- 4 files changed, 141 insertions(+), 28 deletions(-) diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile index d6c9bbfb0163..720b8cafcc12 100644 --- a/misc/calibre/Makefile +++ b/misc/calibre/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2012/10/08 23:02:04 adam Exp $ +# $NetBSD: Makefile,v 1.47 2012/11/26 14:02:49 ryoon Exp $ # -DISTNAME= calibre-0.8.69 -PKGREVISION= 2 +DISTNAME= calibre-0.9.7 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} EXTRACT_SUFX= .tar.xz @@ -27,6 +26,7 @@ DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet +DEPENDS+= ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config pax diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST index d991396b185b..2e062cbf7703 100644 --- a/misc/calibre/PLIST +++ b/misc/calibre/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2012/09/19 15:38:26 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.15 2012/11/26 14:02:49 ryoon Exp $ bin/calibre bin/calibre-complete bin/calibre-customize @@ -96,6 +96,7 @@ lib/calibre/calibre/devices/misc.py lib/calibre/calibre/devices/mtp/__init__.py lib/calibre/calibre/devices/mtp/base.py lib/calibre/calibre/devices/mtp/books.py +lib/calibre/calibre/devices/mtp/defaults.py lib/calibre/calibre/devices/mtp/driver.py lib/calibre/calibre/devices/mtp/filesystem_cache.py lib/calibre/calibre/devices/mtp/test.py @@ -191,7 +192,6 @@ lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py lib/calibre/calibre/ebooks/conversion/plumber.py lib/calibre/calibre/ebooks/conversion/preprocess.py lib/calibre/calibre/ebooks/conversion/utils.py -lib/calibre/calibre/ebooks/cssselect.py lib/calibre/calibre/ebooks/djvu/__init__.py lib/calibre/calibre/ebooks/djvu/djvu.py lib/calibre/calibre/ebooks/djvu/djvubzzdec.py @@ -361,6 +361,7 @@ lib/calibre/calibre/ebooks/oeb/display/webview.py lib/calibre/calibre/ebooks/oeb/iterator/__init__.py lib/calibre/calibre/ebooks/oeb/iterator/book.py lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py +lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py lib/calibre/calibre/ebooks/oeb/iterator/spine.py lib/calibre/calibre/ebooks/oeb/parse_utils.py lib/calibre/calibre/ebooks/oeb/reader.py @@ -380,6 +381,7 @@ lib/calibre/calibre/ebooks/oeb/transforms/rasterize.py lib/calibre/calibre/ebooks/oeb/transforms/rescale.py lib/calibre/calibre/ebooks/oeb/transforms/split.py lib/calibre/calibre/ebooks/oeb/transforms/structure.py +lib/calibre/calibre/ebooks/oeb/transforms/subset.py lib/calibre/calibre/ebooks/oeb/transforms/trimmanifest.py lib/calibre/calibre/ebooks/oeb/transforms/unsmarten.py lib/calibre/calibre/ebooks/oeb/writer.py @@ -587,7 +589,6 @@ lib/calibre/calibre/gui2/convert/mobi_output.py lib/calibre/calibre/gui2/convert/mobi_output_ui.py lib/calibre/calibre/gui2/convert/page_setup.py lib/calibre/calibre/gui2/convert/page_setup_ui.py -lib/calibre/calibre/gui2/convert/pdb_input_ui.py lib/calibre/calibre/gui2/convert/pdb_output.py lib/calibre/calibre/gui2/convert/pdb_output_ui.py lib/calibre/calibre/gui2/convert/pdf_input.py @@ -701,6 +702,7 @@ lib/calibre/calibre/gui2/duplicates.py lib/calibre/calibre/gui2/ebook_download.py lib/calibre/calibre/gui2/email.py lib/calibre/calibre/gui2/filename_pattern_ui.py +lib/calibre/calibre/gui2/font_family_chooser.py lib/calibre/calibre/gui2/init.py lib/calibre/calibre/gui2/jobs.py lib/calibre/calibre/gui2/keyboard.py @@ -738,12 +740,12 @@ lib/calibre/calibre/gui2/preferences/conversion.py lib/calibre/calibre/gui2/preferences/conversion_ui.py lib/calibre/calibre/gui2/preferences/create_custom_column.py lib/calibre/calibre/gui2/preferences/create_custom_column_ui.py -lib/calibre/calibre/gui2/preferences/custom_columns_ui.py lib/calibre/calibre/gui2/preferences/device_debug.py lib/calibre/calibre/gui2/preferences/device_user_defined.py lib/calibre/calibre/gui2/preferences/email_ui.py lib/calibre/calibre/gui2/preferences/emailp.py lib/calibre/calibre/gui2/preferences/history.py +lib/calibre/calibre/gui2/preferences/ignored_devices.py lib/calibre/calibre/gui2/preferences/keyboard.py lib/calibre/calibre/gui2/preferences/look_feel.py lib/calibre/calibre/gui2/preferences/look_feel_ui.py @@ -793,9 +795,7 @@ lib/calibre/calibre/gui2/store/config/chooser/results_view.py lib/calibre/calibre/gui2/store/config/search/__init__.py lib/calibre/calibre/gui2/store/config/search/search_widget.py lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py -lib/calibre/calibre/gui2/store/config/search_widget_ui.py lib/calibre/calibre/gui2/store/config/store.py -lib/calibre/calibre/gui2/store/mobileread_store_dialog_ui.py lib/calibre/calibre/gui2/store/opensearch_store.py lib/calibre/calibre/gui2/store/search/__init__.py lib/calibre/calibre/gui2/store/search/adv_search_builder.py @@ -806,7 +806,6 @@ lib/calibre/calibre/gui2/store/search/results_view.py lib/calibre/calibre/gui2/store/search/search.py lib/calibre/calibre/gui2/store/search/search_ui.py lib/calibre/calibre/gui2/store/search_result.py -lib/calibre/calibre/gui2/store/search_ui.py lib/calibre/calibre/gui2/store/stores/__init__.py lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py @@ -816,7 +815,6 @@ lib/calibre/calibre/gui2/store/stores/amazon_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py -lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py lib/calibre/calibre/gui2/store/stores/bewrite_plugin.py lib/calibre/calibre/gui2/store/stores/biblio_plugin.py lib/calibre/calibre/gui2/store/stores/bn_plugin.py @@ -830,10 +828,10 @@ lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py +lib/calibre/calibre/gui2/store/stores/empik_plugin.py lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py -lib/calibre/calibre/gui2/store/stores/gandalf_plugin.py lib/calibre/calibre/gui2/store/stores/google_books_plugin.py lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py lib/calibre/calibre/gui2/store/stores/kobo_plugin.py @@ -856,6 +854,7 @@ lib/calibre/calibre/gui2/store/stores/nexto_plugin.py lib/calibre/calibre/gui2/store/stores/open_books_plugin.py lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py +lib/calibre/calibre/gui2/store/stores/publio_plugin.py lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py lib/calibre/calibre/gui2/store/stores/sony_plugin.py @@ -893,6 +892,7 @@ lib/calibre/calibre/gui2/viewer/main.py lib/calibre/calibre/gui2/viewer/main_ui.py lib/calibre/calibre/gui2/viewer/position.py lib/calibre/calibre/gui2/viewer/printing.py +lib/calibre/calibre/gui2/viewer/table_popup.py lib/calibre/calibre/gui2/viewer/toc.py lib/calibre/calibre/gui2/widgets.py lib/calibre/calibre/gui2/wizard/__init__.py @@ -946,7 +946,7 @@ lib/calibre/calibre/plugins/cPalmdoc.so lib/calibre/calibre/plugins/calibre_style.so lib/calibre/calibre/plugins/chm_extra.so lib/calibre/calibre/plugins/chmlib.so -lib/calibre/calibre/plugins/fontconfig.so +lib/calibre/calibre/plugins/freetype.so lib/calibre/calibre/plugins/icu.so lib/calibre/calibre/plugins/lzx.so lib/calibre/calibre/plugins/magick.so @@ -956,6 +956,7 @@ lib/calibre/calibre/plugins/podofo.so lib/calibre/calibre/plugins/progress_indicator.so lib/calibre/calibre/plugins/speedup.so lib/calibre/calibre/plugins/sqlite_custom.so +lib/calibre/calibre/plugins/woff.so lib/calibre/calibre/ptempfile.py lib/calibre/calibre/startup.py lib/calibre/calibre/test_build.py @@ -979,6 +980,29 @@ lib/calibre/calibre/utils/date.py lib/calibre/calibre/utils/dictclient.py lib/calibre/calibre/utils/filenames.py lib/calibre/calibre/utils/fonts/__init__.py +lib/calibre/calibre/utils/fonts/free_type.py +lib/calibre/calibre/utils/fonts/metadata.py +lib/calibre/calibre/utils/fonts/scanner.py +lib/calibre/calibre/utils/fonts/sfnt/__init__.py +lib/calibre/calibre/utils/fonts/sfnt/cff/__init__.py +lib/calibre/calibre/utils/fonts/sfnt/cff/constants.py +lib/calibre/calibre/utils/fonts/sfnt/cff/dict_data.py +lib/calibre/calibre/utils/fonts/sfnt/cff/table.py +lib/calibre/calibre/utils/fonts/sfnt/cff/writer.py +lib/calibre/calibre/utils/fonts/sfnt/cmap.py +lib/calibre/calibre/utils/fonts/sfnt/common.py +lib/calibre/calibre/utils/fonts/sfnt/container.py +lib/calibre/calibre/utils/fonts/sfnt/errors.py +lib/calibre/calibre/utils/fonts/sfnt/glyf.py +lib/calibre/calibre/utils/fonts/sfnt/gsub.py +lib/calibre/calibre/utils/fonts/sfnt/head.py +lib/calibre/calibre/utils/fonts/sfnt/kern.py +lib/calibre/calibre/utils/fonts/sfnt/loca.py +lib/calibre/calibre/utils/fonts/sfnt/maxp.py +lib/calibre/calibre/utils/fonts/sfnt/subset.py +lib/calibre/calibre/utils/fonts/utils.py +lib/calibre/calibre/utils/fonts/win_fonts.py +lib/calibre/calibre/utils/fonts/woff/__init__.py lib/calibre/calibre/utils/formatter.py lib/calibre/calibre/utils/formatter_functions.py lib/calibre/calibre/utils/html2text.py @@ -994,6 +1018,7 @@ lib/calibre/calibre/utils/ipc/worker.py lib/calibre/calibre/utils/ipython.py lib/calibre/calibre/utils/linux_trash.py lib/calibre/calibre/utils/localization.py +lib/calibre/calibre/utils/localunzip.py lib/calibre/calibre/utils/lock.py lib/calibre/calibre/utils/logging.py lib/calibre/calibre/utils/magick/__init__.py @@ -1030,7 +1055,7 @@ lib/calibre/calibre/utils/smartypants.py lib/calibre/calibre/utils/smtp.py lib/calibre/calibre/utils/smtplib.py lib/calibre/calibre/utils/soupparser.py -lib/calibre/calibre/utils/terminfo.py +lib/calibre/calibre/utils/terminal.py lib/calibre/calibre/utils/text2int.py lib/calibre/calibre/utils/threadpool.py lib/calibre/calibre/utils/titlecase.py @@ -1205,12 +1230,12 @@ share/calibre/images/default_cover.png share/calibre/images/devices/bambook.png share/calibre/images/devices/boox.jpg share/calibre/images/devices/folder.png -share/calibre/images/devices/galaxy_s3.png share/calibre/images/devices/ipad.png share/calibre/images/devices/italica.png share/calibre/images/devices/itunes.png share/calibre/images/devices/kindle.jpg share/calibre/images/devices/nook.jpg +share/calibre/images/devices/tablet.png share/calibre/images/dialog_error.png share/calibre/images/dialog_information.png share/calibre/images/dialog_question.png @@ -1234,6 +1259,7 @@ share/calibre/images/edit-undo.png share/calibre/images/edit_input.png share/calibre/images/eject.png share/calibre/images/exec.png +share/calibre/images/font.png share/calibre/images/font_size_larger.png share/calibre/images/font_size_smaller.png share/calibre/images/format-fill-color.png @@ -1272,6 +1298,8 @@ share/calibre/images/lt.png share/calibre/images/mail.png share/calibre/images/merge_books.png share/calibre/images/metadata.png +share/calibre/images/mimetypes/azw2.png +share/calibre/images/mimetypes/azw3.png share/calibre/images/mimetypes/bmp.png share/calibre/images/mimetypes/computer.png share/calibre/images/mimetypes/dir.png @@ -1293,6 +1321,7 @@ share/calibre/images/mimetypes/rar.png share/calibre/images/mimetypes/rtf.png share/calibre/images/mimetypes/snb.png share/calibre/images/mimetypes/svg.png +share/calibre/images/mimetypes/tpz.png share/calibre/images/mimetypes/txt.png share/calibre/images/mimetypes/unknown.png share/calibre/images/mimetypes/xps.png @@ -1330,6 +1359,7 @@ share/calibre/images/publisher.png share/calibre/images/random.png share/calibre/images/rating.png share/calibre/images/reader.png +share/calibre/images/rotate-right.png share/calibre/images/save.png share/calibre/images/scheduler.png share/calibre/images/scroll.png @@ -1348,6 +1378,7 @@ share/calibre/images/template_funcs.png share/calibre/images/trash.png share/calibre/images/trim.png share/calibre/images/user_profile.png +share/calibre/images/view-image.png share/calibre/images/view.png share/calibre/images/viewer.png share/calibre/images/welcome_wizard.png @@ -1398,6 +1429,7 @@ share/calibre/recipes/ajiajin.recipe share/calibre/recipes/aksiyon_derigisi.recipe share/calibre/recipes/akter.recipe share/calibre/recipes/akter_dnevnik.recipe +share/calibre/recipes/aktualne.cz.recipe share/calibre/recipes/al_ahram.recipe share/calibre/recipes/al_jazeera.recipe share/calibre/recipes/al_masry_al_youm.recipe @@ -1414,6 +1446,7 @@ share/calibre/recipes/anandtech.recipe share/calibre/recipes/anchorage_daily.recipe share/calibre/recipes/android_com_pl.recipe share/calibre/recipes/animal_politico.recipe +share/calibre/recipes/antyweb.recipe share/calibre/recipes/ap.recipe share/calibre/recipes/apcom.recipe share/calibre/recipes/apod.recipe @@ -1440,6 +1473,7 @@ share/calibre/recipes/auto_blog.recipe share/calibre/recipes/auto_prove.recipe share/calibre/recipes/autobild.recipe share/calibre/recipes/automatiseringgids.recipe +share/calibre/recipes/autosport.recipe share/calibre/recipes/avantaje.recipe share/calibre/recipes/aventurilapescuit.recipe share/calibre/recipes/avto-magazin.recipe @@ -1455,6 +1489,7 @@ share/calibre/recipes/baltimore_sun.recipe share/calibre/recipes/banat_news.recipe share/calibre/recipes/bangkok_biz.recipe share/calibre/recipes/bangkokpost.recipe +share/calibre/recipes/bankier_pl.recipe share/calibre/recipes/barrons.recipe share/calibre/recipes/bash_org_pl.recipe share/calibre/recipes/bay_citizen.recipe @@ -1486,8 +1521,10 @@ share/calibre/recipes/birgun_gazetesi.recipe share/calibre/recipes/birmingham_post.recipe share/calibre/recipes/bitacora.recipe share/calibre/recipes/biz_portal.recipe +share/calibre/recipes/blesk.recipe share/calibre/recipes/blic.recipe share/calibre/recipes/blog_da_cidadania.recipe +share/calibre/recipes/blognexto.recipe share/calibre/recipes/blues.recipe share/calibre/recipes/boortz.recipe share/calibre/recipes/borse_online.recipe @@ -1495,8 +1532,10 @@ share/calibre/recipes/boston.com.recipe share/calibre/recipes/brand_eins.recipe share/calibre/recipes/brasil_de_fato.recipe share/calibre/recipes/brecha.recipe +share/calibre/recipes/brewiarz.recipe share/calibre/recipes/brigitte_de.recipe share/calibre/recipes/bucataras.recipe +share/calibre/recipes/buchreport.recipe share/calibre/recipes/buckmasters.recipe share/calibre/recipes/buenosaireseconomico.recipe share/calibre/recipes/buffalo_news.recipe @@ -1504,7 +1543,6 @@ share/calibre/recipes/bugun_gazetesi.recipe share/calibre/recipes/business_insider.recipe share/calibre/recipes/business_spectator.recipe share/calibre/recipes/business_standard.recipe -share/calibre/recipes/business_week.recipe share/calibre/recipes/businessworldin.recipe share/calibre/recipes/bwmagazine.recipe share/calibre/recipes/bwmagazine2.recipe @@ -1530,6 +1568,9 @@ share/calibre/recipes/cato.recipe share/calibre/recipes/cbc_canada.recipe share/calibre/recipes/cbn.recipe share/calibre/recipes/cd_action.recipe +share/calibre/recipes/ceska_pozice.recipe +share/calibre/recipes/ceske_noviny.recipe +share/calibre/recipes/cesky_rozhlas_6.recipe share/calibre/recipes/cetnixploitation.recipe share/calibre/recipes/cgm_pl.recipe share/calibre/recipes/chicago_breaking_news.recipe @@ -1621,8 +1662,12 @@ share/calibre/recipes/deadspin.recipe share/calibre/recipes/defensenews.recipe share/calibre/recipes/degentenaar.recipe share/calibre/recipes/deia.recipe +share/calibre/recipes/delco_times.recipe +share/calibre/recipes/demagog.cz.recipe share/calibre/recipes/demorgen_be.recipe share/calibre/recipes/den_of_geek.recipe +share/calibre/recipes/denik.cz.recipe +share/calibre/recipes/denik_referendum.recipe share/calibre/recipes/denver_post.recipe share/calibre/recipes/der_spiegel.recipe share/calibre/recipes/der_standard.recipe @@ -1664,6 +1709,7 @@ share/calibre/recipes/dnevnik.recipe share/calibre/recipes/dnevnik_cro.recipe share/calibre/recipes/dnevnik_mk.recipe share/calibre/recipes/dobreprogamy.recipe +share/calibre/recipes/doghousediaries.recipe share/calibre/recipes/dominion.recipe share/calibre/recipes/dosisdiarias.recipe share/calibre/recipes/dot_net.recipe @@ -1757,12 +1803,14 @@ share/calibre/recipes/exiled.recipe share/calibre/recipes/expansion_spanish.recipe share/calibre/recipes/explosm.recipe share/calibre/recipes/express_de.recipe +share/calibre/recipes/f1_ultra.recipe share/calibre/recipes/f_secure.recipe share/calibre/recipes/factcheck.recipe share/calibre/recipes/fairbanks_daily.recipe share/calibre/recipes/fan_graphs.recipe share/calibre/recipes/fastcompany.recipe share/calibre/recipes/faznet.recipe +share/calibre/recipes/fc_knudde.recipe share/calibre/recipes/fe_india.recipe share/calibre/recipes/felicia.recipe share/calibre/recipes/fhm_uk.recipe @@ -1789,6 +1837,7 @@ share/calibre/recipes/forbes_india.recipe share/calibre/recipes/foreign_policy.recipe share/calibre/recipes/foreignaffairs.recipe share/calibre/recipes/formulaas.recipe +share/calibre/recipes/forsal.recipe share/calibre/recipes/fotoblogia_pl.recipe share/calibre/recipes/foxnews.recipe share/calibre/recipes/fr_online.recipe @@ -1813,7 +1862,9 @@ share/calibre/recipes/gamespot.recipe share/calibre/recipes/gandul.recipe share/calibre/recipes/gawker.recipe share/calibre/recipes/gazeta-prawna-calibre-v1.recipe +share/calibre/recipes/gazeta_pl_krakow.recipe share/calibre/recipes/gazeta_pl_szczecin.recipe +share/calibre/recipes/gazeta_pl_warszawa.recipe share/calibre/recipes/gazeta_pomorska.recipe share/calibre/recipes/gazeta_wyborcza.recipe share/calibre/recipes/geek_poke.recipe @@ -1899,6 +1950,7 @@ share/calibre/recipes/homopedia_pl.recipe share/calibre/recipes/hotair.recipe share/calibre/recipes/hotcity.recipe share/calibre/recipes/hotnews.recipe +share/calibre/recipes/house_news.recipe share/calibre/recipes/houston_chronicle.recipe share/calibre/recipes/howtogeek.recipe share/calibre/recipes/hoy.recipe @@ -1916,6 +1968,7 @@ share/calibre/recipes/idnes.recipe share/calibre/recipes/ieco.recipe share/calibre/recipes/ieeespectrum.recipe share/calibre/recipes/ifzm.recipe +share/calibre/recipes/ihned.cz.recipe share/calibre/recipes/ihned.recipe share/calibre/recipes/iht.recipe share/calibre/recipes/iktibas.recipe @@ -1942,12 +1995,14 @@ share/calibre/recipes/information_dk.recipe share/calibre/recipes/infoworld.recipe share/calibre/recipes/infra_pl.recipe share/calibre/recipes/inquirer_net.recipe +share/calibre/recipes/insider.recipe share/calibre/recipes/instapaper.recipe share/calibre/recipes/intelligencer.recipe share/calibre/recipes/interia_fakty.recipe share/calibre/recipes/interia_sport.recipe share/calibre/recipes/intrefete.recipe share/calibre/recipes/io9.recipe +share/calibre/recipes/iol_za.recipe share/calibre/recipes/ionline_pt.recipe share/calibre/recipes/iprofesional.recipe share/calibre/recipes/irish_independent.recipe @@ -1988,6 +2043,7 @@ share/calibre/recipes/kath_net.recipe share/calibre/recipes/kathemerini.recipe share/calibre/recipes/kellog_faculty.recipe share/calibre/recipes/kellog_insight.recipe +share/calibre/recipes/kerrang.recipe share/calibre/recipes/kidney.recipe share/calibre/recipes/kitsapun.recipe share/calibre/recipes/kleinezeitung.recipe @@ -2010,6 +2066,7 @@ share/calibre/recipes/krstarica_en.recipe share/calibre/recipes/ksiazka_pl.recipe share/calibre/recipes/kstar.recipe share/calibre/recipes/kudika.recipe +share/calibre/recipes/kudy_z_nudy.recipe share/calibre/recipes/kukuburi.recipe share/calibre/recipes/kurier.recipe share/calibre/recipes/l_espresso.recipe @@ -2055,6 +2112,7 @@ share/calibre/recipes/leipzer_volkszeitung.recipe share/calibre/recipes/lemonde_dip.recipe share/calibre/recipes/lenta_ru.recipe share/calibre/recipes/lepoint.recipe +share/calibre/recipes/lequipe.recipe share/calibre/recipes/lescienze.recipe share/calibre/recipes/lesoir_be.recipe share/calibre/recipes/letsgetcritical.recipe @@ -2065,6 +2123,7 @@ share/calibre/recipes/liberation_sub.recipe share/calibre/recipes/liberatorio_politico.recipe share/calibre/recipes/libero.recipe share/calibre/recipes/liberty_times.recipe +share/calibre/recipes/lidovky.recipe share/calibre/recipes/lifehacker.recipe share/calibre/recipes/limes.recipe share/calibre/recipes/linux_journal.recipe @@ -2102,6 +2161,7 @@ share/calibre/recipes/marctv.recipe share/calibre/recipes/marine_corps_times.recipe share/calibre/recipes/marketing_magazine.recipe share/calibre/recipes/marketing_sensoriale.recipe +share/calibre/recipes/mateusz_czytania.recipe share/calibre/recipes/matichon.recipe share/calibre/recipes/max_planck.recipe share/calibre/recipes/maximum_pc.recipe @@ -2120,6 +2180,7 @@ share/calibre/recipes/mesec.recipe share/calibre/recipes/metro_montreal.recipe share/calibre/recipes/metro_news_nl.recipe share/calibre/recipes/metro_uk.recipe +share/calibre/recipes/metropol_tv.recipe share/calibre/recipes/miami_herald.recipe share/calibre/recipes/michalkiewicz.recipe share/calibre/recipes/michellemalkin.recipe @@ -2133,6 +2194,7 @@ share/calibre/recipes/ming_pao_vancouver.recipe share/calibre/recipes/miradasalsur.recipe share/calibre/recipes/mlody_technik_pl.recipe share/calibre/recipes/mmc_rtv.recipe +share/calibre/recipes/mobilenations.recipe share/calibre/recipes/modoros.recipe share/calibre/recipes/moldovaazi.recipe share/calibre/recipes/monbiot.recipe @@ -2152,11 +2214,14 @@ share/calibre/recipes/msnbc.recipe share/calibre/recipes/msnsankei.recipe share/calibre/recipes/mumbai_mirror.recipe share/calibre/recipes/mwjournal.recipe +share/calibre/recipes/myapple_pl.recipe share/calibre/recipes/nachdenkseiten.recipe share/calibre/recipes/nacional_cro.recipe share/calibre/recipes/nacionred.recipe +share/calibre/recipes/nadacni_fond_proti_korupci.recipe share/calibre/recipes/nakedcapitalism.recipe share/calibre/recipes/nasa.recipe +share/calibre/recipes/naszdziennik.recipe share/calibre/recipes/natemat_pl.recipe share/calibre/recipes/natgeo.recipe share/calibre/recipes/nation_ke.recipe @@ -2175,7 +2240,9 @@ share/calibre/recipes/nbonline.recipe share/calibre/recipes/ncrnext.recipe share/calibre/recipes/nejm.recipe share/calibre/recipes/neowin.recipe +share/calibre/recipes/nepszabadsag.recipe share/calibre/recipes/netzpolitik.recipe +share/calibre/recipes/neviditelny_pes.recipe share/calibre/recipes/new_london_day.recipe share/calibre/recipes/new_scientist.recipe share/calibre/recipes/new_statesman.recipe @@ -2218,16 +2285,20 @@ share/calibre/recipes/novilist_novine_hr.recipe share/calibre/recipes/novilist_portal_hr.recipe share/calibre/recipes/novinite.recipe share/calibre/recipes/novinite_bg.recipe +share/calibre/recipes/novinky.cz.recipe share/calibre/recipes/novinky.recipe share/calibre/recipes/novistandard.recipe share/calibre/recipes/novosti.recipe share/calibre/recipes/now_toronto.recipe share/calibre/recipes/nowa_fantastyka.recipe +share/calibre/recipes/nowy_ekran.recipe +share/calibre/recipes/noz.recipe share/calibre/recipes/npr.recipe share/calibre/recipes/npr_music_blogs.recipe share/calibre/recipes/nrc-nl-epub.recipe share/calibre/recipes/nrc.nl.recipe share/calibre/recipes/nrc_handelsblad.recipe +share/calibre/recipes/nsfw_corp.recipe share/calibre/recipes/nspm.recipe share/calibre/recipes/nspm_int.recipe share/calibre/recipes/ntv_spor.recipe @@ -2265,6 +2336,7 @@ share/calibre/recipes/opinion_bo.recipe share/calibre/recipes/oregonian.recipe share/calibre/recipes/oreilly_premium.recipe share/calibre/recipes/oriental_daily.recipe +share/calibre/recipes/origo_hu.recipe share/calibre/recipes/orlando_sentinel.recipe share/calibre/recipes/orsai.recipe share/calibre/recipes/osnews_pl.recipe @@ -2279,6 +2351,7 @@ share/calibre/recipes/palmtop_pl.recipe share/calibre/recipes/pambianco.recipe share/calibre/recipes/panorama.recipe share/calibre/recipes/paperli_topic.recipe +share/calibre/recipes/parlamentni_listy.recipe share/calibre/recipes/patente_de_corso.recipe share/calibre/recipes/pc_advisor.recipe share/calibre/recipes/pc_arena.recipe @@ -2305,6 +2378,8 @@ share/calibre/recipes/phoronix.recipe share/calibre/recipes/physics_today.recipe share/calibre/recipes/physics_world.recipe share/calibre/recipes/pilot.recipe +share/calibre/recipes/piratska_strana.recipe +share/calibre/recipes/piratske_noviny.recipe share/calibre/recipes/planet_kde.recipe share/calibre/recipes/plus_info.recipe share/calibre/recipes/pobjeda.recipe @@ -2319,10 +2394,18 @@ share/calibre/recipes/polska_times.recipe share/calibre/recipes/popscience.recipe share/calibre/recipes/portafolio.recipe share/calibre/recipes/portfolio.recipe +share/calibre/recipes/portfolio_hu.recipe +share/calibre/recipes/portfolio_hu_hu.recipe share/calibre/recipes/post_today.recipe share/calibre/recipes/poughkeepsie_journal.recipe share/calibre/recipes/praguemonitor.recipe share/calibre/recipes/pravda.recipe +share/calibre/recipes/pravda_en.recipe +share/calibre/recipes/pravda_it.recipe +share/calibre/recipes/pravda_por.recipe +share/calibre/recipes/pravda_ru.recipe +share/calibre/recipes/pravo.recipe +share/calibre/recipes/prawica_net.recipe share/calibre/recipes/pressonline.recipe share/calibre/recipes/pressthink.recipe share/calibre/recipes/pro_linux_de.recipe @@ -2337,10 +2420,13 @@ share/calibre/recipes/protagon.recipe share/calibre/recipes/protvmagazin.recipe share/calibre/recipes/psych.recipe share/calibre/recipes/psychologies.recipe +share/calibre/recipes/pubblico_giornale.recipe share/calibre/recipes/publico.recipe share/calibre/recipes/publika.recipe +share/calibre/recipes/puls_biznesu.recipe share/calibre/recipes/punto_informatico.recipe share/calibre/recipes/pure_pc.recipe +share/calibre/recipes/pvp_online.recipe share/calibre/recipes/queleer.recipe share/calibre/recipes/quotidiano.recipe share/calibre/recipes/rabble_ca.recipe @@ -2357,11 +2443,13 @@ share/calibre/recipes/real_world_economics_review.recipe share/calibre/recipes/realitatea.recipe share/calibre/recipes/rebelion.recipe share/calibre/recipes/red_aragon.recipe +share/calibre/recipes/red_voltaire.recipe share/calibre/recipes/regina_leader_post.recipe share/calibre/recipes/replicavedetelor.recipe share/calibre/recipes/reptantes.recipe share/calibre/recipes/republica.recipe share/calibre/recipes/republika.recipe +share/calibre/recipes/respekt.recipe share/calibre/recipes/resurgence.recipe share/calibre/recipes/reuters.recipe share/calibre/recipes/reuters_ja.recipe @@ -2390,7 +2478,11 @@ share/calibre/recipes/rte.recipe share/calibre/recipes/rtnews.recipe share/calibre/recipes/rts.recipe share/calibre/recipes/rue89.recipe +share/calibre/recipes/rushisaband.recipe share/calibre/recipes/rusiahoy.recipe +share/calibre/recipes/rybinski.recipe +share/calibre/recipes/rynek_infrastruktury.recipe +share/calibre/recipes/rynek_kolejowy.recipe share/calibre/recipes/rynek_zdrowia.recipe share/calibre/recipes/rzeczpospolita.recipe share/calibre/recipes/sabah.recipe @@ -2403,6 +2495,7 @@ share/calibre/recipes/sanjosemercurynews.recipe share/calibre/recipes/sarajevo_x.recipe share/calibre/recipes/saskatoon_star_phoenix.recipe share/calibre/recipes/satira.recipe +share/calibre/recipes/satkurier.recipe share/calibre/recipes/satmagazine.recipe share/calibre/recipes/sb_nation.recipe share/calibre/recipes/science_aas.recipe @@ -2462,6 +2555,7 @@ share/calibre/recipes/sportsillustrated_columnists.recipe share/calibre/recipes/st_louis_post_dispatch.recipe share/calibre/recipes/st_petersburg_times.recipe share/calibre/recipes/stackoverflow.recipe +share/calibre/recipes/stamgasten.recipe share/calibre/recipes/standardmedia_ke.recipe share/calibre/recipes/standardmoney.recipe share/calibre/recipes/star_gazetesi.recipe @@ -2471,6 +2565,7 @@ share/calibre/recipes/starwars.recipe share/calibre/recipes/statesman.recipe share/calibre/recipes/stiintasitehnica.recipe share/calibre/recipes/stnn.recipe +share/calibre/recipes/stopklatka.recipe share/calibre/recipes/straitstimes.recipe share/calibre/recipes/strange_horizons.recipe share/calibre/recipes/strategic_culture.recipe @@ -2509,7 +2604,9 @@ share/calibre/recipes/telegraph_in.recipe share/calibre/recipes/telegraph_uk.recipe share/calibre/recipes/telepolis.recipe share/calibre/recipes/telepolis_artikel.recipe +share/calibre/recipes/telepolis_pl.recipe share/calibre/recipes/teleread.recipe +share/calibre/recipes/television_without_pity.recipe share/calibre/recipes/thai_post_daily.recipe share/calibre/recipes/thairath.recipe share/calibre/recipes/the_age.recipe @@ -2525,6 +2622,7 @@ share/calibre/recipes/the_manila_times.recipe share/calibre/recipes/the_marker.recipe share/calibre/recipes/the_nation.recipe share/calibre/recipes/the_nation_thai.recipe +share/calibre/recipes/the_new_age_za.recipe share/calibre/recipes/the_new_republic.recipe share/calibre/recipes/the_oz.recipe share/calibre/recipes/the_philippine_daily_inquirer.recipe @@ -2532,6 +2630,7 @@ share/calibre/recipes/the_philippine_star.recipe share/calibre/recipes/the_register.recipe share/calibre/recipes/the_scotsman.recipe share/calibre/recipes/the_sun.recipe +share/calibre/recipes/the_verge.recipe share/calibre/recipes/the_week_magazine_free.recipe share/calibre/recipes/the_workingham_times.recipe share/calibre/recipes/thecultofghoul.recipe @@ -2584,6 +2683,7 @@ share/calibre/recipes/tweakers.recipe share/calibre/recipes/tweakers_net.recipe share/calibre/recipes/twitchfilms.recipe share/calibre/recipes/twtfb.recipe +share/calibre/recipes/tyden.cz.recipe share/calibre/recipes/tyzden.recipe share/calibre/recipes/ubuntu_pl.recipe share/calibre/recipes/ultimahora.recipe @@ -2627,7 +2727,6 @@ share/calibre/recipes/warentest.recipe share/calibre/recipes/wash_post.recipe share/calibre/recipes/wash_times.recipe share/calibre/recipes/watchingamerica.recipe -share/calibre/recipes/webhosting_pl.recipe share/calibre/recipes/weblogs_sl.recipe share/calibre/recipes/welt.recipe share/calibre/recipes/welt_der_physik.recipe @@ -2657,9 +2756,11 @@ share/calibre/recipes/wsj_free.recipe share/calibre/recipes/wvhooligan.recipe share/calibre/recipes/wyborcza_duzy_format.recipe share/calibre/recipes/xkcd.recipe +share/calibre/recipes/xpatloop.recipe share/calibre/recipes/yagmur_dergisi.recipe share/calibre/recipes/yahoo_news.recipe share/calibre/recipes/yakima_herald.recipe +share/calibre/recipes/yazihane.recipe share/calibre/recipes/yementimes.recipe share/calibre/recipes/yeni_umit_dergisi.recipe share/calibre/recipes/yenisafak_gazetesi.recipe diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo index fd688b1be397..c9223db0a3c3 100644 --- a/misc/calibre/distinfo +++ b/misc/calibre/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2012/09/19 15:38:26 ryoon Exp $ +$NetBSD: distinfo,v 1.14 2012/11/26 14:02:50 ryoon Exp $ -SHA1 (calibre-0.8.69.tar.xz) = 41df9e330d8fd29154bc74480e0251cc9cfcfeed -RMD160 (calibre-0.8.69.tar.xz) = 203e55f9c458ac5500baf800cb03fd8861e1fdbf -Size (calibre-0.8.69.tar.xz) = 26886920 bytes +SHA1 (calibre-0.9.7.tar.xz) = cdc09d54924b4108e8137685082893e628dd7e40 +RMD160 (calibre-0.9.7.tar.xz) = 44480946e6bec7b05b3aa10c5189a4e14225255a +Size (calibre-0.9.7.tar.xz) = 27408848 bytes SHA1 (patch-setup_extensions.py) = aa8ee237a80b4da8dea03af950a7ac4caed9e51a -SHA1 (patch-src_calibre_linux_py) = 267d01d4ba671299d88b9b3b9d2f98beb95c527e +SHA1 (patch-src_calibre_linux_py) = 6780e90eff604c66ef3213d638cf917d34f3c1fd diff --git a/misc/calibre/patches/patch-src_calibre_linux_py b/misc/calibre/patches/patch-src_calibre_linux_py index ad11fe9128ec..a58047bfc447 100644 --- a/misc/calibre/patches/patch-src_calibre_linux_py +++ b/misc/calibre/patches/patch-src_calibre_linux_py @@ -1,9 +1,9 @@ -$NetBSD: patch-src_calibre_linux_py,v 1.3 2012/09/19 15:38:27 ryoon Exp $ +$NetBSD: patch-src_calibre_linux_py,v 1.4 2012/11/26 14:02:50 ryoon Exp $ Lifted from ArchLinux, saves mime and desktop files on disk instead of trying to add them directly. ---- src/calibre/linux.py.orig 2012-09-14 04:45:20.000000000 +0000 +--- src/calibre/linux.py.orig 2012-11-23 03:36:53.000000000 +0000 +++ src/calibre/linux.py @@ -179,19 +179,6 @@ class PostInstall: self.setup_completion() @@ -34,7 +34,7 @@ instead of trying to add them directly. if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) self.manifest.append(f) -@@ -357,51 +344,39 @@ class PostInstall: +@@ -357,63 +344,39 @@ class PostInstall: with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -44,6 +44,18 @@ instead of trying to add them directly. - cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) - self.icon_resources.append(('mimetypes', 'application-lrs', - '128')) +- render_img('mimetypes/mobi.png', 'calibre-mobi.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) +- render_img('mimetypes/tpz.png', 'calibre-tpz.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128')) +- render_img('mimetypes/azw2.png', 'calibre-azw2.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128')) +- render_img('mimetypes/azw3.png', 'calibre-azw3.png') +- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True) +- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) - render_img('lt.png', 'calibre-gui.png', width=256, height=256) - cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) - self.icon_resources.append(('apps', 'calibre-gui', '128')) @@ -89,14 +101,14 @@ instead of trying to add them directly. - cc(' '.join(cmd), shell=True) - self.menu_resources.append(x) - cc(['xdg-desktop-menu', 'forceupdate']) -- f = open('calibre-mimetypes', 'wb') +- f = open('calibre-mimetypes.xml', 'wb') + dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') + os.makedirs(dir) + f = open(os.path.join(dir, 'calibre.xml'), 'wb') f.write(MIME) f.close() -- self.mime_resources.append('calibre-mimetypes') -- cc('xdg-mime install ./calibre-mimetypes', shell=True) +- self.mime_resources.append('calibre-mimetypes.xml') +- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) except Exception: if self.opts.fatal_errors: raise