Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/pdfannotextractor/, dev-tex/pdfannotextractor/files/
Date: Sat, 05 Dec 2015 19:49:46
Message-Id: 1449343781.1dd38c31fca99c48a5c783763ef9c85b281f44ea.monsieurp@gentoo
1 commit: 1dd38c31fca99c48a5c783763ef9c85b281f44ea
2 Author: Craig Inches <craig.inches <AT> xayto <DOT> net>
3 AuthorDate: Wed Dec 2 16:53:24 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 5 19:29:41 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd38c31
7
8 dev-tex/pdfannotextractor: Add two new patches. Fixes bug 545336.
9
10 .../files/PDFAnnotExtractor.java.patch | 25 ++++++++++++++++++++++
11 .../files/StringVisitor.java.patch | 14 ++++++++++++
12 .../pdfannotextractor-0.1l.ebuild | 8 ++++---
13 3 files changed, 44 insertions(+), 3 deletions(-)
14
15 diff --git a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
16 new file mode 100644
17 index 0000000..88c8d37
18 --- /dev/null
19 +++ b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
20 @@ -0,0 +1,25 @@
21 +--- PDFAnnotExtractor.java.org 2015-11-26 16:20:12.614852847 +0800
22 ++++ work/source/latex/pax/src/PDFAnnotExtractor.java 2015-11-26 16:21:42.592303074 +0800
23 +@@ -24,14 +24,14 @@
24 + import java.text.*;
25 + import java.util.*;
26 +
27 +-import org.pdfbox.cos.*;
28 +-import org.pdfbox.pdfparser.*;
29 +-import org.pdfbox.pdmodel.*;
30 +-import org.pdfbox.pdmodel.common.*;
31 +-import org.pdfbox.pdmodel.interactive.action.*;
32 +-import org.pdfbox.pdmodel.interactive.action.type.*;
33 +-import org.pdfbox.pdmodel.interactive.annotation.*;
34 +-import org.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
35 ++import org.apache.pdfbox.cos.*;
36 ++import org.apache.pdfbox.pdfparser.*;
37 ++import org.apache.pdfbox.pdmodel.*;
38 ++import org.apache.pdfbox.pdmodel.common.*;
39 ++import org.apache.pdfbox.pdmodel.interactive.action.*;
40 ++import org.apache.pdfbox.pdmodel.interactive.action.type.*;
41 ++import org.apache.pdfbox.pdmodel.interactive.annotation.*;
42 ++import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
43 +
44 + public class PDFAnnotExtractor implements Constants {
45 +
46
47 diff --git a/dev-tex/pdfannotextractor/files/StringVisitor.java.patch b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
48 new file mode 100644
49 index 0000000..1b6a9d1
50 --- /dev/null
51 +++ b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
52 @@ -0,0 +1,14 @@
53 +Index: work/source/latex/pax/src/StringVisitor.java
54 +--- StringVisitor.java.org 2015-11-26 16:20:35.434967156 +0800
55 ++++ work/source/latex/pax/src/StringVisitor.java 2015-11-26 16:20:56.504072659 +0800
56 +@@ -22,8 +22,8 @@
57 +
58 + import java.io.*;
59 + import java.util.*;
60 +-import org.pdfbox.cos.*;
61 +-import org.pdfbox.exceptions.*;
62 ++import org.apache.pdfbox.cos.*;
63 ++import org.apache.pdfbox.exceptions.*;
64 +
65 + public class StringVisitor implements ICOSVisitor {
66 +
67
68 diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
69 index 3691bb9..f6424b5 100644
70 --- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
71 +++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l.ebuild
72 @@ -16,8 +16,8 @@ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
73 IUSE=""
74
75 CDEPEND="virtual/latex-base
76 - dev-java/pdfbox
77 - dev-java/fontbox"
78 + dev-java/pdfbox:1.8
79 + dev-java/fontbox:1.7"
80 DEPEND="${CDEPEND}
81 app-arch/unzip
82 >=virtual/jdk-1.5"
83 @@ -31,10 +31,12 @@ TEXMF=/usr/share/texmf-site
84 S=${WORKDIR}
85
86 JAVA_ANT_REWRITE_CLASSPATH="true"
87 -EANT_GENTOO_CLASSPATH="pdfbox fontbox"
88 +EANT_GENTOO_CLASSPATH="pdfbox-1.8 fontbox-1.7"
89
90 src_prepare() {
91 epatch "${FILESDIR}/javajars.patch"
92 + epatch "${FILESDIR}/PDFAnnotExtractor.java.patch"
93 + epatch "${FILESDIR}/StringVisitor.java.patch"
94 java-pkg-2_src_prepare
95 }