diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-11-15 09:28:51 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-11-15 09:28:51 +0000 |
| commit | 56f534fe22cf64ef47043efb28e7cbff6db44398 (patch) | |
| tree | 72fbc657b29da867d43bcd6af5c0b55834a161b2 /calibre/build | |
| parent | 007e556a5907ff0c9ca9ad937b4ec11ebc7c668e (diff) | |
| download | asb-56f534fe22cf64ef47043efb28e7cbff6db44398.tar.gz asb-56f534fe22cf64ef47043efb28e7cbff6db44398.tar.xz | |
Updated this patch for calibre-1.11.0. It is also no longer needed for Slackware 14.1
Diffstat (limited to 'calibre/build')
| -rw-r--r-- | calibre/build/patches/calibre_noqthack.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/calibre/build/patches/calibre_noqthack.patch b/calibre/build/patches/calibre_noqthack.patch index b5355920..f482e5aa 100644 --- a/calibre/build/patches/calibre_noqthack.patch +++ b/calibre/build/patches/calibre_noqthack.patch @@ -1,26 +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'] +--- calibre/setup/extensions.py.orig 2013-11-15 04:51:25.000000000 +0100 ++++ calibre/setup/extensions.py 2013-11-15 10:26:53.559798979 +0100 +@@ -187,13 +187,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'] +- 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 @@ +--- calibre/src/calibre/constants.py.orig 2013-11-15 04:51:25.000000000 +0100 ++++ calibre/src/calibre/constants.py 2013-11-15 10:28:00.712017625 +0100 +@@ -138,7 +138,6 @@ 'freetype', 'woff', 'unrar', - 'qt_hack', + '_regex' ] if iswindows: - plugins.extend(['winutil', 'wpd', 'winfonts']) |