This commit is contained in:
Matthias Clasen 2007-11-27 05:24:36 +00:00
parent c09b7766f2
commit 6ac2336c67
5 changed files with 7 additions and 52 deletions

View File

@ -1 +1 @@
evince-2.20.1.tar.bz2
evince-2.20.2.tar.bz2

View File

@ -1,11 +0,0 @@
--- trunk/backend/comics/Makefile.am 2007/01/08 12:25:31 2197
+++ trunk/backend/comics/Makefile.am 2007/05/20 13:29:46 2469
@@ -1,7 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
- $(LIB_CFLAGS)
+ $(BACKEND_CFLAGS)
noinst_LTLIBRARIES = libcomicsdocument.la

View File

@ -4,8 +4,8 @@
%define theme_version 2.17.1
Name: evince
Version: 2.20.1
Release: 5%{?dist}
Version: 2.20.2
Release: 1%{?dist}
Summary: Document viewer
License: GPLv2+ and GFDL+
@ -13,8 +13,6 @@ Group: Applications/Publishing
URL: http://www.gnome.org/projects/evince/
Source0: http://download.gnome.org/sources/%{name}/2.20/%{name}-%{version}.tar.bz2
Patch0: evince-0.6.0-print-error.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=497279
Patch1: tiff.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= %{gtk2_version}
@ -58,7 +56,6 @@ evince is a GNOME-based document viewer.
%prep
%setup -q
%patch0 -p1 -b .print-error
%patch1 -p1 -b .tiff
%build
intltoolize --force
@ -163,6 +160,9 @@ fi
%changelog
* Tue Nov 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.2-1
- Update to 2.20.2
* Mon Nov 26 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-5
- Fix a problem in the tiff patch
- Turn off the dvi backend for now, since the tetex kpathsea

View File

@ -1 +1 @@
c0f3e4d5279ef3d08cc46b752e230c01 evince-2.20.1.tar.bz2
15214f5211d9f98ffa0afd8158b7d021 evince-2.20.2.tar.bz2

View File

@ -1,34 +0,0 @@
diff -up evince-2.20.1/backend/tiff/tiff-document.c.tiff evince-2.20.1/backend/tiff/tiff-document.c
--- evince-2.20.1/backend/tiff/tiff-document.c.tiff 2007-10-15 16:12:12.000000000 -0400
+++ evince-2.20.1/backend/tiff/tiff-document.c 2007-11-26 09:03:29.000000000 -0500
@@ -210,6 +210,7 @@ tiff_document_render (EvDocument *d
float x_res, y_res;
gint rowstride, bytes;
guchar *pixels = NULL;
+ guchar *p;
GdkPixbuf *pixbuf;
GdkPixbuf *scaled_pixbuf;
GdkPixbuf *rotated_pixbuf;
@@ -271,6 +272,22 @@ tiff_document_render (EvDocument *d
ORIENTATION_TOPLEFT, 1);
pop_handlers ();
+ /* Convert the format returned by libtiff to
+ * what cairo expects
+ */
+ p = pixels;
+ while (p < pixels + bytes) {
+ uint32 pixel = *(uint32 *)p;
+ int r = TIFFGetR(pixel);
+ int g = TIFFGetG(pixel);
+ int b = TIFFGetB(pixel);
+ int a = TIFFGetA(pixel);
+ *p++ = b;
+ *p++ = g;
+ *p++ = r;
+ *p++ = a;
+ }
+
rotated_surface = ev_document_misc_surface_rotate_and_scale (surface,
(width * rc->scale) + 0.5,
(height * rc->scale * (x_res / y_res)) + 0.5,