rpms/referencer/devel referencer-new_poppler.patch, NONE, 1.1 referencer.spec, 1.6, 1.7

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/pkgs/rpms/referencer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15955

Modified Files:
	referencer.spec 
Added Files:
	referencer-new_poppler.patch 
Log Message:
* Wed Sep 19 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-5
- Patch to build against newer poppler library


referencer-new_poppler.patch:

--- NEW FILE referencer-new_poppler.patch ---
--- src/Document.C	2007/09/02 07:29:29	547
+++ src/Document.C	2007/09/08 18:30:24	548
@@ -18,9 +18,10 @@
 #include <libgnomevfsmm.h>
 #include <glibmm/i18n.h>
 #include "ucompose.hpp"
-
 #include <poppler.h>
 
+#include "config.h"
+
 #include "Utility.h"
 #include "Library.h"
 #include "TagList.h"
@@ -28,6 +29,7 @@
 
 #include "Document.h"
 
+
 Glib::RefPtr<Gdk::Pixbuf> Document::defaultthumb_;
 Glib::RefPtr<Gdk::Pixbuf> Document::thumbframe_;
 Glib::RefPtr<Gnome::UI::ThumbnailFactory> Document::thumbfac_;
@@ -393,7 +395,13 @@
 		rect->y2 = height;
 
 		// FIXME: add something before/after appending text to signal pagebreak?
-		textdump += poppler_page_get_text (page, rect);
+		#ifdef OLD_POPPLER
+			#warning Using poppler <= 0.5
+			textdump += poppler_page_get_text (page, rect);
+		#else
+			#warning Using poppler >= 0.6
+			textdump += poppler_page_get_text (page, POPPLER_SELECTION_GLYPH, rect);
+		#endif
 
 		poppler_rectangle_free (rect);
 		g_object_unref (page);


Index: referencer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/referencer/devel/referencer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- referencer.spec	6 Sep 2007 00:34:20 -0000	1.6
+++ referencer.spec	20 Sep 2007 02:56:46 -0000	1.7
@@ -1,11 +1,12 @@
 Name:		referencer
 Summary:	A document organiser and bibliography manager for Gnome
 Version:	1.0.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/System
 License:	GPLv2
 URL:		http://icculus.org/referencer
 Source0:	http://icculus.org/referencer/downloads/%{name}-%{version}.tar.gz
+Patch0:		referencer-new_poppler.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	poppler-devel libgnomeuimm26-devel
 BuildRequires:	boost-devel gcc-c++
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .poppler
 
 %build
 %configure --disable-update-mime-database
@@ -68,6 +70,9 @@
 %{_datadir}/referencer/
 
 %changelog
+* Wed Sep 19 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-5
+- Patch to build against newer poppler library
+
 * Wed Sep 05 2007 Deji Akingunola <dakingun at gmail.com> - 1.0.4-4
 - Rebuild against newer poppler library