- Update to 2.58.0

- Remove patch integrated upstream
This commit is contained in:
Guido Falsi 2016-06-03 18:59:41 +00:00
parent d10a00fd5e
commit a6bd81ee26
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=416330
4 changed files with 7 additions and 19 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= calibre
PORTVERSION= 2.57.1
PORTVERSION= 2.58.0
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1463820745
SHA256 (calibre-2.57.1.tar.xz) = 214070623c370886e54c8d3babefa1a33619469fd29a7cf6389dc5e098a8f32d
SIZE (calibre-2.57.1.tar.xz) = 40495212
TIMESTAMP = 1464945146
SHA256 (calibre-2.58.0.tar.xz) = cdb7949bb9795a25836bb41cc19bcf0b900f4623cd6b5bed517c0789a5dbf85a
SIZE (calibre-2.58.0.tar.xz) = 40495912

View file

@ -1,15 +0,0 @@
--- src/calibre/utils/imageops/imageops.cpp.orig 2016-05-20 11:45:27 UTC
+++ src/calibre/utils/imageops/imageops.cpp
@@ -582,9 +582,9 @@ QImage despeckle(const QImage &image) {
// overlay() {{{
static inline unsigned int BYTE_MUL(unsigned int x, unsigned int a) {
- quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a;
- t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080) >> 8;
- t &= 0x00ff00ff00ff00ff;
+ quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ffULL) * a;
+ t = (t + ((t >> 8) & 0xff00ff00ff00ffULL) + 0x80008000800080ULL) >> 8;
+ t &= 0x00ff00ff00ff00ffULL;
return ((unsigned int)(t)) | ((unsigned int)(t >> 24));
}

View file

@ -130,6 +130,8 @@ 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/paladin/__init__.py
lib/calibre/calibre/devices/paladin/driver.py
lib/calibre/calibre/devices/prs505/__init__.py
lib/calibre/calibre/devices/prs505/driver.py
lib/calibre/calibre/devices/prs505/sony_cache.py
@ -1091,6 +1093,7 @@ lib/calibre/calibre/gui2/tweak_book/save.py
lib/calibre/calibre/gui2/tweak_book/search.py
lib/calibre/calibre/gui2/tweak_book/spell.py
lib/calibre/calibre/gui2/tweak_book/templates.py
lib/calibre/calibre/gui2/tweak_book/text_search.py
lib/calibre/calibre/gui2/tweak_book/toc.py
lib/calibre/calibre/gui2/tweak_book/ui.py
lib/calibre/calibre/gui2/tweak_book/undo.py