Re: www/seamonkey has self-conflicting patch names

[coypu%SDF.ORG@localhost]

On Thu, Apr 07, 2016 at 01:54:40AM +0000, Taylor R Campbell wrote:
>    Date: Wed, 06 Apr 2016 19:54:15 -0400
>    From: Greg Troxel <gdt%ir.bbn.com@localhost>
> 
>    SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = 74c70bad49b9781dae6be4fd46c33da886bcfd34
>    SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.s) = c7d85b54adfca2b3ee0d0fb44859cb641d1e45c5
> 
>    perhasp the real problem is www/seamonkey itself.   These patch files
>    conflict on case-preserving filesystems.
> 
> Looks like the .s patch is the real patch, and the .S patch adds a
> copy of the (modified) file?  (No idea what file is in www/seamonkey
> itself.)
> 

[130:pkgsrc/www/seamonkey> ]$ sed -e 's/^+//g'
patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.S | diff -
work/seamonkey-2.40/mozilla/gfx/ycbcr/yuv_row_arm.s 
1,5d0
< $NetBSD: patch-mozilla_gfx_ycbcr_yuv__row__arm.S,v 1.1 2015/01/02
04:26:21 ryoon Exp $
< 
< --- mozilla/gfx/ycbcr/yuv_row_arm.S.orig	2015-01-01
17:44:52.000000000 +0000
< ++ mozilla/gfx/ycbcr/yuv_row_arm.S
< @@ -0,0 +1,312 @@
10,15d4
< #if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
< #define UNWIND
< #else
< #define UNWIND @
< #endif
< 
88,89c77
<     .cfi_startproc
<     UNWIND .fnstart
---
>     .fnstart
311,312c299
<     UNWIND .fnend
<     .cfi_endproc
---
>     .fnend
315c302
< #if defined(__ELF__)&&(defined(__linux__) || defined(__NetBSD__))
---
> #if defined(__ELF__)&&defined(__linux__)