git: 803383519aa6 - main - devel/universal-ctags: fix 32 bit platforms and unit test on 13

[Fernando Apesteguía]

The branch main has been updated by fernape:

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

commit 803383519aa63406409d2a88b88425e902bb93d8
Author:     Fernando Apesteguía <fernape at FreeBSD.org>
AuthorDate: 2021-04-20 07:32:07 +0000
Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
CommitDate: 2021-04-20 16:20:54 +0000

    devel/universal-ctags: fix 32 bit platforms and unit test on  13
    
    * bit shifting when right side is >= size of left side results in
      unknown behavior on some 32-bit platforms.  Reported upstream [1]
      and being fixed [2]
    
      Once fixed in arithy/packcc universal-ctags/ctags will need to import.
    
    * Fix regex in unit test due to possible bug with FreeBSD 13.
    
    PR:     255167
    Reported by:    dereks at lifeofadishwasher.com (maintainer)
---
 .../files/patch-Tmain_map-removing.d_run.sh        | 32 ++++++++++++++++++++++
 .../files/patch-misc_packcc_src_packcc.c           | 11 ++++++++
 2 files changed, 43 insertions(+)

diff --git a/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh b/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh
new file mode 100644
index 000000000000..114bc757307f
--- /dev/null
+++ b/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh
@@ -0,0 +1,32 @@
+--- Tmain/map-removing.d/run.sh.orig	2021-04-18 04:45:23 UTC
++++ Tmain/map-removing.d/run.sh
+@@ -6,25 +6,25 @@ CTAGS=$1
+ echo default map including '*.m'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --list-maps | grep '\*\.m\>.*$'
++	 --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' removing from '*.m' from 'ObjectiveC'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>.*$'
++	 --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' adding '*.m' to 'Ada'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --map-Ada=+.m --list-maps | grep '\*\.m\>.*$'
++	 --map-Ada=+.m --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' removing from '*.m' from 'ObjectiveC', and adding '*.m' to 'Ada'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>.*$'
++	 --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' guessing parser with adding '*.m' to 'Ada'
diff --git a/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c b/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c
new file mode 100644
index 000000000000..5bc12de4c8f2
--- /dev/null
+++ b/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c
@@ -0,0 +1,11 @@
+--- misc/packcc/src/packcc.c.orig	2021-04-16 22:31:22 UTC
++++ misc/packcc/src/packcc.c
+@@ -910,7 +910,7 @@ static size_t populate_bits(size_t x) {
+     x |= x >>  4;
+     x |= x >>  8;
+     x |= x >> 16;
+-#ifndef _M_IX86 /* not Windows for x86 (32-bit) */
++#if (defined __SIZEOF_SIZE_T__ && __SIZEOF_SIZE_T__ == 8)
+     x |= x >> 32;
+ #endif
+     return x;