Date: Sat, 21 May 2016 16:10:19 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415602 - in head/deskutils/calibre: . files Message-ID: <201605211610.u4LGAJaF098236@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat May 21 16:10:19 2016 New Revision: 415602 URL: https://svnweb.freebsd.org/changeset/ports/415602 Log: - Update to 2.57.1 - Add patch to fix build on 9.3 i386 - While here regenerate some other patches Added: head/deskutils/calibre/files/patch-src_calibre_utils_imageops_imageops.cpp (contents, props changed) Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/files/patch-setup_build__environment.py head/deskutils/calibre/files/patch-src_calibre_library_server_content.py head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Sat May 21 15:32:53 2016 (r415601) +++ head/deskutils/calibre/Makefile Sat May 21 16:10:19 2016 (r415602) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 2.56.0 +PORTVERSION= 2.57.1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Sat May 21 15:32:53 2016 (r415601) +++ head/deskutils/calibre/distinfo Sat May 21 16:10:19 2016 (r415602) @@ -1,2 +1,3 @@ -SHA256 (calibre-2.56.0.tar.xz) = 52daf1d86400464d2f7681f4e5523e24bf3183bcaafa13176e511c4a8cd16577 -SIZE (calibre-2.56.0.tar.xz) = 39900812 +TIMESTAMP = 1463820745 +SHA256 (calibre-2.57.1.tar.xz) = 214070623c370886e54c8d3babefa1a33619469fd29a7cf6389dc5e098a8f32d +SIZE (calibre-2.57.1.tar.xz) = 40495212 Modified: head/deskutils/calibre/files/patch-setup_build__environment.py ============================================================================== --- head/deskutils/calibre/files/patch-setup_build__environment.py Sat May 21 15:32:53 2016 (r415601) +++ head/deskutils/calibre/files/patch-setup_build__environment.py Sat May 21 16:10:19 2016 (r415602) @@ -1,6 +1,6 @@ ---- setup/build_environment.py.orig 2015-02-20 03:34:13 UTC +--- setup/build_environment.py.orig 2016-05-20 11:45:27 UTC +++ setup/build_environment.py -@@ -101,7 +101,7 @@ def get_sip_dir(q): +@@ -103,7 +103,7 @@ def get_sip_dir(q): if os.path.exists(os.path.join(base, 'QtWidgets')): return base raise EnvironmentError('Failed to find the location of the PyQt5 .sip files') Modified: head/deskutils/calibre/files/patch-src_calibre_library_server_content.py ============================================================================== --- head/deskutils/calibre/files/patch-src_calibre_library_server_content.py Sat May 21 15:32:53 2016 (r415601) +++ head/deskutils/calibre/files/patch-src_calibre_library_server_content.py Sat May 21 16:10:19 2016 (r415602) @@ -1,6 +1,6 @@ ---- src/calibre/library/server/content.py.orig 2015-02-20 03:34:13 UTC +--- src/calibre/library/server/content.py.orig 2016-05-20 11:45:27 UTC +++ src/calibre/library/server/content.py -@@ -111,6 +111,7 @@ class ContentServer(object): +@@ -110,6 +110,7 @@ class ContentServer(object): 'png' : 'image/png', 'gif' : 'image/gif', 'html' : 'text/html', Added: head/deskutils/calibre/files/patch-src_calibre_utils_imageops_imageops.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-src_calibre_utils_imageops_imageops.cpp Sat May 21 16:10:19 2016 (r415602) @@ -0,0 +1,15 @@ +--- 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)); + } + Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Sat May 21 15:32:53 2016 (r415601) +++ head/deskutils/calibre/pkg-plist Sat May 21 16:10:19 2016 (r415602) @@ -770,7 +770,6 @@ lib/calibre/calibre/gui2/device_drivers/ 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 -lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py lib/calibre/calibre/gui2/dialogs/authors_edit.py lib/calibre/calibre/gui2/dialogs/book_info.py lib/calibre/calibre/gui2/dialogs/catalog.py @@ -1118,6 +1117,7 @@ lib/calibre/calibre/gui2/viewer/toc.py lib/calibre/calibre/gui2/viewer/ui.py lib/calibre/calibre/gui2/widgets.py lib/calibre/calibre/gui2/widgets2.py +lib/calibre/calibre/gui2/win_file_dialogs.py lib/calibre/calibre/gui2/wizard/__init__.py lib/calibre/calibre/gui2/wizard/device_ui.py lib/calibre/calibre/gui2/wizard/finish_ui.py @@ -1175,10 +1175,10 @@ lib/calibre/calibre/plugins/freetype.so lib/calibre/calibre/plugins/html.so lib/calibre/calibre/plugins/hunspell.so lib/calibre/calibre/plugins/icu.so +lib/calibre/calibre/plugins/imageops.so lib/calibre/calibre/plugins/libheadless.so lib/calibre/calibre/plugins/lzma_binding.so lib/calibre/calibre/plugins/lzx.so -lib/calibre/calibre/plugins/magick.so lib/calibre/calibre/plugins/matcher.so lib/calibre/calibre/plugins/monotonic.so lib/calibre/calibre/plugins/msdes.so @@ -1310,7 +1310,7 @@ lib/calibre/calibre/utils/logging.py lib/calibre/calibre/utils/lru_cache.py lib/calibre/calibre/utils/magick/__init__.py lib/calibre/calibre/utils/magick/draw.py -lib/calibre/calibre/utils/magick/generate.py +lib/calibre/calibre/utils/magick/legacy.py lib/calibre/calibre/utils/matcher.py lib/calibre/calibre/utils/mdns.py lib/calibre/calibre/utils/mem.py @@ -1349,6 +1349,7 @@ lib/calibre/calibre/utils/smtp.py lib/calibre/calibre/utils/smtplib.py lib/calibre/calibre/utils/socket_inheritance.py lib/calibre/calibre/utils/soupparser.py +lib/calibre/calibre/utils/speedups.py lib/calibre/calibre/utils/spell/__init__.py lib/calibre/calibre/utils/terminal.py lib/calibre/calibre/utils/text2int.py @@ -1375,6 +1376,7 @@ lib/calibre/calibre/web/feeds/recipes/mo lib/calibre/calibre/web/feeds/templates.py lib/calibre/calibre/web/fetch/__init__.py lib/calibre/calibre/web/fetch/simple.py +lib/calibre/calibre/web/fetch/utils.py lib/calibre/chardet/__init__.py lib/calibre/chardet/big5freq.py lib/calibre/chardet/big5prober.py @@ -1589,6 +1591,8 @@ lib/calibre/tinycss/version.py %%DATADIR%%/content-server/index-generated.html %%DATADIR%%/content-server/index.html %%DATADIR%%/content-server/locales.zip +%%DATADIR%%/content-server/mathjax.version +%%DATADIR%%/content-server/mathjax.zip.xz %%DATADIR%%/content-server/mobile.css %%DATADIR%%/content-server/reset.css %%DATADIR%%/content_server/av.jpg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605211610.u4LGAJaF098236>