Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-10-01 06:32:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

office/calibre: Upgraded to 1.10.0

Browse source 
Removed the noqthacks patch
Removed the fix-shebangs patch

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
larryhaja 2013-11-13 18:46:12 -08:00 committed by Robby Workman
parent 76fa97b9d1
commit 5073760b56
4 changed files with 4 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
office/calibre/calibre.SlackBuild
View file

@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=calibre
VERSION=${VERSION:-1.4.0}
VERSION=${VERSION:-1.10.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -74,13 +74,8 @@ find . \
patch -p1 < $CWD/patches/remove-desktop-integration.patch
# Fix calibre module location.
patch -p1 < $CWD/patches/calibre-module-fix.patch
# Fix shebangs.
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
# Remove calibre portable scripts.
rm -f resources/calibre-portable.*

6
office/calibre/calibre.info
View file

@ -1,8 +1,8 @@
PRGNAM="calibre"
VERSION="1.4.0"
VERSION="1.10.0"
HOMEPAGE="http://calibre-ebook.com"
DOWNLOAD="http://downloads.sourceforge.net/calibre/calibre-1.4.0.tar.xz"
MD5SUM="7d5b331bd81d5f2d40e126059a49ce0f"
DOWNLOAD="http://downloads.sourceforge.net/calibre/calibre-1.10.0.tar.xz"
MD5SUM="736dba201646affa7d579bb8b9cf77f0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cssutils dnspython lxml mechanize podofo python-dateutil netifaces psutil cssselect apsw"

26
office/calibre/patches/calibre_noqthack.patch
View file

@ -1,26 +0,0 @@
--- 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'])

27
office/calibre/patches/fix-shebangs.patch
View file

@ -1,27 +0,0 @@
diff -Naur calibre.orig/src/calibre/ebooks/markdown/extensions/def_list.py calibre/src/calibre/ebooks/markdown/extensions/def_list.py
--- calibre.orig/src/calibre/ebooks/markdown/extensions/def_list.py 2012-06-29 04:53:39.000000000 +0000
+++ calibre/src/calibre/ebooks/markdown/extensions/def_list.py 2012-07-03 03:31:12.127833772 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env Python
+#!/usr/bin/env python
"""
Definition List Extension for Python-Markdown
=============================================
diff -Naur calibre.orig/src/calibre/ebooks/markdown/extensions/meta.py calibre/src/calibre/ebooks/markdown/extensions/meta.py
--- calibre.orig/src/calibre/ebooks/markdown/extensions/meta.py 2012-06-29 04:53:39.000000000 +0000
+++ calibre/src/calibre/ebooks/markdown/extensions/meta.py 2012-07-03 03:31:34.910833575 +0000
@@ -1,4 +1,4 @@
-#!usr/bin/python
+#!/usr/bin/python
"""
Meta Data Extension for Python-Markdown
diff -Naur calibre.orig/src/calibre/ebooks/markdown/extensions/tables.py calibre/src/calibre/ebooks/markdown/extensions/tables.py
--- calibre.orig/src/calibre/ebooks/markdown/extensions/tables.py 2012-06-29 04:53:39.000000000 +0000
+++ calibre/src/calibre/ebooks/markdown/extensions/tables.py 2012-07-03 03:31:45.957833583 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env Python
+#!/usr/bin/env python
"""
Tables Extension for Python-Markdown
====================================