Bug 226384

Summary: chinese/fcitx: make patch failed
Product: Ports & Packages Reporter: Iblis Lin <iblis.dif01>
Component: Individual Port(s)Assignee: Tobias Kortkamp <tobik>
Status: Closed FIXED    
Severity: Affects Only Me CC: lichray, wen
Priority: --- Flags: lichray: maintainer-feedback+
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
update the patch lichray: maintainer-approval+

Description Iblis Lin 2018-03-06 01:39:11 UTC
Hi,

I got this:
```
└─[iblis@abeing]% make patch                                                                                                             
===>  License GPLv2 accepted by the user                                                                                                 
===>   zh-fcitx-4.2.9.1_4 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by zh-fcitx-4.2.9.1_4 for building
===>  Extracting for zh-fcitx-4.2.9.1_4                                            
===>  License GPLv2 accepted by the user
===>   zh-fcitx-4.2.9.1_4 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by zh-fcitx-4.2.9.1_4 for building
=> SHA256 Checksum OK for fcitx/fcitx-4.2.9.1.tar.xz.
=> SHA256 Checksum OK for fcitx/en_dict-20121020.tar.gz.
=> SHA256 Checksum OK for fcitx/pinyin.tar.gz.                 
=> SHA256 Checksum OK for fcitx/py_stroke-20121124.tar.gz.
=> SHA256 Checksum OK for fcitx/py_table-20121124.tar.gz.
=> SHA256 Checksum OK for fcitx/table.tar.gz.                         
===>  Patching for zh-fcitx-4.2.9.1_4                                              
===>  Applying extra patch /usr/home/iblis/ports/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN
1 out of 2 hunks failed--saving rejects to data/punc.mb.zh_CN.rej
*** Error code 1                                                      
                                                                                   
Stop.                                                                 
make[2]: stopped in /usr/home/iblis/ports/chinese/fcitx                
*** Error code 1                                                                   
                                                          
Stop.                                                                 
make[1]: stopped in /usr/home/iblis/ports/chinese/fcitx                
*** Error code 1                                     
                                                                                             
Stop.                                                          
make: stopped in /usr/home/iblis/ports/chinese/fcitx
```
Comment 1 Wen Heping freebsd_committer freebsd_triage 2018-03-11 02:52:18 UTC
The patch had been included into upstream, we can remove this extra patch.
Would maintainer agree ?

wen
Comment 2 lichray 2018-03-11 03:12:17 UTC
Unable to reproduce.  Maybe a locale (when applying patches) issue?
Comment 3 lichray 2018-03-11 03:19:12 UTC
Created attachment 191383 [details]
update the patch

I see where is the problem.  Upstream now binds the 「」 to ], and the patch is not updated.  The affected users may be using a stricter patch option or a different version of patch.
Comment 4 Wen Heping freebsd_committer freebsd_triage 2018-03-11 04:42:32 UTC
(In reply to lichray from comment #2)
It could be reproduced by enable TPUNC option.

wen
Comment 5 lichray 2018-03-11 04:46:33 UTC
(In reply to Wen Heping from comment #4)
As I said, our patch programs may be operating differently.  Can you try out the patch I uploaded?
Comment 6 commit-hook freebsd_committer freebsd_triage 2018-12-27 09:30:16 UTC
A commit references this bug:

Author: tobik
Date: Thu Dec 27 09:30:03 UTC 2018
New revision: 488518
URL: https://svnweb.freebsd.org/changeset/ports/488518

Log:
  chinese/fcitx: Fix patch with TPUNC=on

  PR:		226384
  Submitted by:	maintainer

Changes:
  head/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN