Skip to content

Commit

Permalink
Update 5 packages
Browse files Browse the repository at this point in the history 
git (2.46.0-1 -> 2.46.1-1)
mingw-w64-i686-ncurses (6.4.20231217-1 -> 6.5.20240831-1)
mingw-w64-x86_64-ncurses (6.4.20231217-1 -> 6.5.20240831-1)
msys2-runtime (3.4.10-6 -> 3.4.10-7)
msys2-runtime-devel (3.4.10-6 -> 3.4.10-7)

Signed-off-by: Git for Windows Build Agent <[email protected]>
  • Loading branch information
Git for Windows Build Agent committed Sep 16, 2024
1 parent 359bc4d commit a7acb27
Show file tree
Hide file tree
Showing 2,593 changed files with 553 additions and 239 deletions.
Binary file modified mingw32/bin/i686-w64-mingw32-captoinfo.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-clear.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-infocmp.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-infotocap.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-reset.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-tabs.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-tic.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-toe.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-tput.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/i686-w64-mingw32-tset.exe
View file
Binary file not shown.
Binary file modified mingw32/bin/libformw6.dll
View file
Binary file not shown.
Binary file modified mingw32/bin/libmenuw6.dll
View file
Binary file not shown.
Binary file modified mingw32/bin/libncurses++w6.dll
View file
Binary file not shown.
Binary file modified mingw32/bin/libncursesw6.dll
View file
Binary file not shown.
Binary file modified mingw32/bin/libpanelw6.dll
View file
Binary file not shown.
133 changes: 97 additions & 36 deletions mingw32/bin/ncursesw6-config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# $Id: ncurses-config.in,v 1.52 2022/07/26 21:36:28 tom Exp $
# $Id: ncurses-config.in,v 1.54 2024/07/13 20:00:52 tom Exp $
##############################################################################
# Copyright 2018-2021,2022 Thomas E. Dickey #
# Copyright 2018-2022,2024 Thomas E. Dickey #
# Copyright 2006-2015,2017 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
Expand Down Expand Up @@ -65,6 +65,9 @@ then
case "$item" in
./*|../*|*/..|*/../*)
;;
$libdir) # skip standard libdir
continue
;;
*)
[ -n "$filtered" ] && filtered="${filtered}:"
filtered="${filtered}${item}"
Expand Down Expand Up @@ -94,6 +97,24 @@ else
LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
fi

CFLAGS=" -DNCURSES_WIDECHAR"
if [ "$includedir" != "/usr/include" ]; then
if [ "xno" = xno ]
then
[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
CFLAGS="$CFLAGS -I${includesubdir}"
fi
[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
CFLAGS="$CFLAGS-I${includedir}"
includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
[ "$includetop" = "/usr/include" ] && includetop="$includedir"
if [ "x$includetop" != "x$includedir" ]
then
[ -n "$CFLAGS" ] && CFLAGS="$CFLAGS "
CFLAGS="$CFLAGS-I$includetop"
fi
fi

# Ignore -L options which do not correspond to an actual directory, or which
# are standard library directories (i.e., the linker is supposed to search
# those directories).
Expand All @@ -107,7 +128,7 @@ do
-specs*) # ignore linker specs-files which were used to build library
continue
;;
-Wl,-z,*) # ignore flags used to manipulate shared image
-Wl,-z*) # ignore flags used to manipulate shared image
continue
;;
-Wl,--dynamic-linker*) # ignore ELF interpreter
Expand Down Expand Up @@ -155,9 +176,6 @@ do
continue
fi
;;
$libdir) # skip standard libdir
continue
;;
*)
found=no
for check in $lib_flags
Expand Down Expand Up @@ -189,16 +207,57 @@ while [ $# -gt 0 ]; do
;;
# compile/link
--cflags)
INCS=" -DNCURSES_WIDECHAR"
if [ "xno" = xno ]; then
INCS="$INCS -I${includesubdir}"
fi
if [ "${includedir}" != /usr/include ]; then
INCS="$INCS -I${includedir}"
fi
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$INCS
ENDECHO
OPTS=
for opt in $CFLAGS
do
case "x$opt" in
x-[OW]*)
opt=
;;
esac
if [ -n "$opt" ]
then
[ -n "$OPTS" ] && OPTS="$OPTS "
OPTS="$OPTS$opt"
fi
done
printf "%s\n" "$OPTS"
;;
--cflags-only-I)
OPTS=
for opt in $CFLAGS
do
case "x$opt" in
x-[I]*)
;;
*)
opt=
;;
esac
if [ -n "$opt" ]
then
[ -n "$OPTS" ] && OPTS="$OPTS "
OPTS="$OPTS$opt"
fi
done
printf "%s\n" "$OPTS"
;;
--cflags-only-other)
OPTS=
for opt in $CFLAGS
do
case "x$opt" in
x-[I]*|x-[OW]*)
opt=
;;
esac
if [ -n "$opt" ]
then
[ -n "$OPTS" ] && OPTS="$OPTS "
OPTS="$OPTS$opt"
fi
done
printf "%s\n" "$OPTS"
;;
--libs)
OPTS=
Expand Down Expand Up @@ -252,7 +311,7 @@ ENDECHO
;;
# identification
--version)
echo "6.4.20231217"
echo "6.5.20240831"
;;
--abi-version)
echo "6"
Expand Down Expand Up @@ -297,30 +356,32 @@ ENDECHO
Usage: `basename "$0"` [options]
Options:
--prefix echos the package-prefix of ${THIS}
--exec-prefix echos the executable-prefix of ${THIS}
--prefix echos the package-prefix of ${THIS}
--exec-prefix echos the executable-prefix of ${THIS}
--cflags echos the C compiler flags needed to compile with ${THIS}
--libs echos the libraries needed to link with ${THIS}
--cflags echos the C compiler flags needed to compile for ${THIS}
--cflags-only-I echos only -I C compiler flags needed with ${THIS}
--cflags-only-other echos only C compiler flags other than -I for ${THIS}
--libs echos the libraries needed to link with ${THIS}
--libs-only-L echos -L linker options (search path) for ${THIS}
--libs-only-l echos -l linker options (libraries) for ${THIS}
--libs-only-other echos linker options other than -L/-l
--libs-only-L echos -L linker options (search path) for ${THIS}
--libs-only-l echos -l linker options (libraries) for ${THIS}
--libs-only-other echos linker options other than -L/-l
--version echos the release+patchdate version of ${THIS}
--abi-version echos the ABI version of ${THIS}
--mouse-version echos the mouse-interface version of ${THIS}
--version echos the release+patchdate version of ${THIS}
--abi-version echos the ABI version of ${THIS}
--mouse-version echos the mouse-interface version of ${THIS}
--bindir echos the directory containing ${THIS} programs
--datadir echos the directory containing ${THIS} data
--includedir echos the directory containing ${THIS} header files
--libdir echos the directory containing ${THIS} libraries
--mandir echos the directory containing ${THIS} manpages
--terminfo echos the \$TERMINFO terminfo database path
--terminfo-dirs echos the \$TERMINFO_DIRS directory list
--termpath echos the \$TERMPATH termcap list
--bindir echos the directory containing ${THIS} programs
--datadir echos the directory containing ${THIS} data
--includedir echos the directory containing ${THIS} header files
--libdir echos the directory containing ${THIS} libraries
--mandir echos the directory containing ${THIS} manpages
--terminfo echos the \$TERMINFO terminfo database path
--terminfo-dirs echos the \$TERMINFO_DIRS directory list
--termpath echos the \$TERMPATH termcap list
--help prints this message
--help prints this message
ENDHELP
;;
--error|*)
Expand Down
34 changes: 24 additions & 10 deletions mingw32/include/ncurses/curses.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright 2018-2021,2023 Thomas E. Dickey *
* Copyright 2018-2023,2024 Thomas E. Dickey *
* Copyright 1998-2016,2017 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
Expand Down Expand Up @@ -33,7 +33,7 @@
* and: Thomas E. Dickey 1996-on *
****************************************************************************/

/* $Id: curses.h.in,v 1.281 2023/08/12 14:20:15 tom Exp $ */
/* $Id: curses.h.in,v 1.282 2024/01/19 11:50:07 tom Exp $ */

#ifndef __NCURSES_H
#define __NCURSES_H
Expand Down Expand Up @@ -64,19 +64,20 @@
NCURSES_OSPEED_COMPAT
NCURSES_PATHSEP
NCURSES_REENTRANT
NCURSES_SIGWINCH
*/

#define CURSES 1
#define CURSES_H 1

/* These are defined only in curses.h, and are used for conditional compiles */
#define NCURSES_VERSION_MAJOR 6
#define NCURSES_VERSION_MINOR 4
#define NCURSES_VERSION_PATCH 20231217
#define NCURSES_VERSION_MINOR 5
#define NCURSES_VERSION_PATCH 20240831

/* This is defined in more than one ncurses header, for identification */
#undef NCURSES_VERSION
#define NCURSES_VERSION "6.4"
#define NCURSES_VERSION "6.5"

/*
* Identify the mouse encoding version.
Expand Down Expand Up @@ -170,6 +171,19 @@
#define NCURSES_REENTRANT 0
#endif

/*
* KEY_RESIZE is an extended feature that relies upon the SIGWINCH handler
* in ncurses.
*/
#if 1
#ifndef NCURSES_SIGWINCH
#define NCURSES_SIGWINCH 1
#endif
#else
#undef NCURSES_SIGWINCH
#define NCURSES_SIGWINCH 0
#endif

/*
* In certain environments, we must work around linker problems for data
*/
Expand Down Expand Up @@ -477,7 +491,7 @@ typedef struct
wchar_t chars[CCHARW_MAX];
#if 1
#undef NCURSES_EXT_COLORS
#define NCURSES_EXT_COLORS 20231217
#define NCURSES_EXT_COLORS 20240831
int ext_color; /* color pair, must be more than 16-bits */
#endif
}
Expand Down Expand Up @@ -924,7 +938,7 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
*/
#if 1
#undef NCURSES_EXT_FUNCS
#define NCURSES_EXT_FUNCS 20231217
#define NCURSES_EXT_FUNCS 20240831
typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
extern NCURSES_EXPORT(int) alloc_pair (int, int);
Expand Down Expand Up @@ -995,7 +1009,7 @@ extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generat
*/
#if 1
#undef NCURSES_SP_FUNCS
#define NCURSES_SP_FUNCS 20231217
#define NCURSES_SP_FUNCS 20240831
#define NCURSES_SP_NAME(name) name##_sp

/* Define the sp-funcs helper function */
Expand Down Expand Up @@ -1520,7 +1534,7 @@ extern NCURSES_EXPORT_VAR(int) TABSIZE;
#define KEY_SRESET 0530 /* Soft (partial) reset (unreliable) */
#define KEY_RESET 0531 /* Reset or hard reset (unreliable) */
/*
* These definitions were generated by ./MKkey_defs.sh ../../ncurses-6.4-20231217/include/Caps ../../ncurses-6.4-20231217/include/Caps-ncurses
* These definitions were generated by ./MKkey_defs.sh ../../ncurses-6.5-20240831/include/Caps ../../ncurses-6.5-20240831/include/Caps-ncurses
*/
#define KEY_DOWN 0402 /* down-arrow key */
#define KEY_UP 0403 /* up-arrow key */
Expand Down Expand Up @@ -1611,7 +1625,7 @@ extern NCURSES_EXPORT_VAR(int) TABSIZE;
#define KEY_UNDO 0630 /* undo key */
#define KEY_MOUSE 0631 /* Mouse event has occurred */

#ifdef NCURSES_EXT_FUNCS
#if NCURSES_SIGWINCH
#define KEY_RESIZE 0632 /* Terminal resize event */
#endif

Expand Down
14 changes: 9 additions & 5 deletions mingw32/include/ncurses/nc_mingw.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright 2018-2020,2023 Thomas E. Dickey *
* Copyright 2018-2023,2024 Thomas E. Dickey *
* Copyright 2008-2010,2017 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
Expand Down Expand Up @@ -31,12 +31,14 @@
* Author: Thomas Dickey, 2008-on *
****************************************************************************/

/* $Id: nc_mingw.h,v 1.10 2023/02/25 19:59:24 tom Exp $ */
/* $Id: nc_mingw.h,v 1.13 2024/08/31 15:50:24 tom Exp $ */

#ifndef NC_MINGW_H
#define NC_MINGW_H 1

#ifdef _WIN32
#include <ncurses_cfg.h>

#if defined(_WIN32) || defined(__MSYS__) || defined(__CYGWIN__)

#ifdef WINVER
# if WINVER < 0x0501
Expand All @@ -58,6 +60,8 @@
#include <winsock2.h> /* for struct timeval */
#endif

#include <stdint.h> /* for uint32_t */

#ifdef __cplusplus
extern "C" {
#endif
Expand All @@ -77,12 +81,12 @@ NCURSES_EXPORT(int) _nc_gettimeofday(struct timeval *, void *);

#undef wcwidth
#define wcwidth(ucs) _nc_wcwidth((wchar_t)(ucs))
NCURSES_EXPORT(int) _nc_wcwidth(wchar_t);
NCURSES_EXPORT(int) _nc_wcwidth(uint32_t);

#ifdef __cplusplus
}
#endif

#endif /* _WIN32 */
#endif /* _WIN32|__MSYS__|__CYGWIN__ */

#endif /* NC_MINGW_H */
Loading

0 comments on commit a7acb27

Please sign in to comment.