Bug 238248 - media-libs/tiff-3.8.2-r4 - absolute paths in tiff-3.8.2-tiff2pdf.patch.gz
|
Bug#:
238248
|
Product: Gentoo Linux
|
Version: unspecified
|
Platform: All
|
|
OS/Version: Linux
|
Status: RESOLVED
|
Severity: major
|
Priority: P2
|
|
Resolution: FIXED
|
Assigned To: nerdboy@gentoo.org
|
Reported By: oscar@oscarh.net
|
|
Component: Ebuilds
|
|
|
URL:
|
|
Summary: media-libs/tiff-3.8.2-r4 - absolute paths in tiff-3.8.2-tiff2pdf.patch.gz
|
|
Keywords:
|
|
Status Whiteboard:
|
|
Opened: 2008-09-21 03:56 0000
|
* Failed Patch: tiff-3.8.2-tiff2pdf.patch !
* ( /var/tmp/portage/media-libs/tiff-3.8.2-r4/work/tiff-3.8.2-tiff2pdf.patch
)
*
* Include in your bugreport the contents of:
*
*
/var/tmp/portage/media-libs/tiff-3.8.2-r4/temp/tiff-3.8.2-tiff2pdf.patch-28912.out
Contents of
/var/tmp/portage/media-libs/tiff-3.8.2-r4/temp/tiff-3.8.2-tiff2pdf.patch-28912.out:
Can't apply patch, output from emerge:
***** tiff-3.8.2-tiff2pdf.patch *****
NOTE: skipping -p0 due to absolute paths in patch:
2:+++ /home/sarnold/src/libtiff/tools/tiff2pdf.c 2006-06-08
04:27:11.000000000 -0700
=====================================
PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch <
/var/tmp/portage/media-libs/tiff-3.8.2-r4/work/tiff-3.8.2-tiff2pdf.patch
=====================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- tools/tiff2pdf.c 2006-03-21 08:42:51.000000000 -0800
|+++ /home/sarnold/src/libtiff/tools/tiff2pdf.c 2006-06-08 04:27:11.000000000
-0700
--------------------------
No file to patch. Skipping patch.
75 out of 75 hunks ignored
=====================================
PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch <
/var/tmp/portage/media-libs/tiff-3.8.2-r4/work/tiff-3.8.2-tiff2pdf.patch
=====================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- tools/tiff2pdf.c 2006-03-21 08:42:51.000000000 -0800
|+++ /home/sarnold/src/libtiff/tools/tiff2pdf.c 2006-06-08 04:27:11.000000000
-0700
--------------------------
No file to patch. Skipping patch.
75 out of 75 hunks ignored
=====================================
PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch <
/var/tmp/portage/media-libs/tiff-3.8.2-r4/work/tiff-3.8.2-tiff2pdf.patch
=====================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- tools/tiff2pdf.c 2006-03-21 08:42:51.000000000 -0800
|+++ /home/sarnold/src/libtiff/tools/tiff2pdf.c 2006-06-08 04:27:11.000000000
-0700
--------------------------
No file to patch. Skipping patch.
75 out of 75 hunks ignored
=====================================
PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch <
/var/tmp/portage/media-libs/tiff-3.8.2-r4/work/tiff-3.8.2-tiff2pdf.patch
=====================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- tools/tiff2pdf.c 2006-03-21 08:42:51.000000000 -0800
|+++ /home/sarnold/src/libtiff/tools/tiff2pdf.c 2006-06-08 04:27:11.000000000
-0700
--------------------------
No file to patch. Skipping patch.
75 out of 75 hunks ignored
Reproducible: Always
Steps to Reproduce:
1. emerge --sync
2. emere tiff
Same here. Bug seems to originate upstream, as the b0rked patch is in the
tarball, not in the filesdir.
Here's a quick fix, as I would hope this gets fixed properly soon anyway
I created a local overlay ebuild for tiff-3.8.2-4, and put the offending
patchfile (tiff-3.8.2-tiff2pdf.patch) into the files directory in the overlay
ebuild.
Patch the ebuild file with this:
--- tiff-3.8.2-r4.ebuild 2008-09-21 08:51:16.000000000 -0400
+++ tiff-3.8.2-r4.ebuild 2008-09-21 08:53:19.000000000 -0400
@@ -6,8 +6,7 @@
DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz
- mirror://gentoo/${P}-tiff2pdf.patch.bz2"
+SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
@@ -21,7 +20,7 @@
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${WORKDIR}"/${P}-tiff2pdf.patch
+ epatch "${FILESDIR}"/${P}-tiff2pdf.patch
epatch "${FILESDIR}"/${P}-tiffsplit.patch
if use jbig; then
epatch "${FILESDIR}"/${PN}-jbig.patch
then patch tiff-3.8.2-tiff2pdf.patch with this:
--- tiff-3.8.2-tiff2pdf.patch 2008-09-21 09:02:52.000000000 -0400
+++ tiff-3.8.2-tiff2pdf.patch 2008-09-21 08:49:08.000000000 -0400
@@ -1,5 +1,5 @@
--- tools/tiff2pdf.c 2006-03-21 08:42:51.000000000 -0800
-+++ /home/sarnold/src/libtiff/tools/tiff2pdf.c 2006-06-08 04:27:11.000000000
-0700
++++ tools/tiff2pdf.c 2006-06-08 04:27:11.000000000 -0700
I have modified /usr/portage/distfiles/tiff-3.8.2-tiff2pdf.patch.gz :
line 3 was:
--- tools/tiff2pdf.c 2006-03-21 08:42:51.000000000 -0800
set to:
--tiff-3.8.2/libtiff/tools/tiff2pdf.c 2006-03-21 08:42:51.000000000 -0800
and line 4 was:
+++ /home/sarnold/src/libtiff/tools/tiff2pdf.c 2006-06-08 04:27:11.000000000
-0700
set to:
+++ tiff-3.8.2/libtiff/tools/tiff2pdf.c 2006-06-08 04:27:11.000000000 -0700
then generate new SHA256:
sha256sum /usr/porttage/distfiles/tiff-3.8.2-tiff2pdf.patch.gz
and finally put new sha256 sum into /usr/portage/media-libs/tiff/Manifest
it works for me
You can get around this by using the "unstable" version:
# ACCEPT_KEYWORDS="~amd64" emerge tiff -av
or ~x86 if you are on a 32bit arch.
this happens due to a change of epatch behavior.
@nerdboy: do you/me want to create a new patch (with a correct directory) or
change the directory of the diff with sed in the ebuild?
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
Working file: eutils.eclass
head: 1.307
branch:
locks: strict
access list:
symbolic names:
RELEASE-1_4: 1.46.0.2
GENTOO_1_4_SNAP_2003010800: 1.12
keyword substitution: kv
total revisions: 308; selected revisions: 308
description:
----------------------------
revision 1.307
date: 2008-09-20 21:03:31 +0200; author: vapier; state: Exp; lines: +6 -4;
commitid: e5248d549014567;
even better: dont whine about abs paths, just transparently skip the -p0 step
and log why we are
----------------------------
revision 1.306
date: 2008-09-20 20:58:57 +0200; author: vapier; state: Exp; lines: +4 -2;
commitid: dbd48d547ee4567;
filter /dev/null from abs path check and include the offending line in the
warning
----------------------------
revision 1.305
date: 2008-09-20 20:55:07 +0200; author: vapier; state: Exp; lines: +8 -1;
commitid: d6048d547094567;
start whining about absolute paths in patch files
----------------------------
*** Bug 238359 has been marked as a duplicate of this bug. ***
*** Bug 238383 has been marked as a duplicate of this bug. ***
*** Bug 238391 has been marked as a duplicate of this bug. ***
(In reply to comment #7)
> You can get around this by using the "unstable" version:
> # ACCEPT_KEYWORDS="~amd64" emerge tiff -av
>
> or ~x86 if you are on a 32bit arch.
The right way to do that is to use /etc/portage/package.* files or directories
for that. Also, emerge a package with the -1 option if you don't want it to end
up in your world file (you probably don't in this case).
Anyway, I confirm that the 3.8.2-r5 works like a charm.
*** Bug 238454 has been marked as a duplicate of this bug. ***
(In reply to comment #7)
> You can get around this by using the "unstable" version:
> # ACCEPT_KEYWORDS="~amd64" emerge tiff -av
>
> or ~x86 if you are on a 32bit arch.
>
Afterwards emerge it normally (without ACCEPT_KEYWORDS) and you'll end up with
stable version :)