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

[cgrzemba at users.sourceforge.net]

Revision: 21525
          http://gar.svn.sourceforge.net/gar/?rev=21525&view=rev
Author:   cgrzemba
Date:     2013-07-18 13:10:30 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
evince/trunk: add patch for poppler version > 0.17

Modified Paths:
--------------
    csw/mgar/pkg/evince/trunk/Makefile
    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 11:40:32 UTC (rev 21524)
+++ csw/mgar/pkg/evince/trunk/Makefile	2013-07-18 13:10:30 UTC (rev 21525)
@@ -22,6 +22,7 @@
 STRIP_LIBTOOL = 1
 
 PATCHFILES += 0001-honor-aclocal_flags.patch
+PATCHFILES += 0002-poppler-api-changed.patch
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -249,15 +250,15 @@
 
 include gar/category.mk
 
-pre-configure-modulated:
-	( 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)
+# pre-configure:
+# 	( cd $(WORKSRC); \
+# 	[ -f ltmain.sh ] && rm ltmain.sh || true; \
+# 	libtoolize --copy --force; \
+##  	aclocal-1.11 --force; \
+# 	autoconf --force; \
+# 	autoheader --force; \
+# 	automake-1.11 --add-missing --copy --force-missing  )
+# 	@$(MAKECOOKIE)
 
 PATH := /opt/csw/gnu:$(PATH)
 AM_DEFAULT_VERBOSITY := 1

Modified: csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch
===================================================================
--- csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch	2013-07-18 11:40:32 UTC (rev 21524)
+++ csw/mgar/pkg/evince/trunk/files/0002-poppler-api-changed.patch	2013-07-18 13:10:30 UTC (rev 21525)
@@ -1,5 +1,3 @@
-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,

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