Sat Feb 12 14:18:35 2011 UTC ()
make the last patch work correctly


(drochner)
diff -r1.5 -r1.6 pkgsrc/print/epdfview/distinfo
diff -r1.1 -r1.2 pkgsrc/print/epdfview/patches/patch-ac
cvs diff -r1.5 -r1.6 pkgsrc/print/epdfview/distinfo (expand / switch to unified diff)

--- pkgsrc/print/epdfview/distinfo 2011/02/12 10:00:07 1.5
+++ pkgsrc/print/epdfview/distinfo 2011/02/12 14:18:35 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2011/02/12 10:00:07 tnn Exp $ 1$NetBSD: distinfo,v 1.6 2011/02/12 14:18:35 drochner Exp $
2 2
3SHA1 (epdfview-0.1.7.tar.bz2) = ff46942c285b8e2c28766a38cdfce1a018b4a015 3SHA1 (epdfview-0.1.7.tar.bz2) = ff46942c285b8e2c28766a38cdfce1a018b4a015
4RMD160 (epdfview-0.1.7.tar.bz2) = 485399d1982a3f8128322ee7e13d46225573bae3 4RMD160 (epdfview-0.1.7.tar.bz2) = 485399d1982a3f8128322ee7e13d46225573bae3
5Size (epdfview-0.1.7.tar.bz2) = 443609 bytes 5Size (epdfview-0.1.7.tar.bz2) = 443609 bytes
6SHA1 (patch-aa) = 6c5b2766836cf3610c92feb5fdcc5de0dd75534d 6SHA1 (patch-aa) = 6c5b2766836cf3610c92feb5fdcc5de0dd75534d
7SHA1 (patch-ab) = 67ab5dd3c5c2d4af5e2aeddc77e4714c9e96b008 7SHA1 (patch-ab) = 67ab5dd3c5c2d4af5e2aeddc77e4714c9e96b008
8SHA1 (patch-ac) = 979978571cb5f0972ecea6f40d65a3e0bf7b7556 8SHA1 (patch-ac) = bca1aa97617ba41a13bd0dfa3c8db44d726e4f9a
cvs diff -r1.1 -r1.2 pkgsrc/print/epdfview/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/print/epdfview/patches/Attic/patch-ac 2011/02/12 10:00:08 1.1
+++ pkgsrc/print/epdfview/patches/Attic/patch-ac 2011/02/12 14:18:35 1.2
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-ac,v 1.1 2011/02/12 10:00:08 tnn Exp $ 1$NetBSD: patch-ac,v 1.2 2011/02/12 14:18:35 drochner Exp $
2 2
3--- src/PDFDocument.cxx.orig 2009-02-28 21:00:35.000000000 +0000 3--- src/PDFDocument.cxx.orig 2009-02-28 21:00:35.000000000 +0000
4+++ src/PDFDocument.cxx 4+++ src/PDFDocument.cxx
5@@ -686,7 +686,7 @@ PDFDocument::setTextSelection (DocumentR 5@@ -680,13 +680,13 @@ PDFDocument::setTextSelection (DocumentR
 6
 7 //for get text we must exchange y coordinate, don't ask me where logic here.
 8 PopplerRectangle textRect = { rect->getX1() / getZoom(),
 9- (pageHeight - rect->getY2() / getZoom()),
 10- rect->getX2() * getZoom() / getZoom(),
 11- (pageHeight - rect->getY1() / getZoom())};
 12+ rect->getY1() / getZoom(),
 13+ rect->getX2() / getZoom(),
 14+ rect->getY2() / getZoom()};
6 repairEmpty(textRect); 15 repairEmpty(textRect);
7  16
8 #if defined (HAVE_POPPLER_0_6_0) 17 #if defined (HAVE_POPPLER_0_6_0)
9- gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH, 18- gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
10+ gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH, 19+ gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH,
11 &textRect); 20 &textRect);
12 #else // !HAVE_POPPLER_0_6_0 21 #else // !HAVE_POPPLER_0_6_0
13 gchar *text = poppler_page_get_text(page, &textRect); 22 gchar *text = poppler_page_get_text(page, &textRect);