[patch] pdftk-1.45

pdftk-1.45.ebuild.patch (text/plain), 4.41 KB, created by Mao PU on 2013-03-03 13:50:35 UTC

diff -rupN a/files/pdftk-1.45-InputError.patch b/files/pdftk-1.45-InputError.patch
--- a/files/pdftk-1.45-InputError.patch	1970-01-01 01:00:00.000000000 +0100
+++ b/files/pdftk-1.45-InputError.patch	2013-03-03 14:45:33.000000000 +0100
@@ -0,0 +1,25 @@
+commit 963ed828156fc7cd29366289638bb1b820b12210
+Author: Robin Houston <[e-mail]>
+Date:   Mon Jan 7 15:11:51 2013 +0000
+
+    Do not fail if an ObjStm ends with a number
+    
+    This is the cause of the problem described in http://bugs.debian.org/687669
+
+diff --git a/java/com/lowagie/text/pdf/PRTokeniser.java b/java/com/lowagie/text/pdf/PRTokeniser.java
+index 6c048c0..bd0876e 100644
+--- a/java/com/lowagie/text/pdf/PRTokeniser.java
++++ b/java/com/lowagie/text/pdf/PRTokeniser.java
+@@ -288,6 +288,12 @@ public class PRTokeniser {
+                 }
+             }
+         }
++        if (level > 0) {
++            type = TK_NUMBER;
++            file.seek(ptr);
++            stringValue = n1;
++            return;
++        }
+         throwError("Unexpected end of file");
+     }
+     
diff -rupN a/files/pdftk-1.45-LDFLAGS.patch b/files/pdftk-1.45-LDFLAGS.patch
--- a/files/pdftk-1.45-LDFLAGS.patch	1970-01-01 01:00:00.000000000 +0100
+++ b/files/pdftk-1.45-LDFLAGS.patch	2013-03-03 14:45:33.000000000 +0100
@@ -0,0 +1,11 @@
+--- pdftk-1.44-dist/pdftk/Makefile.Base
++++ pdftk-1.44-dist/pdftk/Makefile.Base
+@@ -44,7 +44,7 @@
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
+ 
+ pdftk : pdftk.o attachments.o report.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL)
+-	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) -o pdftk
++	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) $(LDFLAGS) -o pdftk
+ 
+ install:
+ 	/usr/bin/install pdftk /usr/local/bin 
diff -rupN a/files/pdftk-1.45-Makefile.patch b/files/pdftk-1.45-Makefile.patch
--- a/files/pdftk-1.45-Makefile.patch	1970-01-01 01:00:00.000000000 +0100
+++ b/files/pdftk-1.45-Makefile.patch	2013-03-03 14:45:33.000000000 +0100
@@ -0,0 +1,17 @@
+--- pdftk-1.45-dist/pdftk/Makefile.Debian
++++ pdftk-1.45-dist/pdftk/Makefile.Debian
+@@ -29,11 +29,12 @@
+ # tools
+ # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME)
+ TOOLPATH=
+-export VERSUFF=-4.6
++GCJVERSION=$(shell gcj -dumpversion)
++export VERSUFF=-$(GCJVERSION)
+ export CXX= $(TOOLPATH)g++$(VERSUFF)
+ export GCJ= $(TOOLPATH)gcj$(VERSUFF)
+ export GCJH= $(TOOLPATH)gcjh$(VERSUFF)
+-export GJAR= $(TOOLPATH)gjar$(VERSUFF)
++export GJAR= $(TOOLPATH)gjar
+ export LIBGCJ= /usr/share/java/libgcj$(VERSUFF).jar
+ export AR= ar
+ export RM= rm
diff -rupN a/files/pdftk-1.45-nodrm.patch b/files/pdftk-1.45-nodrm.patch
--- a/files/pdftk-1.45-nodrm.patch	1970-01-01 01:00:00.000000000 +0100
+++ b/files/pdftk-1.45-nodrm.patch	2013-03-03 14:45:33.000000000 +0100
@@ -0,0 +1,11 @@
+--- pdftk-1.45-dist/pdftk/pdftk.cc
++++ pdftk-1.45-dist/pdftk/pdftk.cc
+@@ -193,7 +193,7 @@
+ 		// store in this java object so the gc can trace it
+ 		g_dont_collect_p->addElement( reader );
+ 
+-		input_pdf_p->m_authorized_b= ( !reader->encrypted || reader->passwordIsOwner );
++		input_pdf_p->m_authorized_b= true;
+ 		if( !input_pdf_p->m_authorized_b ) {
+ 			open_success_b= false;
+ 		}
diff -rupN a/pdftk-1.45.ebuild b/pdftk-1.45.ebuild
--- a/pdftk-1.45.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ b/pdftk-1.45.ebuild	2013-03-03 14:41:43.000000000 +0100
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A tool for manipulating PDF documents"
+HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
+SRC_URI="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="nodrm"
+
+DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-dist/
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
+	epatch "${FILESDIR}/${P}-InputError.patch"
+	if use nodrm ; then
+		epatch "${FILESDIR}/${P}-nodrm.patch"
+	fi
+}
+
+src_compile() {
+	# java-config settings break compilation by gcj.
+	unset CLASSPATH
+	unset JAVA_HOME
+	# parallel make fails
+	cd pdftk
+	emake -j1 -f "${S}"/pdftk/Makefile.Debian || die "Compilation failed."
+	cd ..
+}
+
+src_install() {
+	dobin pdftk/pdftk || die
+	doman pdftk.1 || die
+	dohtml pdftk.1.html || die
+}