Bug 264152

Summary: update of devel/indi to 1.9.6: patch fails
Product: Ports & Packages Reporter: tjlegg
Component: Individual Port(s)Assignee: Jose Alonso Cardenas Marquez <acm>
Status: Closed FIXED    
Severity: Affects Only Me Flags: bugzilla: maintainer-feedback? (acm)
Priority: ---    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
patch for files/patch-libs_indicom.c none

Description tjlegg 2022-05-22 14:11:35 UTC 
After the update of devel/indi to 1.9.6 (commit 22554c0021ba22fb8c8fae6bce2d934ab1374f84) it fails to build due to a patch not applying correctly.

"""
=======================<phase: patch          >============================
===>  Patching for indi-1.9.6
===>  Applying FreeBSD patches for indi-1.9.6 from /usr/ports/devel/indi/files
2 out of 3 hunks failed--saving rejects to libs/indicom.c.rej
===>  FAILED Applying FreeBSD patch-libs_indicom.c
===> FAILED to apply cleanly FreeBSD patch(es)  patch-libs_indicom.c
*** Error code 1

Stop.
make: stopped in /usr/ports/devel/indi
"""
Comment 1 tjlegg 2022-05-22 16:04:04 UTC 
Created attachment 234122 [details]
patch for files/patch-libs_indicom.c

After checking libs/indicom.c, the two patches that failed have already been upstreamed in the new version. Attached is a patch for files/patch-libs_indicom.c to remove those two.

After patching, devel/indi and astro/kstars both built successfully.
Comment 2 commit-hook freebsd_committer freebsd_triage 2022-05-22 16:38:53 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ddd5869a23810cfc525b4f3aa9b6878b8565040b

commit ddd5869a23810cfc525b4f3aa9b6878b8565040b
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2022-05-22 16:36:49 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2022-05-22 16:36:49 +0000

    devel/indi: Remove obsolete patch file

    - Changes were commit upstream
    PR:             264152
    Reported by:    tjlegg __at__ gmail.com

 devel/indi/files/patch-libs_indicom.c (gone) | 29 ----------------------------
 1 file changed, 29 deletions(-)
Comment 3 Jose Alonso Cardenas Marquez freebsd_committer freebsd_triage 2022-05-22 16:40:01 UTC 
I forgotten remove file patch on my commit. Thanks for your PR