[zathura] fix compile against poppler 0.15
Tom Callaway
spot at fedoraproject.org
Wed Oct 6 20:37:38 UTC 2010
commit 1b062231d723499304629bb50fad7acb0da8ee25
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Wed Oct 6 16:37:39 2010 -0400
fix compile against poppler 0.15
zathura-0.0.8.1-poppler-0.15-fix.patch | 12 ++++++++++++
zathura.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/zathura-0.0.8.1-poppler-0.15-fix.patch b/zathura-0.0.8.1-poppler-0.15-fix.patch
new file mode 100644
index 0000000..1e586b3
--- /dev/null
+++ b/zathura-0.0.8.1-poppler-0.15-fix.patch
@@ -0,0 +1,12 @@
+diff -up zathura-0.0.8.1/zathura.c.poppler15 zathura-0.0.8.1/zathura.c
+--- zathura-0.0.8.1/zathura.c.poppler15 2010-10-06 16:35:44.966101001 -0400
++++ zathura-0.0.8.1/zathura.c 2010-10-06 16:35:58.124101001 -0400
+@@ -4300,7 +4300,7 @@ cb_view_button_release(GtkWidget* widget
+
+ /* get selected text */
+ g_static_mutex_lock(&(Zathura.Lock.pdflib_lock));
+- char* selected_text = poppler_page_get_text(
++ char* selected_text = poppler_page_get_selected_text(
+ Zathura.PDF.pages[Zathura.PDF.page_number]->page,SELECTION_STYLE,
+ &rectangle);
+
diff --git a/zathura.spec b/zathura.spec
index 2f6c819..f232ace 100644
--- a/zathura.spec
+++ b/zathura.spec
@@ -9,6 +9,7 @@ URL: http://zathura.pwmt.org/projects/zathura
Source0: http://zathura.pwmt.org/attachments/download/10/zathura-0.0.8.1.tar.gz
Patch0: zathura-dso-buildfix.patch
Patch1: zathura-add-desktop-file.patch
+Patch2: zathura-0.0.8.1-poppler-0.15-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gdk-pixbuf-devel, gtk2-devel, poppler-glib-devel, cairo-devel, glib2-devel
BuildRequires: desktop-file-utils
@@ -25,6 +26,7 @@ an easy usage that mainly focuses on keyboard interaction.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1 -b .poppler15
# don't rebuid at install time
sed -ie "s/install:\ all/install:\ /g" Makefile
@@ -57,7 +59,7 @@ rm -rf %{buildroot}
%changelog
* Wed Oct 6 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0.8.1-7
-- rebuild for new poppler
+- rebuild and fix for new poppler
* Fri Aug 20 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.0.8.1-6
- rebuild (poppler)
More information about the scm-commits
mailing list