summaryrefslogtreecommitdiff
path: root/libre/calibre/libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/calibre/libre.patch')
-rw-r--r--libre/calibre/libre.patch41
1 files changed, 21 insertions, 20 deletions
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index ace7034e3..739322d7a 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,23 +1,3 @@
-diff --git a/resources/images.qrc b/resources/images.qrc
-index c52874b78..2fee5e138 100644
---- a/resources/images.qrc
-+++ b/resources/images.qrc
-@@ -197,8 +197,6 @@
- <file>images/mimetypes/svg.png</file>
- <file>images/mimetypes/odt.png</file>
- <file>images/mimetypes/epub.png</file>
--<file>images/mimetypes/cbr.png</file>
--<file>images/mimetypes/rar.png</file>
- <file>images/mimetypes/tpz.png</file>
- <file>images/mimetypes/djvu.png</file>
- <file>images/mimetypes/computer.png</file>
-@@ -218,4 +216,4 @@
- <file>images/mimetypes/html.png</file>
- <file>images/mimetypes/lrx.png</file>
- </qresource>
--</RCC>
-\ No newline at end of file
-+</RCC>
diff --git a/resources/mime.types b/resources/mime.types
index b8acaaa25..9ea4742a6 100644
--- a/resources/mime.types
@@ -705,3 +685,24 @@ index fc85e1b7a..87b62caf3 100644
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:51
+--- calibre-2.83.0/resources/images.qrc.orig 2017-04-13 00:02:36.000000000 -0300
++++ calibre-2.83.0/resources/images.qrc 2017-04-26 14:52:54.508461078 -0300
+@@ -183,11 +183,9 @@
+ <file>images/mimetypes/html.png</file>
+ <file>images/mimetypes/xps.png</file>
+ <file>images/mimetypes/svg.png</file>
+-<file>images/mimetypes/cbr.png</file>
+ <file>images/mimetypes/tpz.png</file>
+ <file>images/mimetypes/snb.png</file>
+ <file>images/mimetypes/png.png</file>
+-<file>images/mimetypes/rar.png</file>
+ <file>images/mimetypes/mobi.png</file>
+ <file>images/mimetypes/gif.png</file>
+ <file>images/mimetypes/pdf.png</file>
+@@ -218,4 +216,4 @@
+ <file>images/plugins/plugin_updater_updates.png</file>
+ <file>images/plugins/plugin_upgrade_valid.png</file>
+ </qresource>
+-</RCC>
+\ No hay ningún carácter de nueva línea al final del fichero
++</RCC>