From owner-freebsd-gnome@FreeBSD.ORG Thu Apr 17 05:50:02 2014 Return-Path: Delivered-To: gnome@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81C8E115 for ; Thu, 17 Apr 2014 05:50:02 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 63ACF16D2 for ; Thu, 17 Apr 2014 05:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3H5o2P6088897 for ; Thu, 17 Apr 2014 05:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3H5o24l088896; Thu, 17 Apr 2014 05:50:02 GMT (envelope-from gnats) Date: Thu, 17 Apr 2014 05:50:02 GMT Message-Id: <201404170550.s3H5o24l088896@freefall.freebsd.org> To: gnome@FreeBSD.org From: Christopher Kenna Subject: Re: ports/188711: sysutils/hal: ===> Applying FreeBSD patches for hal-0.5.14_24 File to patch: NO FILE X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Christopher Kenna List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2014 05:50:02 -0000 The following reply was made to PR ports/188711; it has been noted by GNATS. From: Christopher Kenna To: bug-followup , ohartman Cc: Subject: Re: ports/188711: sysutils/hal: ===> Applying FreeBSD patches for hal-0.5.14_24 File to patch: NO FILE Date: Wed, 16 Apr 2014 22:44:44 -0700 --001a1133e4caf1c93f04f736887a Content-Type: text/plain; charset=UTF-8 I dug into this further and realized that the problem is that the submitted patch file in [1] is actually the patch file for the FreeBSD patch file (a meta-patchfile?). If you apply the new, bad patch file to the old patch file [2], then the port will build! The correct patch file can be generated using the above method. [1] http://svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-hald_hf-storage.c?sortby=date&r1=351423&r2=351422&pathrev=351423 [2] http://svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-hald_hf-storage.c?revision=351422&view=markup&sortby=date&pathrev=351423 On Wed, Apr 16, 2014 at 10:23 PM, Christopher Kenna wrote: > I dug into this more. The problem is that change 351423 has a bad patch. > > Change: > http://svnweb.freebsd.org/ports?view=revision&sortby=date&revision=351423 > > Bad patch introduced: > > http://svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-hald_hf-storage.c?sortby=date&r1=351423&r2=351422&pathrev=351423 > > ===> Patching for hal-0.5.14_24 > > ===> Applying FreeBSD patches for hal-0.5.14_24 > > File to patch: ^C > > root@localhost:/usr/ports/sysutils/hal # => Patch patch-hald_hf-storage.c > failed to apply cleanly. > > => Patch(es) patch-Makefile.in patch-doc_Makefile.in > patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi > patch-fdi_policy_10osvendor_10-x11-input.fdi patch-hald-runner_runner.c > patch-hald_freebsd_Makefile.in patch-hald_freebsd_addons_addon-storage.c > patch-hald_freebsd_hf-devd.c patch-hald_freebsd_hf-devtree.c > patch-hald_freebsd_hf-drm.c patch-hald_freebsd_hf-memcard.c > patch-hald_freebsd_hf-memcard.h patch-hald_freebsd_hf-scsi.c > patch-hald_freebsd_hf-usb.c patch-hald_freebsd_hf-usb2.c > patch-hald_freebsd_hf-volume.c patch-hald_freebsd_probe-usb2-device.c > patch-hald_freebsd_probing_Makefile.am > patch-hald_freebsd_probing_Makefile.in > patch-hald_freebsd_probing_probe-storage.c > patch-hald_freebsd_probing_probe-usb2-interface.c > patch-hald_freebsd_probing_probe-video4linux.c > patch-hald_freebsd_probing_probe-volume.c applied cleanly. > --001a1133e4caf1c93f04f736887a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
I dug into this further and realized that the problem is t= hat the submitted patch file in [1] is actually the patch file for the Free= BSD patch file (a meta-patchfile?). If you apply the new, bad patch file to= the old patch file [2], then the port will build!



O= n Wed, Apr 16, 2014 at 10:23 PM, Christopher Kenna <cjkenna@gmail.com&= gt; wrote:
I dug into this more. The p= roblem is that change=C2=A0351423 has a bad patch.

Chang= e:

Bad patch introduced:

=3D=3D=3D>=C2=A0 Patching for hal-0.5.14_24

=3D=3D=3D>=C2=A0 Applying FreeBSD patches for hal-0.5.14_24

File to patch: ^C

root@localhost:/usr/ports/sysutils/hal # =3D> Patch patch-hald_hf-sto= rage.c failed to apply cleanly.

=3D> Patch(es) patch-Makefile.in patch-doc_Makefile.in patch-fdi_poli= cy_10osvendor_10-power-mgmt-policy.fdi patch-fdi_policy_10osvendor_10-x11-i= nput.fdi patch-hald-runner_runner.c patch-hald_freebsd_Makefile.in patch-ha= ld_freebsd_addons_addon-storage.c patch-hald_freebsd_hf-devd.c patch-hald_f= reebsd_hf-devtree.c patch-hald_freebsd_hf-drm.c patch-hald_freebsd_hf-memca= rd.c patch-hald_freebsd_hf-memcard.h patch-hald_freebsd_hf-scsi.c patch-hal= d_freebsd_hf-usb.c patch-hald_freebsd_hf-usb2.c patch-hald_freebsd_hf-volum= e.c patch-hald_freebsd_probe-usb2-device.c patch-hald_freebsd_probing_Makef= ile.am patch-hald_freebsd_probing_Makefile.in patch-hald_freebsd_probing_pr= obe-storage.c patch-hald_freebsd_probing_probe-usb2-interface.c patch-hald_= freebsd_probing_probe-video4linux.c patch-hald_freebsd_probing_probe-volume= .c applied cleanly.


--001a1133e4caf1c93f04f736887a--