diff options
| author | Larry Hajali <larryhaja[at]gmail[dot]com> | 2013-01-06 06:54:52 +0100 |
|---|---|---|
| committer | dsomero <xgizzmo@slackbuilds.org> | 2013-01-09 18:52:23 -0500 |
| commit | 54c929b079208da633aa985df1a31d5520ec5041 (patch) | |
| tree | f5c548c1cb92df931cda2863adde389fa58f6d91 | |
| parent | d016b9eef8407899d749c39ddab660b698383eb6 (diff) | |
office/calibre: Updated for version 0.9.13.
Added a patch to remove the qt_hack module, that needs
qt private headers (not shipped with stock slackware) to build
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | office/calibre/calibre.SlackBuild | 7 | ||||
| -rw-r--r-- | office/calibre/calibre.info | 6 | ||||
| -rw-r--r-- | office/calibre/patches/calibre_noqthack.patch | 26 |
3 files changed, 34 insertions, 5 deletions
diff --git a/office/calibre/calibre.SlackBuild b/office/calibre/calibre.SlackBuild index 03d56632cc60..7a34cb9afaa1 100644 --- a/office/calibre/calibre.SlackBuild +++ b/office/calibre/calibre.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for calibre -# Copyright 2009-2012 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2009-2013 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=calibre -VERSION=${VERSION:-0.9.11} +VERSION=${VERSION:-0.9.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,6 +78,9 @@ patch -p1 < $CWD/patches/calibre-module-fix.patch patch -p1 < $CWD/patches/fix-shebangs.patch # Make sure version string is correct. sed -i "/^numeric_version/s|(.*)|(${VERSION//\./, })|" src/calibre/constants.py +# Don't build qt_hack. Calibre dev won't fix. Patch from AlienBob. +# https://bugs.launchpad.net/calibre/+bug/1094719 +patch -p1 < $CWD/patches/calibre_noqthack.patch OVERRIDE_CFLAGS="$SLKCFLAGS" \ OVERRIDE_LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ diff --git a/office/calibre/calibre.info b/office/calibre/calibre.info index 290cafd41a47..3e474164b947 100644 --- a/office/calibre/calibre.info +++ b/office/calibre/calibre.info @@ -1,8 +1,8 @@ PRGNAM="calibre" -VERSION="0.9.11" +VERSION="0.9.13" HOMEPAGE="http://calibre-ebook.com/" -DOWNLOAD="http://downloads.sourceforge.net/calibre/calibre-0.9.11.tar.xz" -MD5SUM="07e620aed65d7bae2a27ccea123da4c9" +DOWNLOAD="http://downloads.sourceforge.net/calibre/calibre-0.9.13.tar.xz" +MD5SUM="3ad062f85eca072c3990c766bc05412a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cssutils cssselect dnspython lxml mechanize podofo python-dateutil netifaces psutil" diff --git a/office/calibre/patches/calibre_noqthack.patch b/office/calibre/patches/calibre_noqthack.patch new file mode 100644 index 000000000000..b5355920d20a --- /dev/null +++ b/office/calibre/patches/calibre_noqthack.patch @@ -0,0 +1,26 @@ +--- calibre/setup/extensions.py.orig 2012-12-28 04:59:30.000000000 +0100 ++++ calibre/setup/extensions.py 2012-12-28 23:05:09.572200438 +0100 +@@ -183,13 +183,6 @@ + sip_files = ['calibre/gui2/progress_indicator/QProgressIndicator.sip'] + ), + +- Extension('qt_hack', +- ['calibre/ebooks/pdf/render/qt_hack.cpp'], +- inc_dirs = qt_private_inc + ['calibre/ebooks/pdf/render', 'qt-harfbuzz/src'], +- headers = ['calibre/ebooks/pdf/render/qt_hack.h'], +- sip_files = ['calibre/ebooks/pdf/render/qt_hack.sip'] +- ), +- + Extension('unrar', + ['unrar/%s.cpp'%(x.partition('.')[0]) for x in ''' + rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o +--- calibre/src/calibre/constants.py.orig 2012-12-28 04:59:30.000000000 +0100 ++++ calibre/src/calibre/constants.py 2012-12-28 23:07:10.690575371 +0100 +@@ -100,7 +100,6 @@ + 'freetype', + 'woff', + 'unrar', +- 'qt_hack', + ] + if iswindows: + plugins.extend(['winutil', 'wpd', 'winfonts']) |