CVS commit: pkgsrc/editors/vim-share

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon May  5 15:05:28 UTC 2025

Modified Files:
        pkgsrc/editors/vim-share: distinfo
Added Files:
        pkgsrc/editors/vim-share/patches: patch-popupwin.c patch-vim.h

Log Message:
vim-share: fix Tiger build.

Also tested on NetBSD 10.1 and macOS 15.4.1.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 pkgsrc/editors/vim-share/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/vim-share/patches/patch-popupwin.c \
    pkgsrc/editors/vim-share/patches/patch-vim.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/vim-share/distinfo
diff -u pkgsrc/editors/vim-share/distinfo:1.217 pkgsrc/editors/vim-share/distinfo:1.218
--- pkgsrc/editors/vim-share/distinfo:1.217     Sun Mar 16 15:12:37 2025
+++ pkgsrc/editors/vim-share/distinfo   Mon May  5 15:05:27 2025
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.217 2025/03/16 15:12:37 morr Exp $
+$NetBSD: distinfo,v 1.218 2025/05/05 15:05:27 schmonz Exp $
 
 BLAKE2s (vim-9.1.1206.tar.gz) = cdcf0d7884828784e74da5991c3468561c9943ff5355fd95302fb46c8b198573
 SHA512 (vim-9.1.1206.tar.gz) = 435faf65774cc3603f551e4af948ad0c6588b7a775068b278d9872898875b74fb44f47c0db31de3232e15f4d74c4206627981913ff0e100713d6c23e8383310f
 Size (vim-9.1.1206.tar.gz) = 18595650 bytes
 SHA1 (patch-Makefile) = d05c1b787804bc0907cbb9476d54aef558ceddad
 SHA1 (patch-feature.h) = e7d3385dc09e0ed7d45577344e9988264c0de4dd
+SHA1 (patch-popupwin.c) = b34794445897c5dbfca1c4d55b3b0f84672a3770
+SHA1 (patch-vim.h) = 2213d690fcf5eb79deab769ad82f9e5717dce459

Added files:

Index: pkgsrc/editors/vim-share/patches/patch-popupwin.c
diff -u /dev/null pkgsrc/editors/vim-share/patches/patch-popupwin.c:1.1
--- /dev/null   Mon May  5 15:05:28 2025
+++ pkgsrc/editors/vim-share/patches/patch-popupwin.c   Mon May  5 15:05:27 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-popupwin.c,v 1.1 2025/05/05 15:05:27 schmonz Exp $
+
+Fix Tiger build.
+
+--- src/popupwin.c.orig        2025-03-15 09:19:48.000000000 +0000
++++ src/popupwin.c
+@@ -4567,7 +4567,9 @@ popup_hide_info(void)
+ 
+     if (wp != NULL)
+     {
++#ifdef HAS_MESSAGE_WINDOW
+       popup_on_cmdline = wp->w_popup_flags & POPF_ON_CMDLINE;
++#endif
+       popup_hide(wp);
+     }
+ }
+@@ -4578,7 +4580,11 @@ popup_hide_info(void)
+     int
+ popup_overlaps_cmdline(void)
+ {
++#ifdef HAS_MESSAGE_WINDOW
+     return popup_on_cmdline;
++#else
++    return 0;
++#endif
+ }
+ 
+ /*
Index: pkgsrc/editors/vim-share/patches/patch-vim.h
diff -u /dev/null pkgsrc/editors/vim-share/patches/patch-vim.h:1.1
--- /dev/null   Mon May  5 15:05:28 2025
+++ pkgsrc/editors/vim-share/patches/patch-vim.h        Mon May  5 15:05:27 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-vim.h,v 1.1 2025/05/05 15:05:27 schmonz Exp $
+
+Fix Tiger build.
+
+--- src/vim.h.orig     2025-03-15 09:19:48.000000000 +0000
++++ src/vim.h
+@@ -2316,7 +2316,7 @@ typedef struct stat stat_T;
+ # define ATTRIBUTE_FORMAT_PRINTF(fmt_idx, arg_idx)
+ #endif
+ 
+-#if defined(__GNUC__) || defined(__clang__)
++#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || defined(__clang__)
+ # define likely(x)    __builtin_expect((x), 1)
+ # define unlikely(x)  __builtin_expect((x), 0)
+ # define ATTRIBUTE_COLD       __attribute__((cold))