kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.8.48.

Browse source 
pkgsrc changes:
---------------
Add a patch from Neil Booth to fix PLIST.
Should fix part of pkg/46331.

Upstream changes:
-----------------
Way too long CHANGELOG to list here.
Highlights from upstream are:

E-book viewer: A whole new full screen mode. [0.8.44]
-----------------------------------------------------
Closes tickets: 959830 [External link]

The new mode has no toolbars to distract from the text and the ability to set
the width of the column of text via Preferences in the ebook viewer. Click the
Fullscreen button on the toolbar in the viewer to enter fullscreen mode (or
press the F11 or Ctrl+Shit+F keys)

Support for reading Amazon's new KF8 format [0.8.42]
----------------------------------------------------
calibre can now both view and convert MOBI files that contain Amazon's new KF8
(Kindle Fire) format

Complete changelog is here: http://calibre-ebook.com/whats-new
`
This commit is contained in:
gls 2012-04-22 19:33:01 +00:00
parent 060a83e8f3
commit 8a3cceaf07
6 changed files with 274 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

191
misc/calibre/Makefile
View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.35 2012/03/09 12:34:19 wiz Exp $
# $NetBSD: Makefile,v 1.36 2012/04/22 19:33:01 gls Exp $
#
DISTNAME= calibre-0.8.39
PKGREVISION= 2
DISTNAME= calibre-0.8.48
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
EXTRACT_SUFX= .tar.xz
@ -42,96 +41,100 @@ INSTALLATION_DIRS= share/applications
INSTALLATION_DIRS= share/icons
INSTALLATION_DIRS= share/calibre/recipes
FIX_PYTHON+= recipes/*.recipe
FIX_PYTHON+= resources/catalog/*.py
FIX_PYTHON+= resources/*.py
FIX_PYTHON+= *.py
FIX_PYTHON+= setup/*.py
FIX_PYTHON+= setup/installer/*.py
FIX_PYTHON+= setup/installer/linux/*.py
FIX_PYTHON+= setup/installer/osx/*.py
FIX_PYTHON+= setup/installer/osx/app/*.py
FIX_PYTHON+= setup/installer/windows/*.py
FIX_PYTHON+= src/calibre/*.py
FIX_PYTHON+= src/calibre/customize/*.py
FIX_PYTHON+= src/calibre/db/*.py
FIX_PYTHON+= src/calibre/db/tests/*.py
FIX_PYTHON+= src/calibre/devices/*.py
FIX_PYTHON+= src/calibre/devices/android/*.py
FIX_PYTHON+= src/calibre/devices/eslick/*.py
FIX_PYTHON+= src/calibre/devices/folder_device/*.py
FIX_PYTHON+= src/calibre/devices/iriver/*.py
FIX_PYTHON+= src/calibre/devices/kobo/*.py
FIX_PYTHON+= src/calibre/devices/prs505/*.py
FIX_PYTHON+= src/calibre/devices/prst1/*.py
FIX_PYTHON+= src/calibre/devices/teclast/*.py
FIX_PYTHON+= src/calibre/ebooks/*.py
FIX_PYTHON+= src/calibre/ebooks/chm/*.py
FIX_PYTHON+= src/calibre/ebooks/comic/*.py
FIX_PYTHON+= src/calibre/ebooks/compression/*.py
FIX_PYTHON+= src/calibre/ebooks/conversion/*.py
FIX_PYTHON+= src/calibre/ebooks/conversion/plugins/*.py
FIX_PYTHON+= src/calibre/ebooks/djvu/*.py
FIX_PYTHON+= src/calibre/ebooks/epub/fix/*.py
FIX_PYTHON+= src/calibre/ebooks/epub/*.py
FIX_PYTHON+= src/calibre/ebooks/html/*.py
FIX_PYTHON+= src/calibre/ebooks/iterator/*.py
FIX_PYTHON+= src/calibre/ebooks/lit/*.py
FIX_PYTHON+= src/calibre/ebooks/lrf/html/*.py
FIX_PYTHON+= src/calibre/ebooks/lrf/*.py
FIX_PYTHON+= src/calibre/ebooks/lrf/pylrs/*.py
FIX_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py
FIX_PYTHON+= src/calibre/ebooks/metadata/*.py
FIX_PYTHON+= src/calibre/ebooks/metadata/book/*.py
FIX_PYTHON+= src/calibre/ebooks/metadata/book/*.py
FIX_PYTHON+= src/calibre/ebooks/metadata/sources/*.py
FIX_PYTHON+= src/calibre/ebooks/mobi/*.py
FIX_PYTHON+= src/calibre/ebooks/mobi/writer2/*.py
FIX_PYTHON+= src/calibre/ebooks/odt/__init__.py
FIX_PYTHON+= src/calibre/ebooks/oeb/*.py
FIX_PYTHON+= src/calibre/ebooks/oeb/display/test-cfi/*.py
FIX_PYTHON+= src/calibre/ebooks/oeb/transforms/*.py
FIX_PYTHON+= src/calibre/ebooks/pdf/__init__.py
FIX_PYTHON+= src/calibre/ebooks/pdf/reflow.py
FIX_PYTHON+= src/calibre/ebooks/readability/*.py
FIX_PYTHON+= src/calibre/ebooks/rtf/*.py
FIX_PYTHON+= src/calibre/ebooks/rtf2xml/*.py
FIX_PYTHON+= src/calibre/ebooks/snb/*.py
FIX_PYTHON+= src/calibre/ebooks/textile/*.py
FIX_PYTHON+= src/calibre/ebooks/txt/*.py
FIX_PYTHON+= src/calibre/gui2/*.py
FIX_PYTHON+= src/calibre/gui2/actions/*.py
FIX_PYTHON+= src/calibre/gui2/add_wizard/*.py
FIX_PYTHON+= src/calibre/gui2/catalog/*.py
FIX_PYTHON+= src/calibre/gui2/convert/*.py
FIX_PYTHON+= src/calibre/gui2/dialogs/*.py
FIX_PYTHON+= src/calibre/gui2/library/*.py
FIX_PYTHON+= src/calibre/gui2/metadata/*.py
FIX_PYTHON+= src/calibre/gui2/preferences/*.py
FIX_PYTHON+= src/calibre/gui2/progress_indicator/*.py
FIX_PYTHON+= src/calibre/gui2/tag_browser/*.py
FIX_PYTHON+= src/calibre/gui2/viewer/*.py
FIX_PYTHON+= src/calibre/gui2/wizard/*.py
FIX_PYTHON+= src/calibre/library/*.py
FIX_PYTHON+= src/calibre/library/catalogs/*.py
FIX_PYTHON+= src/calibre/library/server/*.py
FIX_PYTHON+= src/calibre/manual/*.py
FIX_PYTHON+= src/calibre/manual/plugin_examples/helloworld/*.py
FIX_PYTHON+= src/calibre/manual/plugin_examples/interface_demo/*.py
FIX_PYTHON+= src/calibre/trac/*.py
FIX_PYTHON+= src/calibre/translations/*.py
FIX_PYTHON+= src/calibre/utils/*.py
FIX_PYTHON+= src/calibre/utils/fonts/*.py
FIX_PYTHON+= src/calibre/utils/ipc/*.py
FIX_PYTHON+= src/calibre/utils/magick/*.py
FIX_PYTHON+= src/calibre/utils/podofo/*.py
FIX_PYTHON+= src/calibre/utils/pyconsole/*.py
FIX_PYTHON+= src/calibre/utils/wmf/*.py
FIX_PYTHON+= src/calibre/web/feeds/*.py
FIX_PYTHON+= src/calibre/web/feeds/recipes/*.py
FIX_PYTHON+= src/calibre/web/fetch/*.py
FIX_PYTHON+= src/calibre/web/jsbrowser/*.py
FIX_PYTHON+= src/templite/*.py
FIX_PYTHON_PATHS+= recipes/*.recipe
FIX_PYTHON_PATHS+= resources/catalog/*.py
FIX_PYTHON_PATHS+= resources/*.py
FIX_PYTHON_PATHS+= *.py
FIX_PYTHON_PATHS+= setup/*.py
FIX_PYTHON_PATHS+= setup/installer/*.py
FIX_PYTHON_PATHS+= setup/installer/linux/*.py
FIX_PYTHON_PATHS+= setup/installer/osx/*.py
FIX_PYTHON_PATHS+= setup/installer/osx/app/*.py
FIX_PYTHON_PATHS+= setup/installer/windows/*.py
FIX_PYTHON_PATHS+= src/calibre/*.py
FIX_PYTHON_PATHS+= src/calibre/customize/*.py
FIX_PYTHON_PATHS+= src/calibre/db/*.py
FIX_PYTHON_PATHS+= src/calibre/db/tests/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/android/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/eslick/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/folder_device/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/iriver/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/kobo/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/prs505/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/prst1/*.py
FIX_PYTHON_PATHS+= src/calibre/devices/teclast/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/chm/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/comic/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/compression/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/conversion/plugins/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/djvu/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/fix/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/epub/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/html/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/iterator/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/lit/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/html/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/lrf/pylrs/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/markdown/extensions/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/book/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/metadata/sources/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/debug/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/reader/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer2/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/mobi/writer8/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/odt/__init__.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/display/test-cfi/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/oeb/transforms/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/__init__.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/pdf/reflow.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/readability/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/rtf2xml/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/snb/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/textile/*.py
FIX_PYTHON_PATHS+= src/calibre/ebooks/txt/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/actions/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/add_wizard/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/catalog/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/convert/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/dialogs/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/library/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/metadata/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/preferences/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/progress_indicator/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/tag_browser/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/viewer/*.py
FIX_PYTHON_PATHS+= src/calibre/gui2/wizard/*.py
FIX_PYTHON_PATHS+= src/calibre/library/*.py
FIX_PYTHON_PATHS+= src/calibre/library/catalogs/*.py
FIX_PYTHON_PATHS+= src/calibre/library/server/*.py
FIX_PYTHON_PATHS+= src/calibre/manual/*.py
FIX_PYTHON_PATHS+= src/calibre/manual/plugin_examples/helloworld/*.py
FIX_PYTHON_PATHS+= src/calibre/manual/plugin_examples/interface_demo/*.py
FIX_PYTHON_PATHS+= src/calibre/trac/*.py
FIX_PYTHON_PATHS+= src/calibre/translations/*.py
FIX_PYTHON_PATHS+= src/calibre/utils/*.py
FIX_PYTHON_PATHS+= src/calibre/utils/fonts/*.py
FIX_PYTHON_PATHS+= src/calibre/utils/ipc/*.py
FIX_PYTHON_PATHS+= src/calibre/utils/magick/*.py
FIX_PYTHON_PATHS+= src/calibre/utils/podofo/*.py
FIX_PYTHON_PATHS+= src/calibre/utils/pyconsole/*.py
FIX_PYTHON_PATHS+= src/calibre/utils/wmf/*.py
FIX_PYTHON_PATHS+= src/calibre/web/feeds/*.py
FIX_PYTHON_PATHS+= src/calibre/web/feeds/recipes/*.py
FIX_PYTHON_PATHS+= src/calibre/web/fetch/*.py
FIX_PYTHON_PATHS+= src/calibre/web/jsbrowser/*.py
FIX_PYTHON_PATHS+= src/templite/*.py
SUBST_CLASSES+= prefix
SUBST_SED.prefix= -e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
@ -144,7 +147,7 @@ SUBST_CLASSES+= path
SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
SUBST_MESSAGE.path= Fixing path to python.
SUBST_STAGE.path= post-patch
SUBST_FILES.path= ${FIX_PYTHON}
SUBST_FILES.path= ${FIX_PYTHON_PATHS}
# These ones are for replacing python[0-9*] with PYTHONBIN
REPLACE_PYTHON+= recipes/animal_politico.recipe

80
misc/calibre/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.11 2012/02/16 21:29:36 gls Exp $
@comment $NetBSD: PLIST,v 1.12 2012/04/22 19:33:01 gls Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@ -268,6 +268,7 @@ lib/calibre/calibre/ebooks/metadata/epub.py
lib/calibre/calibre/ebooks/metadata/ereader.py
lib/calibre/calibre/ebooks/metadata/extz.py
lib/calibre/calibre/ebooks/metadata/fb2.py
lib/calibre/calibre/ebooks/metadata/haodoo.py
lib/calibre/calibre/ebooks/metadata/html.py
lib/calibre/calibre/ebooks/metadata/imp.py
lib/calibre/calibre/ebooks/metadata/kdl.py
@ -299,6 +300,7 @@ lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
lib/calibre/calibre/ebooks/metadata/sources/ozon.py
lib/calibre/calibre/ebooks/metadata/sources/test.py
lib/calibre/calibre/ebooks/metadata/sources/worker.py
lib/calibre/calibre/ebooks/metadata/toc.py
lib/calibre/calibre/ebooks/metadata/topaz.py
lib/calibre/calibre/ebooks/metadata/txt.py
@ -306,22 +308,38 @@ lib/calibre/calibre/ebooks/metadata/worker.py
lib/calibre/calibre/ebooks/metadata/xisbn.py
lib/calibre/calibre/ebooks/metadata/zip.py
lib/calibre/calibre/ebooks/mobi/__init__.py
lib/calibre/calibre/ebooks/mobi/debug.py
lib/calibre/calibre/ebooks/mobi/debug/__init__.py
lib/calibre/calibre/ebooks/mobi/debug/headers.py
lib/calibre/calibre/ebooks/mobi/debug/index.py
lib/calibre/calibre/ebooks/mobi/debug/main.py
lib/calibre/calibre/ebooks/mobi/debug/mobi6.py
lib/calibre/calibre/ebooks/mobi/debug/mobi8.py
lib/calibre/calibre/ebooks/mobi/huffcdic.py
lib/calibre/calibre/ebooks/mobi/langcodes.py
lib/calibre/calibre/ebooks/mobi/mobiml.py
lib/calibre/calibre/ebooks/mobi/reader.py
lib/calibre/calibre/ebooks/mobi/reader/__init__.py
lib/calibre/calibre/ebooks/mobi/reader/headers.py
lib/calibre/calibre/ebooks/mobi/reader/index.py
lib/calibre/calibre/ebooks/mobi/reader/markup.py
lib/calibre/calibre/ebooks/mobi/reader/mobi6.py
lib/calibre/calibre/ebooks/mobi/reader/mobi8.py
lib/calibre/calibre/ebooks/mobi/reader/ncx.py
lib/calibre/calibre/ebooks/mobi/utils.py
lib/calibre/calibre/ebooks/mobi/writer.py
lib/calibre/calibre/ebooks/mobi/writer2/__init__.py
lib/calibre/calibre/ebooks/mobi/writer2/indexer.py
lib/calibre/calibre/ebooks/mobi/writer2/main.py
lib/calibre/calibre/ebooks/mobi/writer2/resources.py
lib/calibre/calibre/ebooks/mobi/writer2/serializer.py
lib/calibre/calibre/ebooks/mobi/writer8/__init__.py
lib/calibre/calibre/ebooks/mobi/writer8/main.py
lib/calibre/calibre/ebooks/mobi/writer8/skeleton.py
lib/calibre/calibre/ebooks/odt/__init__.py
lib/calibre/calibre/ebooks/odt/input.py
lib/calibre/calibre/ebooks/oeb/__init__.py
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/parse_utils.py
lib/calibre/calibre/ebooks/oeb/reader.py
@ -353,6 +371,8 @@ lib/calibre/calibre/ebooks/pdb/ereader/reader202.py
lib/calibre/calibre/ebooks/pdb/ereader/writer.py
lib/calibre/calibre/ebooks/pdb/formatreader.py
lib/calibre/calibre/ebooks/pdb/formatwriter.py
lib/calibre/calibre/ebooks/pdb/haodoo/__init__.py
lib/calibre/calibre/ebooks/pdb/haodoo/reader.py
lib/calibre/calibre/ebooks/pdb/header.py
lib/calibre/calibre/ebooks/pdb/palmdoc/__init__.py
lib/calibre/calibre/ebooks/pdb/palmdoc/reader.py
@ -822,7 +842,6 @@ 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
lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
lib/calibre/calibre/gui2/store/stores/wizards_tower_books_plugin.py
lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
lib/calibre/calibre/gui2/store/stores/zixo_plugin.py
@ -951,6 +970,7 @@ 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
lib/calibre/calibre/utils/ipc/__init__.py
lib/calibre/calibre/utils/ipc/job.py
@ -1086,6 +1106,7 @@ share/bash_completion.d/calibre
share/calibre/builtin_recipes.xml
share/calibre/builtin_recipes.zip
share/calibre/calibre-portable.bat
share/calibre/calibre-portable.sh
share/calibre/catalog/DefaultCover.jpg
share/calibre/catalog/mastheadImage.gif
share/calibre/catalog/section_list_templates.py
@ -1142,6 +1163,7 @@ 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
share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
share/calibre/fonts/liberation/LiberationMono-Italic.ttf
@ -1354,6 +1376,7 @@ share/calibre/recipes/abc_au.recipe
share/calibre/recipes/abc_es.recipe
share/calibre/recipes/abc_py.recipe
share/calibre/recipes/accountancyage.recipe
share/calibre/recipes/acim_bilim_dergisi.recipe
share/calibre/recipes/ad.recipe
share/calibre/recipes/adevarul.recipe
share/calibre/recipes/adnkronos.recipe
@ -1369,6 +1392,7 @@ share/calibre/recipes/akter.recipe
share/calibre/recipes/al_ahram.recipe
share/calibre/recipes/al_jazeera.recipe
share/calibre/recipes/al_masry_al_youm.recipe
share/calibre/recipes/albert_mohler.recipe
share/calibre/recipes/alo_novine.recipe
share/calibre/recipes/alt_om_herning.recipe
share/calibre/recipes/alternet.recipe
@ -1393,6 +1417,7 @@ share/calibre/recipes/archeowiesci.recipe
share/calibre/recipes/arizona_republic.recipe
share/calibre/recipes/ars_technica.recipe
share/calibre/recipes/asia_one.recipe
share/calibre/recipes/asianreviewofbooks.recipe
share/calibre/recipes/astro_news_pl.recipe
share/calibre/recipes/astronomia_pl.recipe
share/calibre/recipes/athens_news.recipe
@ -1410,6 +1435,7 @@ share/calibre/recipes/axxon_news.recipe
share/calibre/recipes/azstarnet.recipe
share/calibre/recipes/b365realitatea.recipe
share/calibre/recipes/b92.recipe
share/calibre/recipes/ba_herald.recipe
share/calibre/recipes/babyonline.recipe
share/calibre/recipes/balkaninsight.recipe
share/calibre/recipes/baltimore_sun.recipe
@ -1448,7 +1474,6 @@ share/calibre/recipes/blic.recipe
share/calibre/recipes/blog_da_cidadania.recipe
share/calibre/recipes/blues.recipe
share/calibre/recipes/boortz.recipe
share/calibre/recipes/borba.recipe
share/calibre/recipes/borse_online.recipe
share/calibre/recipes/boston.com.recipe
share/calibre/recipes/brand_eins.recipe
@ -1470,6 +1495,7 @@ share/calibre/recipes/caijing.recipe
share/calibre/recipes/calcalist.recipe
share/calibre/recipes/calgary_herald.recipe
share/calibre/recipes/calibre_blog.recipe
share/calibre/recipes/camera_di_commercio_di_bari.recipe
share/calibre/recipes/canardpc.recipe
share/calibre/recipes/capes_n_babes.recipe
share/calibre/recipes/capital.recipe
@ -1480,6 +1506,7 @@ share/calibre/recipes/carta.recipe
share/calibre/recipes/carta_capital.recipe
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/cbc_canada.recipe
share/calibre/recipes/cbn.recipe
@ -1499,6 +1526,7 @@ share/calibre/recipes/chowk.recipe
share/calibre/recipes/chr_mon.recipe
share/calibre/recipes/christian_post.recipe
share/calibre/recipes/cicero.recipe
share/calibre/recipes/ciekawostki_historyczne.recipe
share/calibre/recipes/cincinnati_enquirer.recipe
share/calibre/recipes/cinco_dias.recipe
share/calibre/recipes/cinebel_be.recipe
@ -1523,6 +1551,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/consortium_news.recipe
share/calibre/recipes/consumerist.recipe
share/calibre/recipes/corren2.recipe
share/calibre/recipes/corriere_della_sera_en.recipe
@ -1577,6 +1606,7 @@ share/calibre/recipes/deredactie.recipe
share/calibre/recipes/derin_dusunce.recipe
share/calibre/recipes/descopera.recipe
share/calibre/recipes/descopera_org.recipe
share/calibre/recipes/desiring_god.recipe
share/calibre/recipes/detroit_news.recipe
share/calibre/recipes/deutsche_welle_bs.recipe
share/calibre/recipes/deutsche_welle_en.recipe
@ -1630,6 +1660,7 @@ share/calibre/recipes/ecotrend.recipe
share/calibre/recipes/ecuisine.recipe
share/calibre/recipes/edge_conversations.recipe
share/calibre/recipes/editor_and_publisher.recipe
share/calibre/recipes/editoriali.recipe
share/calibre/recipes/edmonton_journal.recipe
share/calibre/recipes/egirl.recipe
share/calibre/recipes/eioba.recipe
@ -1725,6 +1756,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/fotoblogia_pl.recipe
share/calibre/recipes/foxnews.recipe
share/calibre/recipes/fr_online.recipe
share/calibre/recipes/frandroid.recipe
@ -1743,6 +1775,7 @@ share/calibre/recipes/futurismic.recipe
share/calibre/recipes/galicia_confidential.recipe
share/calibre/recipes/gamasutra_fa.recipe
share/calibre/recipes/gamasutra_news.recipe
share/calibre/recipes/gameplay_pl.recipe
share/calibre/recipes/gamespot.recipe
share/calibre/recipes/gandul.recipe
share/calibre/recipes/gawker.recipe
@ -1817,6 +1850,7 @@ share/calibre/recipes/hindu_business_line.recipe
share/calibre/recipes/hindustan_times.recipe
share/calibre/recipes/hira.recipe
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/hitro.recipe
@ -1854,6 +1888,7 @@ share/calibre/recipes/ilmanifesto.recipe
share/calibre/recipes/ilsole24ore.recipe
share/calibre/recipes/imperatortravel.recipe
share/calibre/recipes/impulse_de.recipe
share/calibre/recipes/in4_pl.recipe
share/calibre/recipes/in_gr.recipe
share/calibre/recipes/inc.recipe
share/calibre/recipes/independent.recipe
@ -1863,6 +1898,7 @@ share/calibre/recipes/indian_express.recipe
share/calibre/recipes/indy_star.recipe
share/calibre/recipes/infobae.recipe
share/calibre/recipes/infomotori.recipe
share/calibre/recipes/informacje_usa.recipe
share/calibre/recipes/information_dk.recipe
share/calibre/recipes/infoworld.recipe
share/calibre/recipes/infra_pl.recipe
@ -1877,10 +1913,13 @@ share/calibre/recipes/ionline_pt.recipe
share/calibre/recipes/iprofesional.recipe
share/calibre/recipes/irish_independent.recipe
share/calibre/recipes/irish_times.recipe
share/calibre/recipes/ivanamilakovic.recipe
share/calibre/recipes/izdiham.com.recipe
share/calibre/recipes/izvestia.recipe
share/calibre/recipes/jakarta_globe.recipe
share/calibre/recipes/jakarta_post.recipe
share/calibre/recipes/jalopnik.recipe
share/calibre/recipes/japaa.recipe
share/calibre/recipes/japan_news.recipe
share/calibre/recipes/japan_times.recipe
share/calibre/recipes/javalobby.recipe
@ -1913,6 +1952,7 @@ share/calibre/recipes/kidney.recipe
share/calibre/recipes/kitsapun.recipe
share/calibre/recipes/kleinezeitung.recipe
share/calibre/recipes/klip_me.recipe
share/calibre/recipes/klubknjige.recipe
share/calibre/recipes/komchadluek.recipe
share/calibre/recipes/kommersant.recipe
share/calibre/recipes/kompas.recipe
@ -1924,6 +1964,7 @@ share/calibre/recipes/korea_herald.recipe
share/calibre/recipes/korespondent.recipe
share/calibre/recipes/kosmonauta_pl.recipe
share/calibre/recipes/kotaku.recipe
share/calibre/recipes/kresy_pl.recipe
share/calibre/recipes/krstarica.recipe
share/calibre/recipes/krstarica_en.recipe
share/calibre/recipes/ksiazka_pl.recipe
@ -1937,6 +1978,7 @@ share/calibre/recipes/la_diaria.recipe
share/calibre/recipes/la_gazzeta_dello_sport.recipe
share/calibre/recipes/la_jornada.recipe
share/calibre/recipes/la_nueva.recipe
share/calibre/recipes/la_pausa_caffe.recipe
share/calibre/recipes/la_razon_bo.recipe
share/calibre/recipes/la_republica.recipe
share/calibre/recipes/la_rioja.recipe
@ -1978,13 +2020,16 @@ share/calibre/recipes/levante.recipe
share/calibre/recipes/lexpress.recipe
share/calibre/recipes/liberation.recipe
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/lifehacker.recipe
share/calibre/recipes/limes.recipe
share/calibre/recipes/linux_magazine.recipe
share/calibre/recipes/linuxdevices.recipe
share/calibre/recipes/livemint.recipe
share/calibre/recipes/living_digital.recipe
share/calibre/recipes/living_stones.recipe
share/calibre/recipes/lomza.recipe
share/calibre/recipes/london_free_press.recipe
share/calibre/recipes/los_tiempos_bo.recipe
@ -2017,6 +2062,7 @@ share/calibre/recipes/mediafax.recipe
share/calibre/recipes/mediaindonesia.recipe
share/calibre/recipes/mediapart.recipe
share/calibre/recipes/medscape.recipe
share/calibre/recipes/melbourne_herald_sun.recipe
share/calibre/recipes/men24_gr.recipe
share/calibre/recipes/menorca.recipe
share/calibre/recipes/mens_health.recipe
@ -2028,6 +2074,7 @@ share/calibre/recipes/metro_uk.recipe
share/calibre/recipes/miami_herald.recipe
share/calibre/recipes/michalkiewicz.recipe
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/ming_pao.recipe
@ -2111,6 +2158,7 @@ share/calibre/recipes/novaya_gazeta.recipe
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.recipe
share/calibre/recipes/novistandard.recipe
share/calibre/recipes/novosti.recipe
@ -2120,6 +2168,7 @@ 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/nspm.recipe
share/calibre/recipes/nspm_int.recipe
share/calibre/recipes/ntv_spor.recipe
@ -2142,6 +2191,7 @@ share/calibre/recipes/observatorul_cultural.recipe
share/calibre/recipes/observer.recipe
share/calibre/recipes/observer_gb.recipe
share/calibre/recipes/oc_register.recipe
share/calibre/recipes/oclab_pl.recipe
share/calibre/recipes/office_space.recipe
share/calibre/recipes/oilprice.recipe
share/calibre/recipes/oldnewthing.recipe
@ -2160,14 +2210,19 @@ share/calibre/recipes/osnews_pl.recipe
share/calibre/recipes/ottawa_citizen.recipe
share/calibre/recipes/ourdailybread.recipe
share/calibre/recipes/outlook_india.recipe
share/calibre/recipes/overclock_pl.recipe
share/calibre/recipes/pagina12.recipe
share/calibre/recipes/pagina_12_print_ed.recipe
share/calibre/recipes/pajama.recipe
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/patente_de_corso.recipe
share/calibre/recipes/pc_advisor.recipe
share/calibre/recipes/pc_arena.recipe
share/calibre/recipes/pc_centre_pl.recipe
share/calibre/recipes/pc_foster.recipe
share/calibre/recipes/pc_lab.recipe
share/calibre/recipes/pc_mag.recipe
share/calibre/recipes/pc_quest_india.recipe
@ -2197,6 +2252,7 @@ share/calibre/recipes/politika.recipe
share/calibre/recipes/politiken_dk.recipe
share/calibre/recipes/polityka.recipe
share/calibre/recipes/polizeipress_de.recipe
share/calibre/recipes/polska_times.recipe
share/calibre/recipes/popscience.recipe
share/calibre/recipes/portafolio.recipe
share/calibre/recipes/portfolio.recipe
@ -2221,8 +2277,10 @@ share/calibre/recipes/psychologies.recipe
share/calibre/recipes/publico.recipe
share/calibre/recipes/publika.recipe
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/racjonalista_pl.recipe
share/calibre/recipes/radikal_tr.recipe
share/calibre/recipes/radio_prague.recipe
share/calibre/recipes/radio_praha.recipe
@ -2239,6 +2297,7 @@ share/calibre/recipes/replicavedetelor.recipe
share/calibre/recipes/reptantes.recipe
share/calibre/recipes/republica.recipe
share/calibre/recipes/republika.recipe
share/calibre/recipes/resurgence.recipe
share/calibre/recipes/reuters.recipe
share/calibre/recipes/reuters_ja.recipe
share/calibre/recipes/revista_bla.recipe
@ -2277,6 +2336,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/satmagazine.recipe
share/calibre/recipes/sb_nation.recipe
share/calibre/recipes/science_aas.recipe
share/calibre/recipes/science_based_medicine.recipe
@ -2319,6 +2379,7 @@ share/calibre/recipes/smith.recipe
share/calibre/recipes/snopes.recipe
share/calibre/recipes/socialdiva.recipe
share/calibre/recipes/soldiers.recipe
share/calibre/recipes/southernstar.recipe
share/calibre/recipes/spektrum.recipe
share/calibre/recipes/spiders_web_pl.recipe
share/calibre/recipes/spiegel_int.recipe
@ -2346,6 +2407,7 @@ share/calibre/recipes/sunday_times.recipe
share/calibre/recipes/superbebe.recipe
share/calibre/recipes/superesportes.recipe
share/calibre/recipes/svd_se.recipe
share/calibre/recipes/swiat_obrazu.recipe
share/calibre/recipes/swiatkindle.recipe
share/calibre/recipes/tablety_pl.recipe
share/calibre/recipes/tabu.recipe
@ -2355,6 +2417,7 @@ share/calibre/recipes/taggeschau_de.recipe
share/calibre/recipes/taipei.recipe
share/calibre/recipes/tanea.recipe
share/calibre/recipes/tanjug.recipe
share/calibre/recipes/tanuki.recipe
share/calibre/recipes/tasfiye_dergisi.recipe
share/calibre/recipes/taz.recipe
share/calibre/recipes/taz_rss.recipe
@ -2409,6 +2472,7 @@ share/calibre/recipes/tijd.recipe
share/calibre/recipes/tijolaco.recipe
share/calibre/recipes/tillsonburg.recipe
share/calibre/recipes/time_magazine.recipe
share/calibre/recipes/times_of_malta.recipe
share/calibre/recipes/times_online.recipe
share/calibre/recipes/timesnewroman.recipe
share/calibre/recipes/tmz.recipe
@ -2433,6 +2497,7 @@ share/calibre/recipes/tulsaworld.recipe
share/calibre/recipes/tuttojove.recipe
share/calibre/recipes/tuttosport.recipe
share/calibre/recipes/tvmania.recipe
share/calibre/recipes/tvn24.recipe
share/calibre/recipes/tvxs.recipe
share/calibre/recipes/tweakers.recipe
share/calibre/recipes/tweakers_net.recipe
@ -2468,7 +2533,6 @@ share/calibre/recipes/vitalia.recipe
share/calibre/recipes/viva.recipe
share/calibre/recipes/vnexpress.recipe
share/calibre/recipes/volksrant.recipe
share/calibre/recipes/volksrant_sub.recipe
share/calibre/recipes/vreme.recipe
share/calibre/recipes/vrijnederland.recipe
share/calibre/recipes/waco_tribune.recipe
@ -2479,6 +2543,7 @@ share/calibre/recipes/wapo_cartoons.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
@ -2522,6 +2587,7 @@ share/calibre/recipes/zdnet.fr.recipe
share/calibre/recipes/zdnet.recipe
share/calibre/recipes/zeitde.recipe
share/calibre/recipes/zeitde_sub.recipe
share/calibre/recipes/zerocalcare.recipe
share/calibre/recipes/zerohedge.recipe
share/calibre/recipes/ziarulfinanciar.recipe
share/calibre/recipes/ziuaveche.recipe

13
misc/calibre/distinfo
View file

@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.10 2012/02/16 21:29:36 gls Exp $
$NetBSD: distinfo,v 1.11 2012/04/22 19:33:01 gls Exp $
SHA1 (calibre-0.8.39.tar.xz) = 842baff5f98c579ee4b7b28e4b8240f15e7de5e7
RMD160 (calibre-0.8.39.tar.xz) = 3d8ed5ae5073329dea7952422cf06691f8ce1803
Size (calibre-0.8.39.tar.xz) = 23788948 bytes
SHA1 (patch-src_calibre_devices_scanner.py) = 3d4ba3d9075898866cdb499f65258022224e5812
SHA1 (calibre-0.8.48.tar.xz) = 9d70769ad0fe2352e7b57a497c93358a5c92f21b
RMD160 (calibre-0.8.48.tar.xz) = a028dd20429316ce903a730d809e5aaa85e1c92c
Size (calibre-0.8.48.tar.xz) = 24487952 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) = 0f4b9c09d2a6de22ca0044895e1ab35184ae7d72
SHA1 (patch-src_calibre_linux_py) = 04ae3325d88903e155280c65a8375d90a11a2ff0

16
misc/calibre/patches/patch-src_calibre_constants.py Normal file
View file

@ -0,0 +1,16 @@
$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

4
misc/calibre/patches/patch-src_calibre_devices_scanner.py
View file

@ -1,4 +1,6 @@
$NetBSD: patch-src_calibre_devices_scanner.py,v 1.1 2012/02/16 21:29:36 gls Exp $
$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

147
misc/calibre/patches/patch-src_calibre_linux_py
View file

@ -1,16 +1,16 @@
$NetBSD: patch-src_calibre_linux_py,v 1.1 2011/10/27 20:40:02 gls Exp $
$NetBSD: patch-src_calibre_linux_py,v 1.2 2012/04/22 19:33:01 gls Exp $
Lifted from ArchLinux, saves mime and desktop files on disk
instead of trying to add them directly.
--- src/calibre/linux.py.orig Sun Jul 17 13:26:34 2011
+++ src/calibre/linux.py Sun Jul 17 13:37:59 2011
@@ -140,19 +140,7 @@ class PostInstall:
--- src/calibre/linux.py.orig 2012-04-13 04:21:01.000000000 +0000
+++ src/calibre/linux.py
@@ -180,18 +180,6 @@ class PostInstall:
self.install_man_pages()
if islinux or isbsd:
self.setup_desktop_integration()
- self.create_uninstaller()
-
- from calibre.utils.config import config_dir
- if os.path.exists(config_dir):
- os.chdir(config_dir)
@ -21,11 +21,19 @@ 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))
for args, kwargs in self.warnings:
@@ -321,7 +309,7 @@ class PostInstall:
@@ -235,7 +223,7 @@ class PostInstall:
if os.path.exists(bc):
f = os.path.join(bc, 'calibre')
else:
- if isnetbsd:
+ if isbsd:
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:
@ -34,73 +42,74 @@ instead of trying to add them directly.
self.info('\tInstalling MAN page for', prog)
open(manfile, 'wb').write(raw)
self.manifest.append(manfile)
@@ -339,51 +327,39 @@ class PostInstall:
@@ -382,50 +370,40 @@ 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)
- 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)
- 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)
- 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)
- 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'))
+
with TemporaryDirectory() as tdir:
with CurrentDir(tdir):
- 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)
- 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)
- 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)
- 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)
- 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'))
mimetypes = set([])
for x in all_input_formats():
mt = guess_type('dummy.'+x)[0]
- if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
mimetypes.add(mt)
mimetypes = set([])
for x in all_input_formats():
mt = guess_type('dummy.'+x)[0]
- if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
mimetypes.add(mt)
def write_mimetypes(f):
f.write('MimeType=%s;\n'%';'.join(mimetypes))
def write_mimetypes(f):
f.write('MimeType=%s;\n'%';'.join(mimetypes))
- f = open('calibre-lrfviewer.desktop', 'wb')
+ 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')
f.write(EVIEWER)
write_mimetypes(f)
f.close()
- f = open('calibre-gui.desktop', 'wb')
+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
f.write(GUI)
write_mimetypes(f)
f.close()
- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
- 'calibre-ebook-viewer.desktop')
- for x in des:
- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
- check_call(' '.join(cmd), shell=True)
- self.menu_resources.append(x)
- check_call(['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')
f.write(MIME)
f.close()
- self.mime_resources.append('calibre-mimetypes')
- check_call('xdg-mime install ./calibre-mimetypes', shell=True)
- 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)
f.close()
- f = open('calibre-ebook-viewer.desktop', 'wb')
+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
f.write(EVIEWER)
write_mimetypes(f)
f.close()
- f = open('calibre-gui.desktop', 'wb')
+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
f.write(GUI)
write_mimetypes(f)
f.close()
- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
- 'calibre-ebook-viewer.desktop')
- for x in des:
- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
- check_call(' '.join(cmd), shell=True)
- self.menu_resources.append(x)
- check_call(['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')
f.write(MIME)
f.close()
- self.mime_resources.append('calibre-mimetypes')
- check_call('xdg-mime install ./calibre-mimetypes', shell=True)
except Exception:
if self.opts.fatal_errors:
raise
@@ -521,7 +497,7 @@ GUI = '''\
@@ -563,7 +541,7 @@ GUI = '''\
[Desktop Entry]
Version=1.0
Type=Application