NetBSD Problem Report #33783

From www@NetBSD.org  Wed Jun 21 12:32:50 2006
Return-Path: <www@NetBSD.org>
Received: by narn.NetBSD.org (Postfix, from userid 31301)
	id 3049C63B8B4; Wed, 21 Jun 2006 12:32:50 +0000 (UTC)
Message-Id: <20060621123250.3049C63B8B4@narn.NetBSD.org>
Date: Wed, 21 Jun 2006 12:32:50 +0000 (UTC)
From: jdbaker@mylinuxisp.com
Reply-To: jdbaker@mylinuxisp.com
To: gnats-bugs@NetBSD.org
Subject: cad/qcad patch failure on MacOS X 10.4.6
X-Send-Pr-Version: www-1.0

>Number:         33783
>Category:       pkg
>Synopsis:       cad/qcad patch failure on MacOS X 10.4.6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 21 12:35:00 +0000 2006
>Closed-Date:    Fri Jun 23 06:27:15 +0000 2006
>Last-Modified:  Fri Jun 23 06:27:15 +0000 2006
>Originator:     John D. Baker
>Release:        MacOS X 10.4.6, pkgsrc-current
>Organization:
>Environment:
Darwin bwg3.technoskunk.fur 8.6.0 Darwin Kernel Version 8.6.0: Tue Mar  7 16:58:48 PST 2006; root:xnu-792.6.70.obj~1/RELEASE_PPC Power Macintosh powerpc

>Description:
Following the update of cad/qcad to 2.0.x, the build fails in the
patch phase as follows:

[...]
===> Overriding tools for qcad-2.0.5.0
===> Extracting for qcad-2.0.5.0
===> Patching for qcad-2.0.5.0
=> Applying pkgsrc patches for qcad-2.0.5.0
1 out of 1 hunk FAILED -- saving rejects to file mkspecs/defs.pro.rej
Patch /usr/pkgsrc/cad/qcad/patches/patch-ac failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/pkgsrc/cad/qcad/patches/patch-ac
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/cad/qcad

>How-To-Repeat:
On MacOS X 10.4.6 (and probably earlier versions), update pkgsrc to
-current and attempt to build cad/qcad.
>Fix:
It appears there are some problems with '/usr/bin/patch' supplied with
MacOS X that choke on the default format of some unified diff output
used with patches.  (See pkg/29026, pkg/29939).  The workaround there
was to generate the diffs with '-U 1' (only 1 line of context rather
than 3 lines).

If possible, could patch-ac be re-generated in this format?  If the
other patches apply OK in the default (-U 3) format, they need not
be changed.

>Release-Note:

>Audit-Trail:
From: joerg@britannica.bec.de
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/33783: cad/qcad patch failure on MacOS X 10.4.6
Date: Wed, 21 Jun 2006 16:19:29 +0200

 On Wed, Jun 21, 2006 at 12:35:00PM +0000, jdbaker@mylinuxisp.com wrote:
 > Following the update of cad/qcad to 2.0.x, the build fails in the
 > patch phase as follows:

 /me hates GNU patch and wants to burn it to dust.
 /me also has to finish his replacement patch for bootstrap

 > => Applying pkgsrc patches for qcad-2.0.5.0
 > 1 out of 1 hunk FAILED -- saving rejects to file mkspecs/defs.pro.rej

 Can you give me the reject file?

 Joerg

From: John D.Baker <jdbaker@mylinuxisp.com>
To: gnats-bugs@NetBSD.org
Cc: John D.Baker <jdbaker@mylinuxisp.com>
Subject: Re: pkg/33783: cad/qcad patch failure on MacOS X 10.4.6
Date: Wed, 21 Jun 2006 10:59:27 -0500

 On 21 Jun 2006, at 09:20, joerg@britannica.bec.de wrote:

 >  /me hates GNU patch and wants to burn it to dust.
 >  /me also has to finish his replacement patch for bootstrap

 Curse you GNU patch!  We hates it!  We hates it forever!

 >> => Applying pkgsrc patches for qcad-2.0.5.0
 >> 1 out of 1 hunk FAILED -- saving rejects to file mkspecs/defs.pro.rej
 >
 >  Can you give me the reject file?

 OK, including inline because I'm pretty sure gnats doesn't like
 attachments, between the begin/end lines...

 ------- begin defs.pro.rej -------
 ***************
 *** 2,6 ****
 - QMAKE_CXXFLAGS_DEBUG += -pedantic
 - QMAKE_CXXFLAGS += -pedantic

    win32 {
      QMAKE_CFLAGS_THREAD -= -mthreads
 --- 2,4 ----

    win32 {
      QMAKE_CFLAGS_THREAD -= -mthreads
 -------- end defs.pro.rej --------

 John D. Baker                            NetBSD     Darwin/MacOS X
 http://mylinuxisp(dot)com/(tilde)jdbaker/     OpenBSD            FreeBSD
 BSD.  It just sits there and _works_.
 GPG fingerprint = D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645

From: Joerg Sonnenberger <joerg@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: PR/33783 CVS commit: pkgsrc/cad/qcad
Date: Wed, 21 Jun 2006 16:21:03 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	joerg
 Date:		Wed Jun 21 16:21:03 UTC 2006

 Modified Files:
 	pkgsrc/cad/qcad: distinfo
 	pkgsrc/cad/qcad/patches: patch-ac

 Log Message:
 Regen patch-ac without context, GNU patch is too stupid to deal with
 asymmetric context. Fixes PR 33783.


 To generate a diff of this commit:
 cvs rdiff -r1.14 -r1.15 pkgsrc/cad/qcad/distinfo
 cvs rdiff -r1.5 -r1.6 pkgsrc/cad/qcad/patches/patch-ac

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

From: John D.Baker <jdbaker@mylinuxisp.com>
To: gnats-bugs@NetBSD.org
Cc: John D.Baker <jdbaker@mylinuxisp.com>
Subject: Re: PR/33783 CVS commit: pkgsrc/cad/qcad
Date: Thu, 22 Jun 2006 09:41:20 -0500

 On 21 Jun 2006, at 11:25, Joerg Sonnenberger wrote:

 >  Modified Files:
 >  	pkgsrc/cad/qcad: distinfo
 >  	pkgsrc/cad/qcad/patches: patch-ac
 >
 >  Log Message:
 >  Regen patch-ac without context, GNU patch is too stupid to deal with
 >  asymmetric context. Fixes PR 33783.

 After updating pkgsrc to pick up the revised patch-ac, patching still
 fails with:

 [...]
 => Applying pkgsrc patches for qcad-2.0.5.0
 **************************************
 Ignoring patch file /usr/pkgsrc/cad/qcad/patches/patch-ac: invalid 
 checksum
 **************************************
 ERROR: Patching failed due to modified or broken patch file(s):
 ERROR:  /usr/pkgsrc/cad/qcad/patches/patch-ac
 *** Error code 1

 Stop.
 bmake: stopped in /usr/pkgsrc/cad/qcad


 Perhaps the distinfo file was not updated properly in the repository?

 doing:

    bmake makepatchsum patches/patch-ac

 updated the local copy of distinfo.

 Following a "bmake clean", a subsequent "bmake" saw all patches apply
 cleanly.

 Distinfo entry for patch-ac immediately post 'cvs update':

 SHA1 (patch-ac) = 34296c0b036e45a120cbe00485fa54a444159bab

 Distinfo entry for patch-ac after 'bmake makepatchsum patches/patch-ac':

 SHA1 (patch-ac) = 1ec6dc9f9fead0c1c5fd5576d91001e8ccbead56


 John D. Baker                            NetBSD     Darwin/MacOS X
 http://mylinuxisp(dot)com/(tilde)jdbaker/     OpenBSD            FreeBSD
 BSD.  It just sits there and _works_.
 GPG fingerprint = D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645

From: joerg@britannica.bec.de
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: PR/33783 CVS commit: pkgsrc/cad/qcad
Date: Thu, 22 Jun 2006 16:52:04 +0200

 On Thu, Jun 22, 2006 at 02:50:02PM +0000, John D.Baker wrote:
 > The following reply was made to PR pkg/33783; it has been noted by GNATS.
 > 
 > From: John D.Baker <jdbaker@mylinuxisp.com>
 > To: gnats-bugs@NetBSD.org
 > Cc: John D.Baker <jdbaker@mylinuxisp.com>
 > Subject: Re: PR/33783 CVS commit: pkgsrc/cad/qcad
 > Date: Thu, 22 Jun 2006 09:41:20 -0500
 > 
 >  On 21 Jun 2006, at 11:25, Joerg Sonnenberger wrote:
 >  
 >  >  Modified Files:
 >  >  	pkgsrc/cad/qcad: distinfo
 >  >  	pkgsrc/cad/qcad/patches: patch-ac
 >  >
 >  >  Log Message:
 >  >  Regen patch-ac without context, GNU patch is too stupid to deal with
 >  >  asymmetric context. Fixes PR 33783.
 >  
 >  After updating pkgsrc to pick up the revised patch-ac, patching still
 >  fails with:

 My fault. Fixed.

 Joerg

From: John D.Baker <jdbaker@mylinuxisp.com>
To: gnats-bugs@NetBSD.org
Cc: John D.Baker <jdbaker@mylinuxisp.com>
Subject: Re: PR/33783 CVS commit: pkgsrc/cad/qcad
Date: Thu, 22 Jun 2006 23:54:53 -0500

 On 22 Jun 2006, at 09:55, joerg@britannica.bec.de wrote:

 >  On Thu, Jun 22, 2006 at 02:50:02PM +0000, John D.Baker wrote:
 >>
 >>  After updating pkgsrc to pick up the revised patch-ac, patching still
 >>  fails with:
 >
 >  My fault. Fixed.

 I deleted cad/qcad and updated again so everything is fresh.
 The patches apply cleanly.

 Thanks.

 John D. Baker                            NetBSD     Darwin/MacOS X
 http://mylinuxisp(dot)com/(tilde)jdbaker/     OpenBSD            FreeBSD
 BSD.  It just sits there and _works_.
 GPG fingerprint = D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645

State-Changed-From-To: open->closed
State-Changed-By: wiz@netbsd.org
State-Changed-When: Fri, 23 Jun 2006 06:27:15 +0000
State-Changed-Why:
Submitter reports problem is fixed.
Thanks!


>Unformatted:

Home	PR Database Search