Hello community,
here is the log from the commit of package calibre for openSUSE:Factory
checked in at Tue Oct 4 16:54:35 CEST 2011.
--------
--- openSUSE:Factory/calibre/calibre.changes 2011-09-26 17:02:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/calibre/calibre.changes 2011-09-26 16:02:08.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 26 13:59:07 UTC 2011 - vuntz@opensuse.org
+
+- Update calibre-poppler.diff after discussion with upstream
+ poppler.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calibre.spec ++++++
--- /var/tmp/diff_new_pack.zpPzf6/_old 2011-10-04 16:54:31.000000000 +0200
+++ /var/tmp/diff_new_pack.zpPzf6/_new 2011-10-04 16:54:31.000000000 +0200
@@ -42,7 +42,7 @@
Patch1: %{name}-no-update-manpage.diff
# saigkill@opensuse.org 09/5/10 --adjust installion
Patch2: %{name}-setup.install.py.diff
-# PATCH-FIX-UPSTREAM coolo@suse.de - adapt the poppler API changes
+# PATCH-FIX-UPSTREAM lp#855587 coolo@suse.de - adapt the poppler API changes
Patch3: %{name}-poppler.diff
Obsoletes: calibre07
++++++ calibre-poppler.diff ++++++
--- /var/tmp/diff_new_pack.zpPzf6/_old 2011-10-04 16:54:32.000000000 +0200
+++ /var/tmp/diff_new_pack.zpPzf6/_new 2011-10-04 16:54:32.000000000 +0200
@@ -1,7 +1,7 @@
Index: calibre/src/calibre/ebooks/pdf/reflow.cpp
===================================================================
---- calibre.orig/src/calibre/ebooks/pdf/reflow.cpp 2011-09-26 12:04:07.612954868 +0200
-+++ calibre/src/calibre/ebooks/pdf/reflow.cpp 2011-09-26 12:29:25.984411632 +0200
+--- calibre.orig/src/calibre/ebooks/pdf/reflow.cpp
++++ calibre/src/calibre/ebooks/pdf/reflow.cpp
@@ -625,7 +625,7 @@ static string get_link_dest(LinkAction *
return oss.str();
}
@@ -13,8 +13,8 @@
Index: calibre/src/calibre/ebooks/pdf/reflow.h
===================================================================
---- calibre.orig/src/calibre/ebooks/pdf/reflow.h 2011-09-26 12:04:07.612954868 +0200
-+++ calibre/src/calibre/ebooks/pdf/reflow.h 2011-09-26 12:29:25.984411632 +0200
+--- calibre.orig/src/calibre/ebooks/pdf/reflow.h
++++ calibre/src/calibre/ebooks/pdf/reflow.h
@@ -244,6 +244,6 @@ class XMLOutputDev : public OutputDev {
XMLImages *images;
PDFDoc *doc;
@@ -25,17 +25,14 @@
}
Index: calibre/src/calibre/ebooks/pdf/images.cpp
===================================================================
---- calibre.orig/src/calibre/ebooks/pdf/images.cpp 2011-09-23 19:14:20.000000000 +0200
-+++ calibre/src/calibre/ebooks/pdf/images.cpp 2011-09-26 12:30:07.976811191 +0200
-@@ -4,7 +4,10 @@
- */
+--- calibre.orig/src/calibre/ebooks/pdf/images.cpp
++++ calibre/src/calibre/ebooks/pdf/images.cpp
+@@ -126,7 +126,7 @@ void XMLImages::add(GfxState *state, Obj
+ if (img->type == jpeg) {
+ int c;
+- str = ((DCTStream *)str)->getRawStream();
++ str = str->getNextStream();
+ str->reset();
--
-+#include