- Don't sigsegv when a page is manually entered

- Remove 0001-pdf-Fix-build-when-text_layout-is-not-available.patch
This commit is contained in:
mkasik 2010-07-21 15:01:21 +00:00
parent ab2393f405
commit 563f04397e
3 changed files with 19 additions and 34 deletions

View File

@ -1,33 +0,0 @@
From 9dd59f719ba098ef93aacf2e5e3d0974cfcd5b2c Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Tue, 29 Jun 2010 08:52:13 +0200
Subject: [PATCH] [pdf] Fix build when text_layout is not available
Fixes bug #623080.
---
backend/pdf/ev-poppler.cc | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 91f5c2e..6e56423 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -2029,6 +2029,7 @@ pdf_document_text_get_text (EvDocumentText *selection,
&r);
}
+#ifdef HAVE_POPPLER_PAGE_GET_TEXT_LAYOUT
static gboolean
pdf_document_text_get_text_layout (EvDocumentText *selection,
EvPage *page,
@@ -2043,6 +2044,7 @@ pdf_document_text_get_text_layout (EvDocumentText *selection,
return poppler_page_get_text_layout (poppler_page, (PopplerRectangle **)areas, n_areas);
}
+#endif
static void
pdf_document_text_iface_init (EvDocumentTextInterface *iface)
--
1.7.1

View File

@ -0,0 +1,11 @@
--- evince-2.31.5/libmisc/ev-page-action-widget.c 2010-04-05 11:21:59.000000000 +0200
+++ evince-2.31.5/libmisc/ev-page-action-widget.c 2010-07-21 16:30:30.000000000 +0200
@@ -271,7 +271,7 @@ ev_page_action_widget_class_init (EvPage
g_signal_new ("activate_link",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (EvPageActionClass, activate_link),
+ G_STRUCT_OFFSET (EvPageActionWidgetClass, activate_link),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,

View File

@ -5,7 +5,7 @@
Name: evince
Version: 2.31.5
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Document viewer
License: GPLv2+ and GFDL
@ -17,6 +17,8 @@ Patch2: evince-t1font-mapping.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=613916
Patch3: evince-2.31.5-synctex.patch
Patch4: evince-2.31.5-page-action-widget.patch
BuildRequires: gtk3-devel
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: poppler-glib-devel >= %{poppler_version}
@ -108,6 +110,7 @@ It adds an additional tab called "Document" to the file properties dialog.
%setup -q
%patch2 -p1 -b .t1font-map
%patch3 -p1 -b .synctex
%patch4 -p1 -b .page-action-widget
%build
%configure \
@ -239,6 +242,10 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
%{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
%changelog
* Wed Jul 21 2010 Marek Kasik <mkasik@redhat.com> - 2.31.5-5
- Don't sigsegv when a page is manually entered
- Remove 0001-pdf-Fix-build-when-text_layout-is-not-available.patch
* Fri Jul 16 2010 Marek Kasik <mkasik@redhat.com> - 2.31.5-4
- Restore io mode when returning from opening of synctex file
- Patch by David Tardon