summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/calibre/Makefile7
-rw-r--r--misc/calibre/PLIST359
-rw-r--r--misc/calibre/distinfo14
-rw-r--r--misc/calibre/patches/patch-setup_extensions.py13
-rw-r--r--misc/calibre/patches/patch-src_calibre_constants.py16
-rw-r--r--misc/calibre/patches/patch-src_calibre_devices_scanner.py35
-rw-r--r--misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp12
-rw-r--r--misc/calibre/patches/patch-src_calibre_linux_py90
8 files changed, 366 insertions, 180 deletions
diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 4e96fac26b1..7eb4f4162ea 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2012/09/15 10:05:34 obache Exp $
+# $NetBSD: Makefile,v 1.43 2012/09/19 15:38:26 ryoon Exp $
#
-DISTNAME= calibre-0.8.50
-PKGREVISION= 4
+DISTNAME= calibre-0.8.69
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
EXTRACT_SUFX= .tar.xz
@@ -214,4 +213,6 @@ BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0
.include "../../x11/py-qt4/buildlink3.mk"
BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0
.include "../../x11/qt4-tools/buildlink3.mk"
+BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-tools>=4.7.0
+.include "../../x11/qt4-qdbus/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index cdb534be86b..d991396b185 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2012/05/06 08:34:14 gls Exp $
+@comment $NetBSD: PLIST,v 1.14 2012/09/19 15:38:26 ryoon Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@@ -18,7 +18,6 @@ bin/lrf2lrs
bin/lrfviewer
bin/lrs2lrf
bin/markdown-calibre
-bin/pdfmanipulate
bin/web2disk
lib/calibre/calibre/__init__.py
lib/calibre/calibre/constants.py
@@ -47,6 +46,7 @@ lib/calibre/calibre/devices/android/__init__.py
lib/calibre/calibre/devices/android/driver.py
lib/calibre/calibre/devices/apple/__init__.py
lib/calibre/calibre/devices/apple/driver.py
+lib/calibre/calibre/devices/apple/itunes.py
lib/calibre/calibre/devices/bambook/__init__.py
lib/calibre/calibre/devices/bambook/driver.py
lib/calibre/calibre/devices/bambook/libbambookcore.py
@@ -56,6 +56,7 @@ lib/calibre/calibre/devices/blackberry/__init__.py
lib/calibre/calibre/devices/blackberry/driver.py
lib/calibre/calibre/devices/boeye/__init__.py
lib/calibre/calibre/devices/boeye/driver.py
+lib/calibre/calibre/devices/cli.py
lib/calibre/calibre/devices/cybook/__init__.py
lib/calibre/calibre/devices/cybook/driver.py
lib/calibre/calibre/devices/cybook/t2b.py
@@ -89,28 +90,35 @@ lib/calibre/calibre/devices/kobo/__init__.py
lib/calibre/calibre/devices/kobo/bookmark.py
lib/calibre/calibre/devices/kobo/books.py
lib/calibre/calibre/devices/kobo/driver.py
-lib/calibre/calibre/devices/libusb.py
lib/calibre/calibre/devices/manager.py
lib/calibre/calibre/devices/mime.py
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/driver.py
+lib/calibre/calibre/devices/mtp/filesystem_cache.py
+lib/calibre/calibre/devices/mtp/test.py
+lib/calibre/calibre/devices/mtp/unix/__init__.py
+lib/calibre/calibre/devices/mtp/unix/driver.py
+lib/calibre/calibre/devices/mtp/unix/upstream/update.py
+lib/calibre/calibre/devices/mtp/windows/__init__.py
+lib/calibre/calibre/devices/mtp/windows/driver.py
+lib/calibre/calibre/devices/mtp/windows/remote.py
lib/calibre/calibre/devices/nokia/__init__.py
lib/calibre/calibre/devices/nokia/driver.py
lib/calibre/calibre/devices/nook/__init__.py
lib/calibre/calibre/devices/nook/driver.py
lib/calibre/calibre/devices/nuut2/__init__.py
lib/calibre/calibre/devices/nuut2/driver.py
-lib/calibre/calibre/devices/prs500/__init__.py
-lib/calibre/calibre/devices/prs500/books.py
-lib/calibre/calibre/devices/prs500/cli/__init__.py
-lib/calibre/calibre/devices/prs500/cli/main.py
-lib/calibre/calibre/devices/prs500/driver.py
-lib/calibre/calibre/devices/prs500/prstypes.py
lib/calibre/calibre/devices/prs505/__init__.py
lib/calibre/calibre/devices/prs505/driver.py
lib/calibre/calibre/devices/prs505/sony_cache.py
lib/calibre/calibre/devices/prst1/__init__.py
lib/calibre/calibre/devices/prst1/driver.py
lib/calibre/calibre/devices/scanner.py
+lib/calibre/calibre/devices/smart_device_app/__init__.py
+lib/calibre/calibre/devices/smart_device_app/driver.py
lib/calibre/calibre/devices/sne/__init__.py
lib/calibre/calibre/devices/sne/driver.py
lib/calibre/calibre/devices/teclast/__init__.py
@@ -125,6 +133,7 @@ lib/calibre/calibre/devices/usbms/driver.py
lib/calibre/calibre/devices/usbobserver/test.py
lib/calibre/calibre/devices/user_defined/__init__.py
lib/calibre/calibre/devices/user_defined/driver.py
+lib/calibre/calibre/devices/utils.py
lib/calibre/calibre/ebooks/BeautifulSoup.py
lib/calibre/calibre/ebooks/__init__.py
lib/calibre/calibre/ebooks/azw4/__init__.py
@@ -264,6 +273,7 @@ lib/calibre/calibre/ebooks/metadata/book/__init__.py
lib/calibre/calibre/ebooks/metadata/book/base.py
lib/calibre/calibre/ebooks/metadata/book/json_codec.py
lib/calibre/calibre/ebooks/metadata/cli.py
+lib/calibre/calibre/ebooks/metadata/docx.py
lib/calibre/calibre/ebooks/metadata/epub.py
lib/calibre/calibre/ebooks/metadata/ereader.py
lib/calibre/calibre/ebooks/metadata/extz.py
@@ -348,7 +358,10 @@ lib/calibre/calibre/ebooks/oeb/base.py
lib/calibre/calibre/ebooks/oeb/display/__init__.py
lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
lib/calibre/calibre/ebooks/oeb/display/webview.py
-lib/calibre/calibre/ebooks/oeb/iterator.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/spine.py
lib/calibre/calibre/ebooks/oeb/parse_utils.py
lib/calibre/calibre/ebooks/oeb/reader.py
lib/calibre/calibre/ebooks/oeb/stylizer.py
@@ -394,20 +407,10 @@ lib/calibre/calibre/ebooks/pdb/ztxt/reader.py
lib/calibre/calibre/ebooks/pdb/ztxt/writer.py
lib/calibre/calibre/ebooks/pdf/__init__.py
lib/calibre/calibre/ebooks/pdf/from_comic.py
-lib/calibre/calibre/ebooks/pdf/manipulate/__init__.py
-lib/calibre/calibre/ebooks/pdf/manipulate/cli.py
-lib/calibre/calibre/ebooks/pdf/manipulate/crop.py
-lib/calibre/calibre/ebooks/pdf/manipulate/decrypt.py
-lib/calibre/calibre/ebooks/pdf/manipulate/encrypt.py
-lib/calibre/calibre/ebooks/pdf/manipulate/info.py
-lib/calibre/calibre/ebooks/pdf/manipulate/merge.py
-lib/calibre/calibre/ebooks/pdf/manipulate/reverse.py
-lib/calibre/calibre/ebooks/pdf/manipulate/rotate.py
-lib/calibre/calibre/ebooks/pdf/manipulate/split.py
+lib/calibre/calibre/ebooks/pdf/outline_writer.py
lib/calibre/calibre/ebooks/pdf/pageoptions.py
lib/calibre/calibre/ebooks/pdf/pdftohtml.py
lib/calibre/calibre/ebooks/pdf/reflow.py
-lib/calibre/calibre/ebooks/pdf/verify.py
lib/calibre/calibre/ebooks/pdf/writer.py
lib/calibre/calibre/ebooks/pml/__init__.py
lib/calibre/calibre/ebooks/pml/pmlconverter.py
@@ -550,6 +553,7 @@ lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
lib/calibre/calibre/gui2/comments_editor.py
lib/calibre/calibre/gui2/complete.py
+lib/calibre/calibre/gui2/complete2.py
lib/calibre/calibre/gui2/convert/__init__.py
lib/calibre/calibre/gui2/convert/azw3_output.py
lib/calibre/calibre/gui2/convert/azw3_output_ui.py
@@ -620,6 +624,8 @@ lib/calibre/calibre/gui2/device.py
lib/calibre/calibre/gui2/device_drivers/__init__.py
lib/calibre/calibre/gui2/device_drivers/configwidget.py
lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
+lib/calibre/calibre/gui2/device_drivers/mtp_config.py
+lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
lib/calibre/calibre/gui2/dialogs/__init__.py
lib/calibre/calibre/gui2/dialogs/add_empty_book.py
lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
@@ -676,6 +682,8 @@ lib/calibre/calibre/gui2/dialogs/search.py
lib/calibre/calibre/gui2/dialogs/search_item_ui.py
lib/calibre/calibre/gui2/dialogs/search_ui.py
lib/calibre/calibre/gui2/dialogs/select_formats.py
+lib/calibre/calibre/gui2/dialogs/smartdevice.py
+lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
lib/calibre/calibre/gui2/dialogs/tag_categories.py
lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
lib/calibre/calibre/gui2/dialogs/tag_editor.py
@@ -818,6 +826,7 @@ lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py
lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
+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
@@ -832,6 +841,7 @@ lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
lib/calibre/calibre/gui2/store/stores/litres_plugin.py
lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py
+lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py
lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py
lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py
@@ -844,11 +854,11 @@ lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
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/oreilly_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/rw2010_plugin.py
lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
+lib/calibre/calibre/gui2/store/stores/sony_plugin.py
lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
@@ -871,16 +881,19 @@ lib/calibre/calibre/gui2/update.py
lib/calibre/calibre/gui2/viewer/__init__.py
lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
+lib/calibre/calibre/gui2/viewer/config.py
lib/calibre/calibre/gui2/viewer/config_ui.py
lib/calibre/calibre/gui2/viewer/dictionary.py
lib/calibre/calibre/gui2/viewer/documentview.py
lib/calibre/calibre/gui2/viewer/flip.py
+lib/calibre/calibre/gui2/viewer/image_popup.py
lib/calibre/calibre/gui2/viewer/javascript.py
lib/calibre/calibre/gui2/viewer/keys.py
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/toc.py
lib/calibre/calibre/gui2/widgets.py
lib/calibre/calibre/gui2/wizard/__init__.py
lib/calibre/calibre/gui2/wizard/device_ui.py
@@ -929,17 +942,8 @@ lib/calibre/calibre/libunrar.py
lib/calibre/calibre/libunzip.py
lib/calibre/calibre/libwand.py
lib/calibre/calibre/linux.py
-lib/calibre/calibre/manual/conf.py
-lib/calibre/calibre/manual/custom.py
-lib/calibre/calibre/manual/epub.py
-lib/calibre/calibre/manual/plugin_examples/helloworld/__init__.py
-lib/calibre/calibre/manual/plugin_examples/interface_demo/__init__.py
-lib/calibre/calibre/manual/plugin_examples/interface_demo/config.py
-lib/calibre/calibre/manual/plugin_examples/interface_demo/main.py
-lib/calibre/calibre/manual/plugin_examples/interface_demo/ui.py
-lib/calibre/calibre/manual/qthelp.py
-lib/calibre/calibre/manual/template_ref_generate.py
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
@@ -947,7 +951,6 @@ lib/calibre/calibre/plugins/icu.so
lib/calibre/calibre/plugins/lzx.so
lib/calibre/calibre/plugins/magick.so
lib/calibre/calibre/plugins/msdes.so
-lib/calibre/calibre/plugins/pdfreflow.so
lib/calibre/calibre/plugins/pictureflow.so
lib/calibre/calibre/plugins/podofo.so
lib/calibre/calibre/plugins/progress_indicator.so
@@ -958,7 +961,6 @@ lib/calibre/calibre/startup.py
lib/calibre/calibre/test_build.py
lib/calibre/calibre/trac/__init__.py
lib/calibre/calibre/trac/bzr_commit_plugin.py
-lib/calibre/calibre/trac/setup.py
lib/calibre/calibre/translations/__init__.py
lib/calibre/calibre/translations/dynamic.py
lib/calibre/calibre/translations/msgfmt.py
@@ -979,7 +981,6 @@ lib/calibre/calibre/utils/filenames.py
lib/calibre/calibre/utils/fonts/__init__.py
lib/calibre/calibre/utils/formatter.py
lib/calibre/calibre/utils/formatter_functions.py
-lib/calibre/calibre/utils/help2man.py
lib/calibre/calibre/utils/html2text.py
lib/calibre/calibre/utils/html5_entities.py
lib/calibre/calibre/utils/icu.py
@@ -1088,6 +1089,7 @@ lib/calibre/odf/text.py
lib/calibre/odf/thumbnail.py
lib/calibre/odf/userfield.py
lib/calibre/odf/xforms.py
+lib/calibre/qtcurve/test_rendering.py
lib/calibre/routes/__init__.py
lib/calibre/routes/base.py
lib/calibre/routes/lru.py
@@ -1097,19 +1099,6 @@ lib/calibre/routes/route.py
lib/calibre/routes/util.py
lib/calibre/templite/__init__.py
${PYSITELIB}/init_calibre.py
-man/man1/calibre-customize.1
-man/man1/calibre-debug.1
-man/man1/calibre-server.1
-man/man1/calibre-smtp.1
-man/man1/calibredb.1
-man/man1/ebook-convert.1
-man/man1/ebook-meta.1
-man/man1/epub-fix.1
-man/man1/fetch-ebook-metadata.1
-man/man1/lrf2lrs.1
-man/man1/lrs2lrf.1
-man/man1/pdfmanipulate.1
-man/man1/web2disk.1
share/applications/calibre-ebook-viewer.desktop
share/applications/calibre-gui.desktop
share/applications/calibre-lrfviewer.desktop
@@ -1123,6 +1112,7 @@ share/calibre/catalog/mastheadImage.gif
share/calibre/catalog/section_list_templates.py
share/calibre/catalog/stylesheet.css
share/calibre/catalog/template.xhtml
+share/calibre/compiled_coffeescript.zip
share/calibre/content_server/av.jpg
share/calibre/content_server/bg_search_box.png
share/calibre/content_server/browse/browse.css
@@ -1172,7 +1162,6 @@ share/calibre/content_server/star-half.png
share/calibre/content_server/star-off.png
share/calibre/content_server/star-on.png
share/calibre/default_tweaks.py
-share/calibre/display/cfi.js
share/calibre/ebook-convert-complete.pickle
share/calibre/fonts/calibreSymbols.otf
share/calibre/fonts/liberation/LiberationMono-Bold.ttf
@@ -1210,11 +1199,13 @@ share/calibre/images/connect_share_on.png
share/calibre/images/console.png
share/calibre/images/convert.png
share/calibre/images/cover_flow.png
+share/calibre/images/cover_texture.png
share/calibre/images/debug.png
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
@@ -1228,6 +1219,8 @@ share/calibre/images/dictionary.png
share/calibre/images/document-encrypt.png
share/calibre/images/document_open.png
share/calibre/images/donate.png
+share/calibre/images/dot_green.png
+share/calibre/images/dot_red.png
share/calibre/images/drawer.png
share/calibre/images/drm-locked.png
share/calibre/images/drm-unlocked.png
@@ -1283,6 +1276,7 @@ share/calibre/images/mimetypes/bmp.png
share/calibre/images/mimetypes/computer.png
share/calibre/images/mimetypes/dir.png
share/calibre/images/mimetypes/djvu.png
+share/calibre/images/mimetypes/docx.png
share/calibre/images/mimetypes/epub.png
share/calibre/images/mimetypes/fb2.png
share/calibre/images/mimetypes/gif.png
@@ -1338,6 +1332,7 @@ share/calibre/images/rating.png
share/calibre/images/reader.png
share/calibre/images/save.png
share/calibre/images/scheduler.png
+share/calibre/images/scroll.png
share/calibre/images/sd.png
share/calibre/images/search.png
share/calibre/images/search_add_saved.png
@@ -1391,15 +1386,18 @@ share/calibre/recipes/acim_bilim_dergisi.recipe
share/calibre/recipes/ad.recipe
share/calibre/recipes/adevarul.recipe
share/calibre/recipes/adnkronos.recipe
+share/calibre/recipes/ads_of_the_world.recipe
share/calibre/recipes/adventure_zone_pl.recipe
share/calibre/recipes/adventuregamers.recipe
share/calibre/recipes/aftenposten.recipe
share/calibre/recipes/agrogerila.recipe
share/calibre/recipes/aif_ru.recipe
+share/calibre/recipes/air_force_times.recipe
share/calibre/recipes/ajc.recipe
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/al_ahram.recipe
share/calibre/recipes/al_jazeera.recipe
share/calibre/recipes/al_masry_al_youm.recipe
@@ -1424,9 +1422,11 @@ share/calibre/recipes/aprospect.recipe
share/calibre/recipes/ara_info.recipe
share/calibre/recipes/arabian_business.recipe
share/calibre/recipes/arbetaren.recipe
+share/calibre/recipes/arcadia.recipe
share/calibre/recipes/arcamax.recipe
share/calibre/recipes/archeowiesci.recipe
share/calibre/recipes/arizona_republic.recipe
+share/calibre/recipes/army_times.recipe
share/calibre/recipes/ars_technica.recipe
share/calibre/recipes/asia_one.recipe
share/calibre/recipes/asianreviewofbooks.recipe
@@ -1434,6 +1434,7 @@ share/calibre/recipes/astro_news_pl.recipe
share/calibre/recipes/astronomia_pl.recipe
share/calibre/recipes/athens_news.recipe
share/calibre/recipes/atlantic.recipe
+share/calibre/recipes/attac_es.recipe
share/calibre/recipes/auto.recipe
share/calibre/recipes/auto_blog.recipe
share/calibre/recipes/auto_prove.recipe
@@ -1451,12 +1452,14 @@ share/calibre/recipes/ba_herald.recipe
share/calibre/recipes/babyonline.recipe
share/calibre/recipes/balkaninsight.recipe
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/barrons.recipe
share/calibre/recipes/bash_org_pl.recipe
share/calibre/recipes/bay_citizen.recipe
share/calibre/recipes/bbc.recipe
+share/calibre/recipes/bbc_brasil.recipe
share/calibre/recipes/bbc_chinese.recipe
share/calibre/recipes/bbc_es.recipe
share/calibre/recipes/bbc_fast.recipe
@@ -1491,6 +1494,7 @@ share/calibre/recipes/borse_online.recipe
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/brigitte_de.recipe
share/calibre/recipes/bucataras.recipe
share/calibre/recipes/buckmasters.recipe
@@ -1503,6 +1507,7 @@ 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
share/calibre/recipes/cacm.recipe
share/calibre/recipes/caijing.recipe
share/calibre/recipes/calcalist.recipe
@@ -1521,6 +1526,7 @@ share/calibre/recipes/catavencii.recipe
share/calibre/recipes/catavencu.recipe
share/calibre/recipes/catholic_daily_readings.recipe
share/calibre/recipes/catholic_news_agency.recipe
+share/calibre/recipes/cato.recipe
share/calibre/recipes/cbc_canada.recipe
share/calibre/recipes/cbn.recipe
share/calibre/recipes/cd_action.recipe
@@ -1538,6 +1544,7 @@ share/calibre/recipes/chouchoublog.recipe
share/calibre/recipes/chowk.recipe
share/calibre/recipes/chr_mon.recipe
share/calibre/recipes/christian_post.recipe
+share/calibre/recipes/chronicle_higher_ed.recipe
share/calibre/recipes/cicero.recipe
share/calibre/recipes/ciekawostki_historyczne.recipe
share/calibre/recipes/cincinnati_enquirer.recipe
@@ -1545,6 +1552,7 @@ share/calibre/recipes/cinco_dias.recipe
share/calibre/recipes/cinebel_be.recipe
share/calibre/recipes/cio.recipe
share/calibre/recipes/cio_magazine.recipe
+share/calibre/recipes/ciperchile.recipe
share/calibre/recipes/cjr.recipe
share/calibre/recipes/clarin.recipe
share/calibre/recipes/clarion_ledger.recipe
@@ -1564,6 +1572,7 @@ share/calibre/recipes/comics_com.recipe
share/calibre/recipes/common_dreams.recipe
share/calibre/recipes/computer_active.recipe
share/calibre/recipes/computerworld_pl.recipe
+share/calibre/recipes/conowego_pl.recipe
share/calibre/recipes/consortium_news.recipe
share/calibre/recipes/consumerist.recipe
share/calibre/recipes/corren2.recipe
@@ -1582,7 +1591,9 @@ share/calibre/recipes/cracked_com.recipe
share/calibre/recipes/craigslist.recipe
share/calibre/recipes/credit_slips.recipe
share/calibre/recipes/csid.recipe
+share/calibre/recipes/ct24.recipe
share/calibre/recipes/cubadebate.recipe
+share/calibre/recipes/cumhuriyet.recipe
share/calibre/recipes/curierulnational.recipe
share/calibre/recipes/cvecezla.recipe
share/calibre/recipes/cyberpresse.recipe
@@ -1655,19 +1666,23 @@ share/calibre/recipes/dnevnik_mk.recipe
share/calibre/recipes/dobreprogamy.recipe
share/calibre/recipes/dominion.recipe
share/calibre/recipes/dosisdiarias.recipe
+share/calibre/recipes/dot_net.recipe
share/calibre/recipes/dotpod.recipe
share/calibre/recipes/down_to_earth.recipe
share/calibre/recipes/dr_dk.recipe
share/calibre/recipes/drivelry.recipe
+share/calibre/recipes/drytooling_pl.recipe
share/calibre/recipes/dunya_bizim.recipe
share/calibre/recipes/dunya_bulteni.recipe
share/calibre/recipes/dvhn.recipe
share/calibre/recipes/dzieje_pl.recipe
share/calibre/recipes/dziennik_pl.recipe
+share/calibre/recipes/dziennik_polski.recipe
share/calibre/recipes/e_novine.recipe
share/calibre/recipes/echo_online.recipe
share/calibre/recipes/eclicto.recipe
share/calibre/recipes/ecogeek.recipe
+share/calibre/recipes/economico.recipe
share/calibre/recipes/economist.recipe
share/calibre/recipes/economist_free.recipe
share/calibre/recipes/ecotrend.recipe
@@ -1682,6 +1697,7 @@ share/calibre/recipes/ekantipur.recipe
share/calibre/recipes/ekathemerini.recipe
share/calibre/recipes/ekot.recipe
share/calibre/recipes/eksiazki.recipe
+share/calibre/recipes/ekundelek_pl.recipe
share/calibre/recipes/el_colombiano.recipe
share/calibre/recipes/el_correo.recipe
share/calibre/recipes/el_cultural.recipe
@@ -1718,6 +1734,7 @@ share/calibre/recipes/eluniversalimpresa.recipe
share/calibre/recipes/eluniverso_ec.recipe
share/calibre/recipes/emg_en.recipe
share/calibre/recipes/emg_rs.recipe
+share/calibre/recipes/empire_magazine.recipe
share/calibre/recipes/emuzica_pl.recipe
share/calibre/recipes/endgadget.recipe
share/calibre/recipes/endgadget_ja.recipe
@@ -1764,6 +1781,7 @@ share/calibre/recipes/fluter_de.recipe
share/calibre/recipes/focus_de.recipe
share/calibre/recipes/focus_pl.recipe
share/calibre/recipes/fokkeensukke.recipe
+share/calibre/recipes/folha.recipe
share/calibre/recipes/folhadesaopaulo.recipe
share/calibre/recipes/folhadesaopaulo_sub.recipe
share/calibre/recipes/forbes.recipe
@@ -1824,8 +1842,8 @@ share/calibre/recipes/granma.recipe
share/calibre/recipes/grantland.recipe
share/calibre/recipes/greader.recipe
share/calibre/recipes/greader_uber.recipe
-share/calibre/recipes/greenlinux_pl.recipe
share/calibre/recipes/greensboro_news_and_record.recipe
+share/calibre/recipes/grid_to.recipe
share/calibre/recipes/grrm.recipe
share/calibre/recipes/gry_online_pl.recipe
share/calibre/recipes/gs24_pl.recipe
@@ -1854,11 +1872,14 @@ share/calibre/recipes/hartford_courant.recipe
share/calibre/recipes/hawaii.recipe
share/calibre/recipes/hbr.recipe
share/calibre/recipes/hbr_blogs.recipe
+share/calibre/recipes/heavy_metal_it.recipe
share/calibre/recipes/heise.recipe
share/calibre/recipes/heise_online.recipe
share/calibre/recipes/heise_open.recipe
share/calibre/recipes/helsingin_sanomat.recipe
share/calibre/recipes/heraldo.recipe
+share/calibre/recipes/heritage_foundation.recipe
+share/calibre/recipes/high_country_blogs.recipe
share/calibre/recipes/high_country_news.recipe
share/calibre/recipes/hindu.recipe
share/calibre/recipes/hindu_business_line.recipe
@@ -1868,11 +1889,13 @@ share/calibre/recipes/histmag.recipe
share/calibre/recipes/historia_news.recipe
share/calibre/recipes/historia_pl.recipe
share/calibre/recipes/historiaro.recipe
+share/calibre/recipes/history_today.recipe
share/calibre/recipes/hitro.recipe
share/calibre/recipes/hln.recipe
share/calibre/recipes/hln_be.recipe
share/calibre/recipes/hna.recipe
share/calibre/recipes/hola.recipe
+share/calibre/recipes/homopedia_pl.recipe
share/calibre/recipes/hotair.recipe
share/calibre/recipes/hotcity.recipe
share/calibre/recipes/hotnews.recipe
@@ -1881,6 +1904,7 @@ share/calibre/recipes/howtogeek.recipe
share/calibre/recipes/hoy.recipe
share/calibre/recipes/hrt.recipe
share/calibre/recipes/huffingtonpost.recipe
+share/calibre/recipes/huffingtonpost_uk.recipe
share/calibre/recipes/hvg.recipe
share/calibre/recipes/ibm_smarter_planet.recipe
share/calibre/recipes/ideal_almeria.recipe
@@ -1953,6 +1977,7 @@ share/calibre/recipes/jpost_fr.recipe
share/calibre/recipes/jsonline.recipe
share/calibre/recipes/jurnalulnational.recipe
share/calibre/recipes/jutarnji.recipe
+share/calibre/recipes/juve_la_stampa.recipe
share/calibre/recipes/juventudrebelde.recipe
share/calibre/recipes/juventudrebelde_english.recipe
share/calibre/recipes/kahokushinpo.recipe
@@ -1990,6 +2015,7 @@ share/calibre/recipes/kurier.recipe
share/calibre/recipes/l_espresso.recipe
share/calibre/recipes/la_cuarta.recipe
share/calibre/recipes/la_diaria.recipe
+share/calibre/recipes/la_gazetta_del_mezzogiorno.recipe
share/calibre/recipes/la_gazzeta_dello_sport.recipe
share/calibre/recipes/la_jornada.recipe
share/calibre/recipes/la_nueva.recipe
@@ -2017,6 +2043,7 @@ share/calibre/recipes/lavanguardia.recipe
share/calibre/recipes/lavenir_be.recipe
share/calibre/recipes/le_journal.recipe
share/calibre/recipes/le_monde.recipe
+share/calibre/recipes/le_monde_sub.recipe
share/calibre/recipes/le_temps.recipe
share/calibre/recipes/ledevoir.recipe
share/calibre/recipes/leduc.recipe
@@ -2040,8 +2067,10 @@ share/calibre/recipes/libero.recipe
share/calibre/recipes/liberty_times.recipe
share/calibre/recipes/lifehacker.recipe
share/calibre/recipes/limes.recipe
+share/calibre/recipes/linux_journal.recipe
share/calibre/recipes/linux_magazine.recipe
share/calibre/recipes/linuxdevices.recipe
+share/calibre/recipes/list_apart.recipe
share/calibre/recipes/livemint.recipe
share/calibre/recipes/living_digital.recipe
share/calibre/recipes/living_stones.recipe
@@ -2063,11 +2092,16 @@ share/calibre/recipes/macity.recipe
share/calibre/recipes/macleans.recipe
share/calibre/recipes/mail_and_guardian.recipe
share/calibre/recipes/mainichi.recipe
-share/calibre/recipes/mainichi_it_news.recipe
+share/calibre/recipes/mainichi_en.recipe
+share/calibre/recipes/mainichi_science_news.recipe
+share/calibre/recipes/malaya_business_insight.recipe
share/calibre/recipes/malaysian_mirror.recipe
+share/calibre/recipes/manila_standard_today.recipe
share/calibre/recipes/marca.recipe
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/matichon.recipe
share/calibre/recipes/max_planck.recipe
share/calibre/recipes/maximum_pc.recipe
@@ -2092,6 +2126,7 @@ share/calibre/recipes/michellemalkin.recipe
share/calibre/recipes/microwave_and_rf.recipe
share/calibre/recipes/midday.recipe
share/calibre/recipes/milenio.recipe
+share/calibre/recipes/military_times.recipe
share/calibre/recipes/ming_pao.recipe
share/calibre/recipes/ming_pao_toronto.recipe
share/calibre/recipes/ming_pao_vancouver.recipe
@@ -2117,20 +2152,25 @@ share/calibre/recipes/msnbc.recipe
share/calibre/recipes/msnsankei.recipe
share/calibre/recipes/mumbai_mirror.recipe
share/calibre/recipes/mwjournal.recipe
+share/calibre/recipes/nachdenkseiten.recipe
share/calibre/recipes/nacional_cro.recipe
share/calibre/recipes/nacionred.recipe
-share/calibre/recipes/naczytniki.recipe
share/calibre/recipes/nakedcapitalism.recipe
share/calibre/recipes/nasa.recipe
+share/calibre/recipes/natemat_pl.recipe
share/calibre/recipes/natgeo.recipe
share/calibre/recipes/nation_ke.recipe
share/calibre/recipes/national_geographic_de.recipe
+share/calibre/recipes/national_geographic_es.recipe
+share/calibre/recipes/national_geographic_it.recipe
+share/calibre/recipes/national_geographic_mag.recipe
share/calibre/recipes/national_geographic_pl.recipe
share/calibre/recipes/national_post.recipe
share/calibre/recipes/nationalgeographic.recipe
share/calibre/recipes/nationalgeographicjp.recipe
share/calibre/recipes/nationalgeoro.recipe
share/calibre/recipes/nationalreviewonline.recipe
+share/calibre/recipes/navy_times.recipe
share/calibre/recipes/nbonline.recipe
share/calibre/recipes/ncrnext.recipe
share/calibre/recipes/nejm.recipe
@@ -2138,9 +2178,11 @@ share/calibre/recipes/neowin.recipe
share/calibre/recipes/netzpolitik.recipe
share/calibre/recipes/new_london_day.recipe
share/calibre/recipes/new_scientist.recipe
+share/calibre/recipes/new_statesman.recipe
share/calibre/recipes/new_york_review_of_books.recipe
share/calibre/recipes/new_york_review_of_books_no_sub.recipe
share/calibre/recipes/new_yorker.recipe
+share/calibre/recipes/news_busters.recipe
share/calibre/recipes/news_times.recipe
share/calibre/recipes/newsbeast.recipe
share/calibre/recipes/newsmoldova.recipe
@@ -2200,7 +2242,9 @@ share/calibre/recipes/nytimes_sub.recipe
share/calibre/recipes/nytimes_tech.recipe
share/calibre/recipes/nytimesbook.recipe
share/calibre/recipes/nzherald.recipe
+share/calibre/recipes/nzz_folio.recipe
share/calibre/recipes/nzz_ger.recipe
+share/calibre/recipes/nzz_webpaper.recipe
share/calibre/recipes/o_globo.recipe
share/calibre/recipes/oakland_north.recipe
share/calibre/recipes/observa_digital.recipe
@@ -2254,6 +2298,8 @@ share/calibre/recipes/perfil.recipe
share/calibre/recipes/pescanik.recipe
share/calibre/recipes/peterschiff.recipe
share/calibre/recipes/phd_comics.recipe
+share/calibre/recipes/philippino_star_ngayon.recipe
+share/calibre/recipes/phillosophy_now.recipe
share/calibre/recipes/philly.recipe
share/calibre/recipes/phoronix.recipe
share/calibre/recipes/physics_today.recipe
@@ -2297,6 +2343,7 @@ share/calibre/recipes/punto_informatico.recipe
share/calibre/recipes/pure_pc.recipe
share/calibre/recipes/queleer.recipe
share/calibre/recipes/quotidiano.recipe
+share/calibre/recipes/rabble_ca.recipe
share/calibre/recipes/racjonalista_pl.recipe
share/calibre/recipes/radikal_tr.recipe
share/calibre/recipes/radio_prague.recipe
@@ -2308,6 +2355,7 @@ share/calibre/recipes/readitlater.recipe
share/calibre/recipes/real_clear.recipe
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/regina_leader_post.recipe
share/calibre/recipes/replicavedetelor.recipe
@@ -2321,6 +2369,7 @@ share/calibre/recipes/revista_bla.recipe
share/calibre/recipes/revista_muy.recipe
share/calibre/recipes/revista_piaui.recipe
share/calibre/recipes/revista_semana.recipe
+share/calibre/recipes/revista_summa.recipe
share/calibre/recipes/rga.recipe
share/calibre/recipes/rheinische_post.recipe
share/calibre/recipes/ria_ru.recipe
@@ -2374,7 +2423,9 @@ share/calibre/recipes/sfbg.recipe
share/calibre/recipes/sfin.recipe
share/calibre/recipes/sg_hu.recipe
share/calibre/recipes/shacknews.recipe
+share/calibre/recipes/shortlist.recipe
share/calibre/recipes/sigma_live.recipe
+share/calibre/recipes/sign_of_the_times.recipe
share/calibre/recipes/sign_on_sd.recipe
share/calibre/recipes/silicon_republic.recipe
share/calibre/recipes/sinfest.recipe
@@ -2393,11 +2444,13 @@ share/calibre/recipes/slovo.recipe
share/calibre/recipes/smashing.recipe
share/calibre/recipes/sme.recipe
share/calibre/recipes/smh.recipe
+share/calibre/recipes/smilezilla.recipe
share/calibre/recipes/smith.recipe
share/calibre/recipes/snopes.recipe
share/calibre/recipes/socialdiva.recipe
share/calibre/recipes/sol_haber.recipe
share/calibre/recipes/soldiers.recipe
+share/calibre/recipes/something_awful.recipe
share/calibre/recipes/southernstar.recipe
share/calibre/recipes/spektrum.recipe
share/calibre/recipes/spiders_web_pl.recipe
@@ -2413,14 +2466,17 @@ share/calibre/recipes/standardmedia_ke.recipe
share/calibre/recipes/standardmoney.recipe
share/calibre/recipes/star_gazetesi.recipe
share/calibre/recipes/staradvertiser.recipe
+share/calibre/recipes/stars_and_stripes.recipe
share/calibre/recipes/starwars.recipe
share/calibre/recipes/statesman.recipe
share/calibre/recipes/stiintasitehnica.recipe
share/calibre/recipes/stnn.recipe
share/calibre/recipes/straitstimes.recipe
share/calibre/recipes/strange_horizons.recipe
+share/calibre/recipes/strategic_culture.recipe
share/calibre/recipes/strategy-business.recipe
share/calibre/recipes/sueddeutsche.recipe
+share/calibre/recipes/sueddeutsche_mobil.recipe
share/calibre/recipes/sueddeutschezeitung.recipe
share/calibre/recipes/sunday_times.recipe
share/calibre/recipes/superbebe.recipe
@@ -2461,13 +2517,18 @@ share/calibre/recipes/the_budget_fashionista.recipe
share/calibre/recipes/the_clinic_online.recipe
share/calibre/recipes/the_daily_news_egypt.recipe
share/calibre/recipes/the_escapist.recipe
+share/calibre/recipes/the_freeman.recipe
share/calibre/recipes/the_h.recipe
share/calibre/recipes/the_journal.recipe
+share/calibre/recipes/the_manila_bulletin.recipe
+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_republic.recipe
share/calibre/recipes/the_oz.recipe
+share/calibre/recipes/the_philippine_daily_inquirer.recipe
+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
@@ -2562,6 +2623,7 @@ share/calibre/recipes/walla.recipe
share/calibre/recipes/wallstreetro.recipe
share/calibre/recipes/walrusmag.recipe
share/calibre/recipes/wapo_cartoons.recipe
+share/calibre/recipes/warentest.recipe
share/calibre/recipes/wash_post.recipe
share/calibre/recipes/wash_times.recipe
share/calibre/recipes/watchingamerica.recipe
@@ -2582,6 +2644,7 @@ share/calibre/recipes/wired.recipe
share/calibre/recipes/wired_daily.recipe
share/calibre/recipes/wired_it.recipe
share/calibre/recipes/wired_uk.recipe
+share/calibre/recipes/wirtualnemedia_pl.recipe
share/calibre/recipes/wnp.recipe
share/calibre/recipes/words_without_borders.recipe
share/calibre/recipes/workers_world.recipe
@@ -2625,12 +2688,204 @@ share/calibre/templates/html_export_default_index.tmpl
share/calibre/templates/lrf.xsl
share/calibre/templates/rtf.xsl
share/calibre/tracer.epub
+share/calibre/viewer/blank.html
share/calibre/viewer/bookmarks.js
share/calibre/viewer/hyphenate/Hyphenator.js
share/calibre/viewer/hyphenate/patterns.zip
share/calibre/viewer/hyphenation.js
share/calibre/viewer/images.js
share/calibre/viewer/jquery_scrollTo.js
+share/calibre/viewer/mathjax/MathJax.js
+share/calibre/viewer/mathjax/extensions/FontWarnings.js
+share/calibre/viewer/mathjax/extensions/MathEvents.js
+share/calibre/viewer/mathjax/extensions/MathMenu.js
+share/calibre/viewer/mathjax/extensions/MathZoom.js
+share/calibre/viewer/mathjax/extensions/TeX/AMSmath.js
+share/calibre/viewer/mathjax/extensions/TeX/AMSsymbols.js
+share/calibre/viewer/mathjax/extensions/TeX/HTML.js
+share/calibre/viewer/mathjax/extensions/TeX/action.js
+share/calibre/viewer/mathjax/extensions/TeX/autobold.js
+share/calibre/viewer/mathjax/extensions/TeX/autoload-all.js
+share/calibre/viewer/mathjax/extensions/TeX/bbox.js
+share/calibre/viewer/mathjax/extensions/TeX/begingroup.js
+share/calibre/viewer/mathjax/extensions/TeX/boldsymbol.js
+share/calibre/viewer/mathjax/extensions/TeX/cancel.js
+share/calibre/viewer/mathjax/extensions/TeX/color.js
+share/calibre/viewer/mathjax/extensions/TeX/enclose.js
+share/calibre/viewer/mathjax/extensions/TeX/extpfeil.js
+share/calibre/viewer/mathjax/extensions/TeX/mathchoice.js
+share/calibre/viewer/mathjax/extensions/TeX/mhchem.js
+share/calibre/viewer/mathjax/extensions/TeX/newcommand.js
+share/calibre/viewer/mathjax/extensions/TeX/noErrors.js
+share/calibre/viewer/mathjax/extensions/TeX/noUndefined.js
+share/calibre/viewer/mathjax/extensions/TeX/unicode.js
+share/calibre/viewer/mathjax/extensions/TeX/verb.js
+share/calibre/viewer/mathjax/extensions/asciimath2jax.js
+share/calibre/viewer/mathjax/extensions/jsMath2jax.js
+share/calibre/viewer/mathjax/extensions/mml2jax.js
+share/calibre/viewer/mathjax/extensions/tex2jax.js
+share/calibre/viewer/mathjax/extensions/toMathML.js
+share/calibre/viewer/mathjax/extensions/v1.0-warning.js
+share/calibre/viewer/mathjax/jax/element/mml/jax.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/Arrows.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/BasicLatin.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/CombDiactForSymbols.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/Dingbats.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/GeneralPunctuation.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/GeometricShapes.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/GreekAndCoptic.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/Latin1Supplement.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/LetterlikeSymbols.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/MathOperators.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/MiscMathSymbolsA.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/MiscMathSymbolsB.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/MiscSymbolsAndArrows.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/MiscTechnical.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/SpacingModLetters.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/SuppMathOperators.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/SupplementalArrowsA.js
+share/calibre/viewer/mathjax/jax/element/mml/optable/SupplementalArrowsB.js
+share/calibre/viewer/mathjax/jax/input/AsciiMath/config.js
+share/calibre/viewer/mathjax/jax/input/AsciiMath/jax.js
+share/calibre/viewer/mathjax/jax/input/MathML/config.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/a.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/b.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/c.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/d.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/e.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/f.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/fr.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/g.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/h.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/i.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/j.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/k.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/l.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/m.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/n.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/o.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/opf.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/p.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/q.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/r.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/s.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/scr.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/t.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/u.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/v.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/w.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/x.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/y.js
+share/calibre/viewer/mathjax/jax/input/MathML/entities/z.js
+share/calibre/viewer/mathjax/jax/input/MathML/jax.js
+share/calibre/viewer/mathjax/jax/input/TeX/config.js
+share/calibre/viewer/mathjax/jax/input/TeX/jax.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/annotation-xml.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/maction.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/menclose.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/mglyph.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/mmultiscripts.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/ms.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/mtable.js
+share/calibre/viewer/mathjax/jax/output/SVG/autoload/multiline.js
+share/calibre/viewer/mathjax/jax/output/SVG/config.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/Arrows.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/BoxDrawing.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/Dingbats.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/EnclosedAlphanum.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/GeneralPunctuation.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/GeometricShapes.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/GreekAndCoptic.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/Latin1Supplement.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/LatinExtendedA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/LetterlikeSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/MathOperators.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscTechnical.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/PUA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/SpacingModLetters.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/SuppMathOperators.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Caligraphic/Bold/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Caligraphic/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Other.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold/PUA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Regular/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Other.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Regular/PUA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/Arrows.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/CombDiactForSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/GeneralPunctuation.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/GeometricShapes.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/GreekAndCoptic.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/Latin1Supplement.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/LatinExtendedA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/LatinExtendedB.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/LetterlikeSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/MathOperators.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/MiscMathSymbolsA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/MiscSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/MiscTechnical.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/SpacingModLetters.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/SuppMathOperators.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/SupplementalArrowsA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/GeneralPunctuation.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/GreekAndCoptic.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedB.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/LetterlikeSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/MathOperators.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/GeometricShapes.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/GreekAndCoptic.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedA.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedB.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/LetterlikeSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/MathOperators.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/MiscSymbols.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/SpacingModLetters.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular/SuppMathOperators.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Math/BoldItalic/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Math/Italic/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Bold/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Other.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Italic/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Other.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Regular/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Other.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Script/Regular/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Script/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Size1/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Size2/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Size3/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Size4/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/BasicLatin.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata-extra.js
+share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js
+share/calibre/viewer/mathjax/jax/output/SVG/jax.js
share/calibre/viewer/referencing.js
share/doc/calibre/COPYRIGHT
share/doc/calibre/Changelog.old.yaml
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 1e465e54fc6..fd688b1be39 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.12 2012/05/06 08:34:14 gls Exp $
+$NetBSD: distinfo,v 1.13 2012/09/19 15:38:26 ryoon Exp $
-SHA1 (calibre-0.8.50.tar.xz) = 3c9522d03af625f11189e5248b680dd3fe302b9b
-RMD160 (calibre-0.8.50.tar.xz) = 9fa78b6316ab86120be39f990ed6edbcd7c50c7d
-Size (calibre-0.8.50.tar.xz) = 24580260 bytes
-SHA1 (patch-src_calibre_constants.py) = d86abb152ea2abb280e98830f608d90ee53b552d
-SHA1 (patch-src_calibre_devices_scanner.py) = 0ee6a7038c2be361563e4717ee87c6f7844e5e3f
-SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 950f0302f3c387fb9b4ee41cd96d7c5103b7ad45
-SHA1 (patch-src_calibre_linux_py) = 04ae3325d88903e155280c65a8375d90a11a2ff0
+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 (patch-setup_extensions.py) = aa8ee237a80b4da8dea03af950a7ac4caed9e51a
+SHA1 (patch-src_calibre_linux_py) = 267d01d4ba671299d88b9b3b9d2f98beb95c527e
diff --git a/misc/calibre/patches/patch-setup_extensions.py b/misc/calibre/patches/patch-setup_extensions.py
new file mode 100644
index 00000000000..2fd6ba717cb
--- /dev/null
+++ b/misc/calibre/patches/patch-setup_extensions.py
@@ -0,0 +1,13 @@
+$NetBSD: patch-setup_extensions.py,v 1.3 2012/09/19 15:38:27 ryoon Exp $
+
+--- setup/extensions.py.orig 2012-09-19 15:19:07.000000000 +0000
++++ setup/extensions.py
+@@ -483,7 +483,7 @@ class Build(Command):
+ self.check_call(qmc + ['qtcurve.pro'])
+ self.check_call([make]+([] if iswindows else ['-j%d'%(cpu_count()
+ or 1)]))
+- src = (glob.glob('*.so') + glob.glob('release/*.dll') +
++ src = (glob.glob('.libs/*.so') + glob.glob('release/*.dll') +
+ glob.glob('*.dylib'))
+ ext = 'pyd' if iswindows else 'so'
+ shutil.copy2(src[0], self.j(dest, 'calibre_style.'+ext))
diff --git a/misc/calibre/patches/patch-src_calibre_constants.py b/misc/calibre/patches/patch-src_calibre_constants.py
deleted file mode 100644
index d787d104be5..00000000000
--- a/misc/calibre/patches/patch-src_calibre_constants.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_calibre_constants.py,v 1.3 2012/04/22 19:33:01 gls Exp $
-
-Make it recognize DragonFlyBSD
-
---- src/calibre/constants.py.orig 2012-04-13 04:21:01.000000000 +0000
-+++ src/calibre/constants.py
-@@ -28,7 +28,8 @@ isosx = 'darwin' in _plat
- isnewosx = isosx and getattr(sys, 'new_app_bundle', False)
- isfreebsd = 'freebsd' in _plat
- isnetbsd = 'netbsd' in _plat
--isbsd = isfreebsd or isnetbsd
-+isdragonflybsd = 'dragonfly' in _plat
-+isbsd = isfreebsd or isnetbsd or isdragonflybsd
- islinux = not(iswindows or isosx or isbsd)
- isfrozen = hasattr(sys, 'frozen')
- isunix = isosx or islinux
diff --git a/misc/calibre/patches/patch-src_calibre_devices_scanner.py b/misc/calibre/patches/patch-src_calibre_devices_scanner.py
deleted file mode 100644
index e9dd06cbcc4..00000000000
--- a/misc/calibre/patches/patch-src_calibre_devices_scanner.py
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_calibre_devices_scanner.py,v 1.2 2012/04/22 19:33:01 gls Exp $
-
-NetBSD's scanner support for Calibre is not written yet
-
---- src/calibre/devices/scanner.py.orig 2012-02-10 04:59:10.000000000 +0000
-+++ src/calibre/devices/scanner.py
-@@ -10,6 +10,8 @@ from threading import RLock
-
- from calibre.constants import iswindows, isosx, plugins, islinux, isfreebsd
-
-+isnetbsd = 'netbsd' in sys.platform.lower()
-+
- osx_scanner = win_scanner = linux_scanner = None
-
- if iswindows:
-@@ -220,13 +222,18 @@ freebsd_scanner = None
- if isfreebsd:
- freebsd_scanner = FreeBSDScanner()
-
-+netbsd_scanner = None
-+
-+''' NetBSD support currently not written yet '''
-+if isnetbsd:
-+ netbsd_scanner = None
-
- class DeviceScanner(object):
-
- def __init__(self, *args):
- if isosx and osx_scanner is None:
- raise RuntimeError('The Python extension usbobserver must be available on OS X.')
-- self.scanner = win_scanner if iswindows else osx_scanner if isosx else freebsd_scanner if isfreebsd else linux_scanner
-+ self.scanner = win_scanner if iswindows else osx_scanner if isosx else freebsd_scanner if isfreebsd else netbsd_scanner if isnetbsd else linux_scanner
- self.devices = []
-
- def scan(self):
diff --git a/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp b/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp
deleted file mode 100644
index 0c28d265e5b..00000000000
--- a/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_calibre_ebooks_pdf_images.cpp,v 1.2 2011/05/21 15:07:48 wiz Exp $
-
---- src/calibre/ebooks/pdf/images.cpp.orig 2011-04-08 17:20:30.000000000 +0000
-+++ src/calibre/ebooks/pdf/images.cpp
-@@ -16,6 +16,7 @@
-
- #include "images.h"
- #include "utils.h"
-+#include "zlib.h"
-
- #ifdef _WIN32
- inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); }
diff --git a/misc/calibre/patches/patch-src_calibre_linux_py b/misc/calibre/patches/patch-src_calibre_linux_py
index f090d62f999..ad11fe9128e 100644
--- a/misc/calibre/patches/patch-src_calibre_linux_py
+++ b/misc/calibre/patches/patch-src_calibre_linux_py
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_calibre_linux_py,v 1.2 2012/04/22 19:33:01 gls Exp $
+$NetBSD: patch-src_calibre_linux_py,v 1.3 2012/09/19 15:38:27 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-04-13 04:21:01.000000000 +0000
+--- src/calibre/linux.py.orig 2012-09-14 04:45:20.000000000 +0000
+++ src/calibre/linux.py
-@@ -180,18 +180,6 @@ class PostInstall:
- self.install_man_pages()
+@@ -179,19 +179,6 @@ class PostInstall:
+ self.setup_completion()
if islinux or isbsd:
self.setup_desktop_integration()
- self.create_uninstaller()
@@ -21,48 +21,40 @@ instead of trying to add them directly.
- shutil.rmtree(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))
-@@ -235,7 +223,7 @@ class PostInstall:
- if os.path.exists(bc):
- f = os.path.join(bc, 'calibre')
- else:
-- if isnetbsd:
-+ if isbsd:
+ for args, kwargs in self.warnings:
+@@ -237,7 +224,7 @@ class PostInstall:
+ if isnetbsd:
f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
else:
- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-@@ -365,7 +353,7 @@ class PostInstall:
- if isbsd:
- manfile = os.path.join(manpath, prog+'.1')
- else:
-- manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-+ manfile = os.path.join(manpath, prog+'.1'+'.bz2')
- self.info('\tInstalling MAN page for', prog)
- open(manfile, 'wb').write(raw)
- self.manifest.append(manfile)
-@@ -382,50 +370,40 @@ class PostInstall:
+- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
++ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
+ 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:
+
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
PreserveMIMEDefaults():
- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
-- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
+- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
+- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
-- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
+- 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('lt.png', 'calibre-gui.png')
-- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
+- 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'))
- render_img('viewer.png', 'calibre-viewer.png')
-- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
+- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
- self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+ os.mkdir(dir)
-+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
-+
++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
++ os.mkdir(dir)
++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
mimetypes = set([])
for x in all_input_formats():
@@ -75,11 +67,10 @@ instead of trying to add them directly.
f.write('MimeType=%s;\n'%';'.join(mimetypes))
- f = open('calibre-lrfviewer.desktop', 'wb')
-- f.write(VIEWER)
-+ dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+ os.mkdir(dir)
-+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-+ f.write(VIEWER)
++ dir = os.path.join(self.opts.staging_sharedir,'../applications')
++ os.mkdir(dir)
++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
+ f.write(VIEWER)
f.close()
- f = open('calibre-ebook-viewer.desktop', 'wb')
+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
@@ -95,26 +86,17 @@ instead of trying to add them directly.
- 'calibre-ebook-viewer.desktop')
- for x in des:
- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
-- check_call(' '.join(cmd), shell=True)
+- cc(' '.join(cmd), shell=True)
- self.menu_resources.append(x)
-- check_call(['xdg-desktop-menu', 'forceupdate'])
+- cc(['xdg-desktop-menu', 'forceupdate'])
- f = open('calibre-mimetypes', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+ os.makedirs(dir)
-+ f = open(os.path.join(dir, 'calibre.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')
-- check_call('xdg-mime install ./calibre-mimetypes', shell=True)
+- cc('xdg-mime install ./calibre-mimetypes', shell=True)
except Exception:
if self.opts.fatal_errors:
raise
-@@ -563,7 +541,7 @@ GUI = '''\
- [Desktop Entry]
- Version=1.0
- Type=Application
--Name=calibre
-+Name=Calibre
- GenericName=E-book library management
- Comment=E-book library management: Convert, view, share, catalogue all your e-books
- TryExec=calibre
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-14 18:24:14 +0000