[csw-devel] SF.net SVN: gar:[21521] csw/mgar/pkg/evince/trunk

[cgrzemba at users.sourceforge.net]

Revision: 21521
          http://gar.svn.sourceforge.net/gar/?rev=21521&view=rev
Author:   cgrzemba
Date:     2013-07-18 10:45:52 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
evince/trunk: update library dependence

Modified Paths:
--------------
    csw/mgar/pkg/evince/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch

Modified: csw/mgar/pkg/evince/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evince/trunk/Makefile	2013-07-18 09:18:45 UTC (rev 21520)
+++ csw/mgar/pkg/evince/trunk/Makefile	2013-07-18 10:45:52 UTC (rev 21521)
@@ -90,7 +90,6 @@
 RUNTIME_DEP_PKGS_CSWevince += CSWlibevdocument2
 RUNTIME_DEP_PKGS_CSWevince += CSWlibevview2
 RUNTIME_DEP_PKGS_CSWevince += CSWlibdjvulibre21
-RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib5
 RUNTIME_DEP_PKGS_CSWevince += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWevince += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWevince += CSWlibcairo2
@@ -106,6 +105,8 @@
 RUNTIME_DEP_PKGS_CSWevince += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWevince += CSWlibtiff3
 RUNTIME_DEP_PKGS_CSWevince += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWevince += CSWlibpoppler-glib8
+RUNTIME_DEP_PKGS_CSWevince += CSWlibkpathsea6
 # RUNTIME_DEP_PKGS_CSWevince += CSWgnomevfs2
 # RUNTIME_DEP_PKGS_CSWevince += CSWnautilus
 # RUNTIME_DEP_PKGS_CSWevince += CSWdbus
@@ -249,8 +250,13 @@
 include gar/category.mk
 
 pre-configure-modulated:
-	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
-	cd $(WORKSRC) && autoreconf
+	( cd $(WORKSRC); \
+	[ -f ltmain.sh ] && rm ltmain.sh || true; \
+	libtoolize --copy --force; \
+	aclocal-1.13 --force; \
+	autoconf --force; \
+	autoheader --force; \
+	automake-1.13 --add-missing --copy --force-missing  )
 	@$(MAKECOOKIE)
 
 PATH := /opt/csw/gnu:$(PATH)

Added: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch
===================================================================
--- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch	                        (rev 0)
+++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch	2013-07-18 10:45:52 UTC (rev 21521)
@@ -0,0 +1,13 @@
+diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
+index fef0738..fe53c5a 100644
+--- a/backend/pdf/ev-poppler.cc
++++ b/backend/pdf/ev-poppler.cc
+@@ -1986,7 +1986,7 @@ pdf_selection_get_selected_text (EvSelection     *selection,
+ 	r.x2 = points->x2;
+ 	r.y2 = height - points->y1;
+ 
+-	retval = poppler_page_get_text (poppler_page,
++	retval = poppler_page_get_selected_text (poppler_page,
+ 					(PopplerSelectionStyle)style,
+ 					&r);
+ 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.