[gambas2] Use new version of constructor of class Links (poppler-0.17.0)

[mkasik]

commit c048639afe47b6aaef8fad5c2b021fb58a58eab2
Author: Marek Kasik <mkasik at redhat.com>
Date:   Mon Aug 8 15:05:16 2011 +0200

    Use new version of constructor of class Links (poppler-0.17.0)

 gambas2-2.23.1-links.patch |   25 +++++++++++++++++++++++++
 gambas2.spec               |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/gambas2-2.23.1-links.patch b/gambas2-2.23.1-links.patch
new file mode 100644
index 0000000..46ba33a
--- /dev/null
+++ b/gambas2-2.23.1-links.patch
@@ -0,0 +1,25 @@
+--- gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp	2011-05-27 02:01:38.000000000 +0200
++++ gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp	2011-08-08 14:03:56.000000000 +0200
+@@ -51,6 +51,7 @@
+ #include <Outline.h>
+ #include <Link.h>
+ #include <Gfx.h>
++#include <glib/poppler-features.h>
+ 
+ /*****************************************************************************
+ 
+@@ -959,10 +960,14 @@ END_METHOD
+ ******************************************************************************/
+ void aux_fill_links(void *_object)
+ {
++#if POPPLER_CHECK_VERSION(0, 17, 0)
++	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
++#else
+ 	Object obj;
+ 	
+ 	THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
+ 	obj.free();
++#endif
+ }
+ 
+ BEGIN_PROPERTY (PDFPAGELINKS_count)
diff --git a/gambas2.spec b/gambas2.spec
index 77bb3fe..ec42d5f 100644
--- a/gambas2.spec
+++ b/gambas2.spec
@@ -1,7 +1,7 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
 Version:	2.23.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Development/Tools
 URL:		http://gambas.sourceforge.net/
@@ -29,6 +29,8 @@ Patch2:		%{name}-2.0.0-noliconv.patch
 Patch3:		gambas-2.22.0-firebird-permissive-fix.patch
 # Use libv4l1
 Patch4:		gambas2-2.23.1-use-libv4l1.patch
+# Compile with poppler-0.17.0
+Patch5:		gambas2-2.23.1-links.patch
 
 %description
 Gambas2 is a free development environment based on a Basic interpreter
@@ -496,6 +498,7 @@ Requires:	%{name}-runtime = %{version}-%{release}
 %patch2 -p1 -b .noliconv
 %patch3 -p1 -b .temporary
 %patch4 -p1 -b .libv4l1
+%patch5 -p1 -b .links
 # We used to patch these out, but this is simpler.
 for i in `find . |grep acinclude.m4`; do
         sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i
@@ -1607,6 +1610,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Mon Aug  8 2011 Marek Kasik <mkasik at redhat.com> - 2.23.1-3
+- Use new version of constructor of class Links (poppler-0.17.0)
+
 * Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 2.23.1-2
 - Rebuild (poppler-0.17.0)