Chase poppler shlib bumps.

14 files changed, 102 insertions, 16 deletions

diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index 618fa8080db2..7e9ec919e018 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	apvlv
 PORTVERSION=	0.0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	jupengfei@gmail.com
 COMMENT=	Apvlv is a PDF Viewer Under Linux and its behaviour like Vim
 
-LIB_DEPENDS=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/apvlv/files/patch-src_ApvlvFile.cpp b/graphics/apvlv/files/patch-src_ApvlvFile.cpp
new file mode 100644
index 000000000000..ab16c19eac78
--- /dev/null
+++ b/graphics/apvlv/files/patch-src_ApvlvFile.cpp
@@ -0,0 +1,14 @@
+--- src/ApvlvFile.cpp.orig	2011-08-12 10:22:23.000000000 +0200
++++ src/ApvlvFile.cpp	2011-08-12 10:24:26.000000000 +0200
+@@ -273,9 +273,9 @@ ApvlvPDF::ApvlvPDF (const char *filename
+ 
+   bool ApvlvPDF::pagetext (int pn, int x1, int y1, int x2, int y2, char **out)
+   {
+-    PopplerRectangle rect = { x1, y1, x2, y2 };
+     PopplerPage *page = poppler_document_get_page (mDoc, pn);
+-    *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
++    PopplerRectangle rect = { x1, y2, x2, y1 };
++    *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
+     if (*out != NULL)
+       {
+ 	return true;
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index c8d977957fe7..3d6d8befc18f 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	epdfview
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	http://trac.emma-soft.com/epdfview/chrome/site/releases/ \
 		http://mirror.slitaz.org/sources/packages/e/
@@ -15,7 +16,7 @@ MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	A lightweight PDF document viewer
 
 BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
-LIB_DEPENDS=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 
 LICENSE=	GPLv2
 
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index ea021d88405b..ec63f9257685 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 multi-format document viewer
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk \
+LIB_DEPENDS=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk \
 		spectre.1:${PORTSDIR}/print/libspectre
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 7e9473d12d51..255edce28765 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.48.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/0.48.1
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--without-gnome-vfs
 .endif
 
 .if defined(WITH_POPPLER)
-LIB_DEPENDS+=		poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS+=		poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 CONFIGURE_ARGS+=	--enable-poppler-cairo
 .else
 CONFIGURE_ARGS+=	--enable-poppler-cairo=no
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 09ecc4a8a5f5..d2ab65e6cf73 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -24,7 +24,7 @@ LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		fribidi.3:${PORTSDIR}/converters/fribidi \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		paper.2:${PORTSDIR}/print/libpaper \
-		poppler-qt.2:${PORTSDIR}/graphics/poppler-qt
+		poppler-qt.3:${PORTSDIR}/graphics/poppler-qt
 
 CONFLICTS=	kolourpaint-[0-9]*
 
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 9ae635c81017..22e20ac447f4 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile
index 4fa92e9571c2..b641e7bed5a3 100644
--- a/graphics/popplerkit/Makefile
+++ b/graphics/popplerkit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	popplerkit
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 DISTNAME=	etoile-0.4.1
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 098bfe6d6c8b..46befd6689da 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/ \
 		http://launchpadlibrarian.net/30270080/ \
@@ -18,7 +18,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Python bindings for the Poppler PDF rendering library
 
-LIB_DEPENDS=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/py-poppler/files/patch-poppler.defs b/graphics/py-poppler/files/patch-poppler.defs
new file mode 100644
index 000000000000..2d0f468fed1c
--- /dev/null
+++ b/graphics/py-poppler/files/patch-poppler.defs
@@ -0,0 +1,67 @@
+diff -up pypoppler-0.12.1/poppler.defs.poppler15 pypoppler-0.12.1/poppler.defs
+--- poppler.defs.poppler15	2010-10-06 16:02:47.023101009 -0400
++++ poppler.defs	2010-10-06 16:10:32.749101000 -0400
+@@ -1760,6 +1760,12 @@
+   (return-type "int")
+ )
+ 
++(define-method get_label
++  (of-object "PopplerPage")
++  (c-name "poppler_page_get_label")
++  (return-type "gchar*")
++)
++
+ (define-method get_duration
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_duration")
+@@ -1805,9 +1811,15 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_text")
+   (return-type "char*")
++)
++
++(define-method get_selected_text
++  (of-object "PopplerPage")
++  (c-name "poppler_page_get_selected_text")
++  (return-type "char*")
+   (parameters
+     '("PopplerSelectionStyle" "style")
+-    '("PopplerRectangle*" "rect")
++    '("PopplerRectangle*" "selection")
+   )
+ )
+ 
+@@ -1895,6 +1907,16 @@
+   )
+ )
+ 
++(define-function poppler_page_add_annot
++  (of-object "PopplerPage")
++  (c-name "poppler_page_add_annot")
++  (return-type "none")
++  (parameters
++    '("PopplerAnnot*" "annot")
++    '("GList*" "list")
++  )
++)
++
+ (define-method get_crop_box
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_crop_box")
+@@ -1904,6 +1926,16 @@
+   )
+ )
+ 
++(define-method get_text_layout
++  (of-object "PopplerPage")
++  (c-name "poppler_page_get_text_layout")
++  (return-type "gboolean")
++  (parameters
++    '("PopplerRectangle**" "rectangles")
++    '("guint*" "n_rectangles")
++  )
++)
++
+ (define-function poppler_rectangle_get_type
+   (c-name "poppler_rectangle_get_type")
+   (return-type "GType")
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 9bcfe66adbd0..5dc65d85d83c 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qcomicbook
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://qcomicbook.linux-projects.net/releases/
 
diff --git a/graphics/tumbler/Makefile b/graphics/tumbler/Makefile
index f736245a3942..acd95b680f7e 100644
--- a/graphics/tumbler/Makefile
+++ b/graphics/tumbler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tumbler
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics xfce
 MASTER_SITES=	XFCE
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/0.1
@@ -87,7 +87,7 @@ PLIST_SUB+=	FREETYPE="@comment "
 .if defined(WITH_POPPLER)
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/poppler-glib.pc:${PORTSDIR}/graphics/poppler-gtk \
 		poppler-gtk>=0.12.0:${PORTSDIR}/graphics/poppler-gtk
-LIB_DEPENDS+=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS+=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 PLIST_SUB+=	POPPLER=""
 WITH_PLUGINS=	true
 .elif defined(WITHOUT_POPPLER)
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index 777d60ffc8e0..54808f0d7cd8 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	xournal
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	me@janh.de
 COMMENT=	A notetaking application that can annotate PDFs
 
-LIB_DEPENDS=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk
 
 LICENSE=	GPLv2
 
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index c6bf292264e3..944f65671aa4 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	zathura
 PORTVERSION=	0.0.8.4
+PORTREVISION=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	http://pwmt.org/download/
 
 MAINTAINER=	acieroid@awesom.eu
 COMMENT=	Customizable lightweight pdf viewer
 
-LIB_DEPENDS=	poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk	\
+LIB_DEPENDS=	poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk	\
 		cairo.2:${PORTSDIR}/graphics/cairo
 
 USE_GNOME=	glib20 gtk20