Updated to 3.26.1 by vladimir71

This commit is contained in:
survolog 2018-07-02 20:43:31 +03:00
parent 6457a1e178
commit 8dfc6fae80
8 changed files with 64 additions and 57 deletions

View file

@ -1,4 +1,2 @@
sources:
calibre-3.9.0.tar.xz: 7db641d09033361e38059dbad45407ab66b304ec
"calibre-3.26.1.tar.xz": 7607651c1f081f72fc488912e316458b3b7dfd89

View file

@ -1,7 +1,7 @@
diff -urN calibre-2.75.1/setup/build.py calibre-2.75.1-patched/setup/build.py
--- calibre-2.75.1/setup/build.py 2016-12-25 14:32:55.000000000 +1000
+++ calibre-2.75.1-patched/setup/build.py 2016-12-29 22:50:09.318861256 +1000
@@ -433,6 +433,9 @@
diff -ur calibre-3.26.1/setup/build.py calibre-3.26.1_patched/setup/build.py
--- calibre-3.26.1/setup/build.py 2018-06-15 09:55:24.000000000 +0300
+++ calibre-3.26.1_patched/setup/build.py 2018-07-02 20:26:57.219128657 +0300
@@ -466,6 +466,9 @@
macx {{
QMAKE_LFLAGS += "-undefined dynamic_lookup"
}}

View file

@ -1,7 +1,7 @@
diff -Nur calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
--- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-08 21:43:22.888681538 -0700
+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-08 21:45:27.363383815 -0700
@@ -63,20 +63,6 @@
diff -ur calibre-3.26.1/src/calibre/gui2/update.py calibre-3.26.1_patched/src/calibre/gui2/update.py
--- calibre-3.26.1/src/calibre/gui2/update.py 2018-06-15 09:55:24.000000000 +0300
+++ calibre-3.26.1_patched/src/calibre/gui2/update.py 2018-07-02 20:34:46.018081386 +0300
@@ -81,20 +81,6 @@
while not self.shutdown_event.is_set():
calibre_update_version = NO_CALIBRE_UPDATE
plugins_update_found = 0

View file

@ -0,0 +1,27 @@
diff -ur calibre-3.26.1/src/calibre/linux.py calibre-3.26.1_patched/src/calibre/linux.py
--- calibre-3.26.1/src/calibre/linux.py 2018-06-15 09:55:24.000000000 +0300
+++ calibre-3.26.1_patched/src/calibre/linux.py 2018-07-02 20:31:20.326102126 +0300
@@ -996,6 +996,7 @@
TryExec=lrfviewer
Exec=lrfviewer %f
Icon=calibre-viewer
+NoDisplay=true
MimeType=application/x-sony-bbeb;
Categories=Graphics;Viewer;
'''
@@ -1010,6 +1011,7 @@
TryExec=ebook-viewer
Exec=ebook-viewer --detach %f
Icon=calibre-viewer
+NoDisplay=true
Categories=Graphics;Viewer;
'''
@@ -1023,6 +1025,7 @@
TryExec=ebook-edit
Exec=ebook-edit --detach %f
Icon=calibre-ebook-edit
+NoDisplay=true
Categories=Office;
'''

View file

@ -0,0 +1,18 @@
diff -ur calibre-3.26.1/setup/install.py calibre-3.26.1_patched/setup/install.py
--- calibre-3.26.1/setup/install.py 2018-06-15 09:55:24.000000000 +0300
+++ calibre-3.26.1_patched/setup/install.py 2018-07-02 20:39:42.672051473 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
from __future__ import with_statement
@@ -12,7 +12,7 @@
__appname__, __version__)
HEADER = '''\
-#!/usr/bin/env python2
+#!/usr/bin/env python
"""
This is the standard runscript for all of calibre's tools.

View file

@ -1,27 +0,0 @@
diff -up calibre/src/calibre/linux.py.orig calibre/src/calibre/linux.py
--- calibre/src/calibre/linux.py.orig 2014-08-01 19:18:33.227016144 +0200
+++ calibre/src/calibre/linux.py 2014-08-01 19:21:42.575143513 +0200
@@ -934,6 +934,7 @@ Comment=Viewer for LRF files (SONY ebook
TryExec=lrfviewer
Exec=lrfviewer %f
Icon=calibre-viewer
+NoDisplay=true
MimeType=application/x-sony-bbeb;
Categories=Graphics;Viewer;
'''
@@ -948,6 +949,7 @@ Comment=Viewer for E-books in all the ma
TryExec=ebook-viewer
Exec=ebook-viewer --detach %f
Icon=calibre-viewer
+NoDisplay=true
Categories=Graphics;Viewer;
'''
@@ -961,6 +963,7 @@ Comment=Edit e-books in various formats
TryExec=ebook-edit
Exec=ebook-edit --detach %f
Icon=calibre-ebook-edit
+NoDisplay=true
Categories=Office;
'''

View file

@ -1,11 +0,0 @@
--- calibre/setup/old.install.py 2011-06-17 20:56:05.000000000 +0300
+++ calibre/setup/install.py 2011-06-19 16:49:04.834298647 +0300
@@ -12,7 +12,7 @@
__appname__, __version__)
HEADER = '''\
-#!/usr/bin/env python2
+#!/usr/bin/env python
"""
This is the standard runscript for all of calibre's tools.

View file

@ -1,16 +1,16 @@
Summary: E-book converter and library management
Name: calibre
Version: 3.9.0
Version: 3.26.1
Release: 1
License: GPLv3+
Group: Office
Url: http://calibre-ebook.com/
Source0: https://download.calibre-ebook.com/%{version}/%{name}-%{version}.tar.xz
Source2: calibre-mount-helper
Patch0: calibre-2.75.1-linkage.patch
Patch1: calibre-no-update.patch
Patch3: calibre-nodisplay.patch
Patch4: calibre-python2-env-fix.patch
Source1: calibre-mount-helper
Patch0: calibre-3.26.1-linkage.patch
Patch1: calibre-3.26.1-no-update.patch
Patch3: calibre-3.26.1-nodisplay.patch
Patch4: calibre-3.26.1-python2-env-fix.patch
BuildRequires: desktop-file-utils
BuildRequires: python-apsw
BuildRequires: python-beautifulsoup
@ -38,14 +38,16 @@ BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(ImageMagick)
BuildRequires: pkgconfig(libmtp)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(poppler-glib)
BuildRequires: pkgconfig(poppler-qt5)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pythonegg(chardet)
BuildRequires: pythonegg(lxml)
BuildRequires: pythonegg(lxml) >= 3.8.0
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(gobject-2.0)
Requires: imagemagick
Requires: python-apsw
Requires: python-beautifulsoup
@ -261,4 +263,4 @@ sed -i -e 's:localization/locale.zip:%{_datadir}/%{name}/localization/locales.zi
rm -f %{buildroot}%{_bindir}/%{name}-uninstall
install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/
install -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/