121492 – xpdf-3.0-r71 fails to apply nodrm.patch

Bug 121492 - xpdf-3.0-r71 fails to apply nodrm.patch

Summary: xpdf-3.0-r71 fails to apply nodrm.patch

Status:	RESOLVED FIXED

Alias:	None

Product:	Gentoo Linux
Classification:	Unclassified
Component:	New packages (show other bugs)
Hardware:	All Linux

Importance:	High normal (vote)
Assignee:	Printing Team

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2006-02-03 18:06 UTC by joachim.fasting
Modified:	2006-02-04 11:06 UTC (History)
CC List:	1 user (show)

See Also:
Package list:
Runtime testing required:	---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description joachim.fasting 2006-02-03 18:06:37 UTC

Emerge of xpdf-3.01-r7 fails while applying xpdf-3.01-nodrm.patch.

Contents of xpdf-3.01-nodrm.patch-11366.out:
***** xpdf-3.01-nodrm.patch *****

=================================

PATCH COMMAND:  patch -p0 -g0 --no-backup-if-mismatch < /usr/portage/tre/app-text/xpdf/files/xpdf-3.01-nodrm.patch

=================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/PDFCore.cc xpdf-3.01/xpdf/PDFCore.cc
|--- xpdf-3.01.orig/xpdf/PDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/PDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdfimages.cc xpdf-3.01/xpdf/pdfimages.cc
|--- xpdf-3.01.orig/xpdf/pdfimages.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdfimages.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 34
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftops.cc xpdf-3.01/xpdf/pdftops.cc
|--- xpdf-3.01.orig/xpdf/pdftops.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftops.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftotext.cc xpdf-3.01/xpdf/pdftotext.cc
|--- xpdf-3.01.orig/xpdf/pdftotext.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftotext.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 68
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFCore.cc xpdf-3.01/xpdf/XPDFCore.cc
|--- xpdf-3.01.orig/xpdf/XPDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 94
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFViewer.cc xpdf-3.01/xpdf/XPDFViewer.cc
|--- xpdf-3.01.orig/xpdf/XPDFViewer.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFViewer.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=================================

PATCH COMMAND:  patch -p1 -g0 --no-backup-if-mismatch < /usr/portage/tre/app-text/xpdf/files/xpdf-3.01-nodrm.patch

=================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/PDFCore.cc xpdf-3.01/xpdf/PDFCore.cc
|--- xpdf-3.01.orig/xpdf/PDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/PDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdfimages.cc xpdf-3.01/xpdf/pdfimages.cc
|--- xpdf-3.01.orig/xpdf/pdfimages.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdfimages.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 34
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftops.cc xpdf-3.01/xpdf/pdftops.cc
|--- xpdf-3.01.orig/xpdf/pdftops.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftops.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftotext.cc xpdf-3.01/xpdf/pdftotext.cc
|--- xpdf-3.01.orig/xpdf/pdftotext.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftotext.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 68
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFCore.cc xpdf-3.01/xpdf/XPDFCore.cc
|--- xpdf-3.01.orig/xpdf/XPDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 94
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFViewer.cc xpdf-3.01/xpdf/XPDFViewer.cc
|--- xpdf-3.01.orig/xpdf/XPDFViewer.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFViewer.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=================================

PATCH COMMAND:  patch -p2 -g0 --no-backup-if-mismatch < /usr/portage/tre/app-text/xpdf/files/xpdf-3.01-nodrm.patch

=================================
patching file PDFCore.cc
Hunk #1 succeeded at 1271 with fuzz 2 (offset -2 lines).
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdfimages.cc xpdf-3.01/xpdf/pdfimages.cc
|--- xpdf-3.01.orig/xpdf/pdfimages.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdfimages.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 34
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftops.cc xpdf-3.01/xpdf/pdftops.cc
|--- xpdf-3.01.orig/xpdf/pdftops.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftops.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftotext.cc xpdf-3.01/xpdf/pdftotext.cc
|--- xpdf-3.01.orig/xpdf/pdftotext.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftotext.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file XPDFCore.cc
Hunk #1 succeeded at 376 (offset -1 lines).
Hunk #2 succeeded at 1112 (offset 7 lines).
patching file XPDFViewer.cc
Hunk #1 succeeded at 2390 (offset -1 lines).
=================================

PATCH COMMAND:  patch -p3 -g0 --no-backup-if-mismatch < /usr/portage/tre/app-text/xpdf/files/xpdf-3.01-nodrm.patch

=================================
missing header for unified diff at line 4 of patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/PDFCore.cc xpdf-3.01/xpdf/PDFCore.cc
|--- xpdf-3.01.orig/xpdf/PDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/PDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 17 of patch
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdfimages.cc xpdf-3.01/xpdf/pdfimages.cc
|--- xpdf-3.01.orig/xpdf/pdfimages.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdfimages.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 34 of patch
can't find file to patch at input line 34
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftops.cc xpdf-3.01/xpdf/pdftops.cc
|--- xpdf-3.01.orig/xpdf/pdftops.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftops.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 51 of patch
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftotext.cc xpdf-3.01/xpdf/pdftotext.cc
|--- xpdf-3.01.orig/xpdf/pdftotext.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftotext.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 68 of patch
can't find file to patch at input line 68
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFCore.cc xpdf-3.01/xpdf/XPDFCore.cc
|--- xpdf-3.01.orig/xpdf/XPDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
missing header for unified diff at line 94 of patch
can't find file to patch at input line 94
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFViewer.cc xpdf-3.01/xpdf/XPDFViewer.cc
|--- xpdf-3.01.orig/xpdf/XPDFViewer.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFViewer.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=================================

PATCH COMMAND:  patch -p4 -g0 --no-backup-if-mismatch < /usr/portage/tre/app-text/xpdf/files/xpdf-3.01-nodrm.patch

=================================
missing header for unified diff at line 4 of patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/PDFCore.cc xpdf-3.01/xpdf/PDFCore.cc
|--- xpdf-3.01.orig/xpdf/PDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/PDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 17 of patch
can't find file to patch at input line 17
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdfimages.cc xpdf-3.01/xpdf/pdfimages.cc
|--- xpdf-3.01.orig/xpdf/pdfimages.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdfimages.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 34 of patch
can't find file to patch at input line 34
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftops.cc xpdf-3.01/xpdf/pdftops.cc
|--- xpdf-3.01.orig/xpdf/pdftops.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftops.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 51 of patch
can't find file to patch at input line 51
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/pdftotext.cc xpdf-3.01/xpdf/pdftotext.cc
|--- xpdf-3.01.orig/xpdf/pdftotext.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/pdftotext.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 68 of patch
can't find file to patch at input line 68
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFCore.cc xpdf-3.01/xpdf/XPDFCore.cc
|--- xpdf-3.01.orig/xpdf/XPDFCore.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
missing header for unified diff at line 94 of patch
can't find file to patch at input line 94
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -u xpdf-3.01.orig/xpdf/XPDFViewer.cc xpdf-3.01/xpdf/XPDFViewer.cc
|--- xpdf-3.01.orig/xpdf/XPDFViewer.cc	2005-10-05 16:29:19.000000000 +0200
|+++ xpdf-3.01/xpdf/XPDFViewer.cc	2005-10-05 16:29:28.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored

Comment 1 Stefan Schweizer (RETIRED) gentoo-dev

2006-02-04 11:06:48 UTC

thanks, I fixed the patch.