Changeset 15584 in niluje


Ignore:
Timestamp:
Dec 9, 2018, 10:43:48 PM (6 months ago)
Author:
NiLuJe
Message:

Portage:

  • Refresh app-text/calibre patchset
Location:
Portage/trunk/app-text/calibre
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • Portage/trunk/app-text/calibre/Manifest

    r15579 r15584  
    77AUX calibre-2.27.0-remap-and-dither-kobo-grayscale-covers.patch 34483 BLAKE2B a9a56c32d71a62b5439f255e68103d5c373ede36a622ba75d1e5b9c7d364043f10b730545162d744b63ac05d1b20c51e22c59a7756b970e088210a61690c8097 SHA512 06163fc3ac2b4a407ad2e75134d82a3221730d441a4d88d1bb59bf70df965849df11ae73feb0131d709a433cec176a05dc3521cb165c4b1c2e69e46c521546bb
    88AUX calibre-2.80.0-prefer-kf8.patch 870 BLAKE2B fb814fa7bd45d832417761e07ec7cea803d1ec192de411b547d6b1f17929c38d9c5a6eb8fb11d39cd15ef608b7994264d56d73271f272227c638d4ffc6cd9263 SHA512 54adfb333c894ef0bb0d7217aff94fa6dd2400695e26522fdc3e0fefe95e1cb6c3dd48194ce863312b06cc16a7d22d25b49842d2beecf60560def3ab30a9cac0
    9 AUX calibre-3.27.1-remap-and-dither-kobo-grayscale-covers.patch 31592 BLAKE2B 6e85fd4555d47a1e693aefc84f9b3735c3220e648115397745c98ae308cd5acf5c294b0f70edccff79c4dd141496ee5a2ba150aa0a84a8678f6e63effb3c2109 SHA512 8addd33446a4ed8fd7bd7e7aaac7b63c7dae1db649b2d31e377a92ba70eafc3a066bb4022adee38e74feef53bc9ee6bc59735242a6dc0618e848ac5926a2e632
     9AUX calibre-3.35.0-remap-and-dither-kobo-grayscale-covers.patch 31513 BLAKE2B cdb41c83031aa26e504f3d6799f36a5a6ca298096850286feed63177fa61553b1984599743af9f5caf00835a9d00b7ed279353666efcf8992173de3c63f519d5 SHA512 d29b383b137492899335e8e07ca1cebfcc3530afe57784096d8a93cd995c04149bd9ff742f5fe1f3ec3d2a5a8e49542a3fa2ddeab0980c85eadf18a86c7f5a1f
    1010AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
    1111AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
    1212AUX eink_colors.gif 377 BLAKE2B 38ca49e77e0f01cb022e71e6c1c8e44e9a3b320e84ad4913c89470bd876008b33d0d571de243faef92eb49c09599b2da4295e2ac667da95f3d904c07f910550a SHA512 1c03ae70fe620fb912d438f562a5542edbb4a3181f541295c187582c7913b7e156bcafe7fd2f99ee7238107267c9ccf0c07889a65fbb5b37de14c11b93dd1510
    1313DIST calibre-3.35.0.tar.xz 39482684 BLAKE2B acf61ad52b9de4ab87913d536890f1f74cd4bca656ec275cd5fe21d6bbb4b97792d7f13f40b85b61f7a27745be2aedfff8b6deb9f8dff980f6f30596c184f1f2 SHA512 c81a00832c812603e5c5752f47ad322fcd9aa5079273385af2e0d8813bf04c4b84cca40210d53207c5b52ac4975ecec725f5560cb3c629f4afe9150229138b0d
    14 EBUILD calibre-3.35.0.ebuild 10264 BLAKE2B 742f2ccf95bed7124266584583f4605cbda7726139fc9da8bf4c35de8dcebba9cd0eb2c9bf23eb8363c378c75201456e7ac79ce4779b296c0eb974ffe21c6576 SHA512 fcd70cf509d351615b418f70484fddca63df99962785d94c31df1e0bbf271ca7afacb7d2c66ecb42fb19ef6243510f9455d2e0e8e9d24940ed69d527c6380a4c
     14EBUILD calibre-3.35.0.ebuild 10264 BLAKE2B 6095e205f2f9a38026c3c91ccd26dee6943972caf881fd86b086faa9e3dcca4cb879154e32e94071877823fb276bd436b4e59a3032381eed4f787d1285136ed6 SHA512 35e40908eeefbca65d9fc40165e19e7bab8a7622a1da88c872adcbf9358aa21bd46cfc304d7982ee7a823d18baeaba6932c8a571ecae639513bd0d5c2d358239
  • Portage/trunk/app-text/calibre/calibre-3.35.0.ebuild

    r15579 r15584  
    126126        #cp "${FILESDIR}/eink_colors.gif" resources/magick || die "failed to copy eink palette"
    127127        # Wheee, finally updated this!
    128         epatch "${FILESDIR}/${PN}-3.27.1-remap-and-dither-kobo-grayscale-covers.patch"
     128        epatch "${FILESDIR}/${PN}-3.35.0-remap-and-dither-kobo-grayscale-covers.patch"
    129129
    130130        # Catch up to current upstream...
  • Portage/trunk/app-text/calibre/files/calibre-3.35.0-remap-and-dither-kobo-grayscale-covers.patch

    r15583 r15584  
    11diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
    2 index cbc4c2e6d1..3e5b933c7d 100644
     2index 6ca3d44e7b..eef42efc2d 100644
    33--- a/src/calibre/devices/kobo/driver.py
    44+++ b/src/calibre/devices/kobo/driver.py
    5 @@ -3,7 +3,7 @@
    6  from __future__ import division
     5@@ -4,7 +4,7 @@ from __future__ import division
     6 from __future__ import print_function
    77 
    88 __license__   = 'GPL v3'
     
    1212 
    1313 '''
    14 @@ -13,7 +13,7 @@ Originally developed by Timothy Legge <timlegge@gmail.com>.
     14@@ -14,7 +14,7 @@ Originally developed by Timothy Legge <timlegge@gmail.com>.
    1515 Extended to support Touch firmware 2.0.0 and later and newer devices by David Forrester <davidfor@internode.on.net>
    1616 '''
     
    2020 
    2121 from contextlib import closing
    22  from calibre.devices.usbms.books import BookList
    23 @@ -147,10 +147,12 @@ class KOBO(USBMS):
     22 from datetime import datetime
     23@@ -153,10 +153,12 @@ class KOBO(USBMS):
    2424     OPT_COLLECTIONS    = 0
    2525     OPT_UPLOAD_COVERS  = 1
     
    3838     def __init__(self, *args, **kwargs):
    3939         USBMS.__init__(self, *args, **kwargs)
    40 @@ -973,13 +975,23 @@ class KOBO(USBMS):
     40@@ -995,13 +997,23 @@ class KOBO(USBMS):
    4141         else:
    4242             uploadgrayscale = True
     
    6464         if metadata.cover:
    6565             cover = self.normalize_path(metadata.cover.replace('/', os.sep))
    66 @@ -1026,9 +1038,13 @@ class KOBO(USBMS):
     66@@ -1048,9 +1060,13 @@ class KOBO(USBMS):
    6767                             with lopen(cover, 'rb') as f:
    6868                                 data = f.read()
     
    8080                             with lopen(fpath, 'wb') as f:
    8181                                 f.write(data)
    82 @@ -1073,10 +1089,12 @@ class KOBO(USBMS):
     82@@ -1095,10 +1111,12 @@ class KOBO(USBMS):
    8383         OPT_COLLECTIONS    = 0
    8484         OPT_UPLOAD_COVERS  = 1
     
    9797         p = {}
    9898         p['format_map'] = old_settings.format_map
    99 @@ -1090,6 +1108,8 @@ class KOBO(USBMS):
     99@@ -1112,6 +1130,8 @@ class KOBO(USBMS):
    100100 
    101101         p['upload_covers'] = old_settings.extra_customization[OPT_UPLOAD_COVERS]
     
    106106         p['show_expired_books'] = old_settings.extra_customization[OPT_SHOW_EXPIRED_BOOK_RECORDS]
    107107         p['show_previews'] = old_settings.extra_customization[OPT_SHOW_PREVIEWS]
    108 @@ -1316,9 +1336,9 @@ class KOBO(USBMS):
     108@@ -1338,9 +1358,9 @@ class KOBO(USBMS):
    109109 
    110110 class KOBOTOUCH(KOBO):
     
    118118 #    icon        = I('devices/kobotouch.jpg')
    119119 
    120 @@ -1431,6 +1451,20 @@ class KOBOTOUCH(KOBO):
     120@@ -1455,6 +1475,20 @@ class KOBOTOUCH(KOBO):
    121121                           # Used for Details screen from FW2.8.1
    122122                           ' - AndroidBookLoadTablet_Aspect.parsed':[(355,  471), 88, 100,False,],
     
    139139                           # Used for screensaver, home screen
    140140                           ' - N3_FULL.parsed':        [(1404,1872), 0, 200,True,],
    141 @@ -1470,7 +1504,7 @@ class KOBOTOUCH(KOBO):
     141@@ -1502,7 +1536,7 @@ class KOBOTOUCH(KOBO):
    142142         # Just dump some info to the logs.
    143143         super(KOBOTOUCH, self).open_osx()
     
    148148             if DEBUG:
    149149                 from calibre.constants import plugins
    150 @@ -2470,7 +2504,7 @@ class KOBOTOUCH(KOBO):
     150@@ -2554,7 +2588,7 @@ class KOBOTOUCH(KOBO):
    151151 
    152152 #        debug_print('KoboTouch: uploading cover')
     
    157157             debug_print('KoboTouch: FAILED to upload cover=%s Exception=%s'%(filepath, str(e)))
    158158 
    159 @@ -2499,7 +2533,10 @@ class KOBOTOUCH(KOBO):
     159@@ -2583,7 +2617,10 @@ class KOBOTOUCH(KOBO):
    160160             path = os.path.join(path, imageId)
    161161         return path
     
    169169             library_aspect = library_size[0] / library_size[1]
    170170             kobo_aspect = kobo_size[0] / kobo_size[1]
    171 @@ -2507,9 +2544,12 @@ class KOBOTOUCH(KOBO):
     171@@ -2591,9 +2628,12 @@ class KOBOTOUCH(KOBO):
    172172                 kobo_size = (kobo_size[0], int(kobo_size[0] / library_aspect))
    173173             else:
     
    184184         This will generate the new cover image from the cover in the library. It is a wrapper
    185185         for save_cover_data_to to allow it to be overriden in a subclass. For this reason,
    186 @@ -2517,21 +2557,28 @@ class KOBOTOUCH(KOBO):
     186@@ -2601,21 +2641,28 @@ class KOBOTOUCH(KOBO):
    187187 
    188188         :param cover_data:    original cover data
     
    216216         debug_print("KoboTouch:_upload_cover - filename='%s' upload_grayscale='%s' "%(filename, upload_grayscale))
    217217 
    218 @@ -2576,7 +2623,7 @@ class KOBOTOUCH(KOBO):
     218@@ -2660,7 +2707,7 @@ class KOBOTOUCH(KOBO):
    219219 
    220220                 image_dir = os.path.dirname(os.path.abspath(path))
     
    225225 
    226226                 with lopen(cover, 'rb') as f:
    227 @@ -2588,8 +2635,8 @@ class KOBOTOUCH(KOBO):
     227@@ -2672,8 +2719,8 @@ class KOBOTOUCH(KOBO):
    228228                 for ending, cover_options in self.cover_file_endings().items():
    229229                     kobo_size, min_dbversion, max_dbversion, is_full_size = cover_options
     
    236236                     if self.dbversion >= min_dbversion and self.dbversion <= max_dbversion:
    237237                         if show_debug:
    238 @@ -2597,14 +2644,35 @@ class KOBOTOUCH(KOBO):
     238@@ -2681,14 +2728,35 @@ class KOBOTOUCH(KOBO):
    239239                         fpath = path + ending
    240240                         fpath = self.normalize_path(fpath.replace('/', os.sep))
     
    275275             err = str(e)
    276276             debug_print("KoboTouch:_upload_cover - Exception string: %s"%err)
    277 @@ -2958,6 +3026,8 @@ class KOBOTOUCH(KOBO):
     277@@ -3163,6 +3231,8 @@ class KOBOTOUCH(KOBO):
    278278         c.add_opt('upload_covers', default=False)
    279279         c.add_opt('keep_cover_aspect', default=False)
     
    284284         c.add_opt('show_archived_books', default=False)
    285285         c.add_opt('show_previews', default=False)
    286 @@ -3028,7 +3098,7 @@ class KOBOTOUCH(KOBO):
     286@@ -3240,7 +3310,7 @@ class KOBOTOUCH(KOBO):
    287287         elif self.isAuraHD():
    288288             _cover_file_endings = self.AURA_HD_COVER_FILE_ENDINGS
     
    293293             _cover_file_endings = self.AURA_HD_COVER_FILE_ENDINGS
    294294         elif self.isAuraOne():
    295 @@ -3130,6 +3200,14 @@ class KOBOTOUCH(KOBO):
     295@@ -3346,6 +3416,14 @@ class KOBOTOUCH(KOBO):
    296296     def upload_grayscale(self):
    297297         return self.upload_covers and self.get_pref('upload_grayscale')
     
    308308         return self.modifying_css()
    309309 
    310 @@ -3257,6 +3335,10 @@ class KOBOTOUCH(KOBO):
     310@@ -3494,6 +3572,10 @@ class KOBOTOUCH(KOBO):
    311311         count_options += 1
    312312         OPT_KEEP_COVER_ASPECT_RATIO     = count_options
     
    319319         count_options += 1
    320320         OPT_SHOW_PREVIEWS               = count_options
    321 @@ -3287,6 +3369,8 @@ class KOBOTOUCH(KOBO):
     321@@ -3524,6 +3606,8 @@ class KOBOTOUCH(KOBO):
    322322             settings.upload_covers = settings.extra_customization[OPT_UPLOAD_COVERS]
    323323             settings.keep_cover_aspect = settings.extra_customization[OPT_KEEP_COVER_ASPECT_RATIO]
     
    329329             settings.show_previews = settings.extra_customization[OPT_SHOW_PREVIEWS]
    330330diff --git a/src/calibre/devices/kobo/kobotouch_config.py b/src/calibre/devices/kobo/kobotouch_config.py
    331 index 329907377b..df2d5b66d1 100644
     331index f9fdac53c6..d87ae78dfe 100644
    332332--- a/src/calibre/devices/kobo/kobotouch_config.py
    333333+++ b/src/calibre/devices/kobo/kobotouch_config.py
     
    341341 
    342342 import textwrap
    343 @@ -107,6 +107,8 @@ class KOBOTOUCHConfig(TabbedDeviceConfig):
     343@@ -106,6 +106,8 @@ class KOBOTOUCHConfig(TabbedDeviceConfig):
    344344         p['upload_covers'] = self.upload_covers
    345345         p['keep_cover_aspect'] = self.keep_cover_aspect
     
    350350         p['show_recommendations'] = self.show_recommendations
    351351         p['show_previews'] = self.show_previews
    352 @@ -294,7 +296,8 @@ class CoversGroupBox(DeviceOptionsGroupBox):
     352@@ -304,7 +306,8 @@ class CoversGroupBox(DeviceOptionsGroupBox):
    353353 
    354354         self.upload_grayscale_checkbox = create_checkbox(
     
    360360                              )
    361361 
    362 @@ -304,9 +307,34 @@ class CoversGroupBox(DeviceOptionsGroupBox):
     362@@ -314,8 +317,33 @@ class CoversGroupBox(DeviceOptionsGroupBox):
    363363                                ' This is for firmware versions 2.3.1 and later.'),
    364364                              device.get_pref('keep_cover_aspect'))
     
    389389         self.options_layout.addWidget(self.keep_cover_aspect_checkbox,    0, 0, 1, 1)
    390390         self.options_layout.addWidget(self.upload_grayscale_checkbox,     1, 0, 1, 1)
    391 -        self.options_layout.setRowStretch(2, 1)
    392391+        self.options_layout.addWidget(self.letterbox_fs_covers_checkbox,  2, 0, 1, 1)
    393392+        self.options_layout.addWidget(self.png_covers_checkbox,           3, 0, 1, 1)
    394 +        self.options_layout.setRowStretch(4, 1)
    395393 
    396394     @property
    397395     def upload_covers(self):
    398 @@ -320,6 +348,14 @@ class CoversGroupBox(DeviceOptionsGroupBox):
     396@@ -329,6 +357,14 @@ class CoversGroupBox(DeviceOptionsGroupBox):
    399397     def keep_cover_aspect(self):
    400398         return self.keep_cover_aspect_checkbox.isChecked()
Note: See TracChangeset for help on using the changeset viewer.