From eb5036c4d2b4bd617a94abce6efea9fac2ebd836 Mon Sep 17 00:00:00 2001 From: Lucas Holt Date: Sun, 1 Dec 2024 13:10:02 -0500 Subject: [PATCH] update dialog config --- contrib/dialog/.gitattributes | 311 --------------------------------- contrib/dialog/dialog.c | 1 + contrib/dialog/util.c | 8 +- gnu/Makefile | 2 - gnu/Makefile.inc | 1 - gnu/lib/Makefile | 1 - gnu/lib/Makefile.inc | 1 - gnu/lib/libdialog/dlg_config.h | 21 ++- gnu/lib/tests/Makefile | 1 - 9 files changed, 25 insertions(+), 322 deletions(-) delete mode 100644 contrib/dialog/.gitattributes diff --git a/contrib/dialog/.gitattributes b/contrib/dialog/.gitattributes deleted file mode 100644 index e719d6dcb26..00000000000 --- a/contrib/dialog/.gitattributes +++ /dev/null @@ -1,311 +0,0 @@ -* text=auto !eol -/CHANGES -text -/COPYING -text -/README -text -/VERSION -text -/aclocal.m4 -text -/argv.c -text -/arrows.c -text -/buildlist.c -text -/buttons.c -text -/calendar.c -text -/checklist.c -text -/columns.c -text -/config.guess -text -/config.hin -text -/config.sub -text -/configure -text -/configure.in -text -/dialog-config.in -text -/dialog.1 -text -/dialog.3 -text -/dialog.c -text -/dialog.h -text -/dialog.lsm -text -/dialog.pl -text -/dlg_colors.h -text -/dlg_keys.c -text -/dlg_keys.h -text -/editbox.c -text -/formbox.c -text -/fselect.c -text -/guage.c -text -/headers-sh.in -text -/help.c -text -/inputbox.c -text -/inputstr.c -text -/install-sh -text -/makefile.in -text -/menubox.c -text -/mixedform.c -text -/mixedgauge.c -text -/mouse.c -text -/mousewget.c -text -/msgbox.c -text -package/debian/changelog -text -package/debian/compat -text -package/debian/control -text -package/debian/copyright -text -package/debian/docs -text -package/debian/rules -text -package/debian/source/format -text -package/debian/watch -text -package/dialog.spec -text -package/freebsd/Makefile -text -package/freebsd/distinfo -text -package/freebsd/pkg-descr -text -package/freebsd/pkg-plist -text -/pause.c -text -po/POTFILES.in -text -po/an.po -text -po/ar.po -text -po/be@latin.po -text -po/bg.po -text -po/ca.po -text -po/cs.po -text -po/cy.po -text -po/da.po -text -po/de.po -text -po/dialog.pot -text -po/el.po -text -po/eo.po -text -po/es.po -text -po/et.po -text -po/eu.po -text -po/fa.po -text -po/fi.po -text -po/fr.po -text -po/ga.po -text -po/gl.po -text -po/hi.po -text -po/hr.po -text -po/hu.po -text -po/ia.po -text -po/id.po -text -po/is.po -text -po/it.po -text -po/ja.po -text -po/ku.po -text -po/lt.po -text -po/lv.po -text -po/makefile.inn -text -po/mg.po -text -po/mk.po -text -po/ms.po -text -po/nb.po -text -po/nl.po -text -po/pl.po -text -po/pt.po -text -po/pt_BR.po -text -po/rm.po -text -po/ro.po -text -po/ru.po -text -po/rw.po -text -po/sk.po -text -po/sl.po -text -po/sq.po -text -po/sr.po -text -po/sv.po -text -po/sw.po -text -po/th.po -text -po/tr.po -text -po/uk.po -text -po/vi.po -text -po/wa.po -text -po/zh_CN.po -text -po/zh_TW.po -text -/prgbox.c -text -/progressbox.c -text -/rangebox.c -text -/rc.c -text -/rename.sh -text -samples/README -text -samples/buildlist -text -samples/buildlist2 -text -samples/calendar -text -samples/calendar-stdout -text -samples/calendar2 -text -samples/calendar2-stdout -text -samples/calendar3 -text -samples/calendar3-stdout -text -samples/checklist -text -samples/checklist-8bit -text -samples/checklist-utf8 -text -samples/checklist1 -text -samples/checklist10 -text -samples/checklist11 -text -samples/checklist12 -text -samples/checklist2 -text -samples/checklist3 -text -samples/checklist4 -text -samples/checklist5 -text -samples/checklist6 -text -samples/checklist7 -text -samples/checklist8 -text -samples/checklist9 -text -samples/checklist9.txt -text -samples/debian.rc -text -samples/dft-cancel -text -samples/dft-extra -text -samples/dft-help -text -samples/dft-no -text -samples/dialog.py -text -samples/editbox -text -samples/editbox-utf8 -text -samples/editbox2 -text -samples/editbox3 -text -samples/editbox4 -text -samples/form1 -text -samples/form1-both -text -samples/form1-extra -text -samples/form1-help -text -samples/form1-utf8 -text -samples/form2 -text -samples/form3 -text -samples/form4 -text -samples/form5 -text -samples/form6 -text -samples/fselect -text -samples/fselect-stdout -text -samples/fselect0 -text -samples/fselect1 -text -samples/fselect1-stdout -text -samples/fselect2 -text -samples/fselect2-stdout -text -samples/gauge -text -samples/gauge0 -text -samples/gauge0-input-fd -text -samples/gauge2 -text -samples/infobox -text -samples/infobox1 -text -samples/infobox2 -text -samples/infobox3 -text -samples/infobox4 -text -samples/infobox5 -text -samples/infobox6 -text -samples/inputbox -text -samples/inputbox-both -text -samples/inputbox-extra -text -samples/inputbox-help -text -samples/inputbox1 -text -samples/inputbox2 -text -samples/inputbox3 -text -samples/inputbox4 -text -samples/inputbox5 -text -samples/inputbox6-8bit -text -samples/inputbox6-utf8 -text -samples/inputbox7 -text -samples/inputmenu -text -samples/inputmenu-stdout -text -samples/inputmenu1 -text -samples/inputmenu2 -text -samples/inputmenu3 -text -samples/inputmenu4 -text -samples/killall -text -samples/listing -text -samples/menubox -text -samples/menubox-8bit -text -samples/menubox-utf8 -text -samples/menubox1 -text -samples/menubox10 -text -samples/menubox12 -text -samples/menubox2 -text -samples/menubox3 -text -samples/menubox4 -text -samples/menubox5 -text -samples/menubox6 -text -samples/menubox7 -text -samples/menubox8 -text -samples/menubox9 -text -samples/mixedform -text -samples/mixedform2 -text -samples/mixedgauge -text -samples/msgbox -text -samples/msgbox-help -text -samples/msgbox-utf8 -text svneol=unset#application/octet-stream -samples/msgbox1 -text -samples/msgbox2 -text -samples/msgbox3 -text -samples/msgbox4-8bit -text -samples/msgbox4-eucjp -text -samples/msgbox4-utf8 -text -samples/msgbox5 -text -samples/msgbox6 -text -samples/msgbox6a -text -samples/password -text -samples/password1 -text -samples/password2 -text -samples/passwordform1 -text -samples/passwordform1-utf8 -text -samples/pause -text -samples/pause-both -text -samples/pause-extra -text -samples/pause-help -text -samples/prgbox -text -samples/prgbox2 -text -samples/programbox -text -samples/programbox2 -text -samples/progress -text -samples/progress2 -text -samples/radiolist -text -samples/radiolist1 -text -samples/radiolist10 -text -samples/radiolist2 -text -samples/radiolist3 -text -samples/radiolist4 -text -samples/rangebox -text -samples/rangebox2 -text -samples/rangebox3 -text -samples/rangebox4 -text -samples/report-button -text -samples/report-edit -text -samples/report-string -text -samples/report-tempfile -text -samples/report-yesno -text -samples/rotated-data -text -samples/setup-edit -text -samples/setup-tempfile -text -samples/setup-utf8 -text -samples/setup-vars -text -samples/shortlist -text -samples/slackware.rc -text -samples/sourcemage.rc -text -samples/suse.rc -text -samples/tailbox -text -samples/tailboxbg -text -samples/tailboxbg1 -text -samples/tailboxbg2 -text -samples/testdata-8bit -text -samples/textbox -text -samples/textbox-both -text -samples/textbox-help -text -samples/textbox.txt -text -samples/textbox2 -text -samples/textbox3 -text -samples/timebox -text -samples/timebox-stdout -text -samples/timebox2 -text -samples/timebox2-stdout -text -samples/treeview -text -samples/treeview2 -text -samples/wheel -text -samples/whiptail.rc -text -samples/with-dquotes -text -samples/with-squotes -text -samples/yesno -text -samples/yesno-both -text -samples/yesno-extra -text -samples/yesno-help -text -samples/yesno-utf8 -text -samples/yesno2 -text -samples/yesno3 -text -samples/yesno4 -text -/tailbox.c -text -/textbox.c -text -/timebox.c -text -/trace.c -text -/treeview.c -text -/ui_getc.c -text -/util.c -text -/version.c -text -/yesno.c -text diff --git a/contrib/dialog/dialog.c b/contrib/dialog/dialog.c index 510baeb97ad..f59c9dc03c1 100644 --- a/contrib/dialog/dialog.c +++ b/contrib/dialog/dialog.c @@ -26,6 +26,7 @@ #include +#include #include #include #include diff --git a/contrib/dialog/util.c b/contrib/dialog/util.c index d5bbd87c624..726a36a5031 100644 --- a/contrib/dialog/util.c +++ b/contrib/dialog/util.c @@ -38,9 +38,11 @@ #include #endif -//#ifdef HAVE_SYS_PARAM_H -///#include -//#endif +#ifdef HAVE_SYS_PARAM_H +#undef MIN +#undef MAX +#include +#endif #if defined(NCURSES_VERSION) #define CAN_KEEP_TITE 1 diff --git a/gnu/Makefile b/gnu/Makefile index f0b6f7a36fc..301faa1c867 100644 --- a/gnu/Makefile +++ b/gnu/Makefile @@ -1,5 +1,3 @@ -# @(#)Makefile 5.33.1.1 (Berkeley) 5/6/91 - .include SUBDIR= lib .WAIT \ diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc index 0c24247f892..6ceebdef9d5 100644 --- a/gnu/Makefile.inc +++ b/gnu/Makefile.inc @@ -1,4 +1,3 @@ - # Do not lint the GNU stuff. It is all externally maintained and # lint output is wasteful noise here. diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 0b5e328601f..1f92672b49b 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/gnu/lib/Makefile.inc +++ b/gnu/lib/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/gnu/lib/libdialog/dlg_config.h b/gnu/lib/libdialog/dlg_config.h index f81ee7c2715..040f02eb03f 100644 --- a/gnu/lib/libdialog/dlg_config.h +++ b/gnu/lib/libdialog/dlg_config.h @@ -4,8 +4,23 @@ */ #define CURSES_WACS_ARRAY _nc_wacs +#define CURSES_WACS_SYMBOLS 1 #define DIALOG_PATCHDATE 20210117 #define DIALOG_VERSION "1.3" +#ifndef GCC_NORETURN +#define GCC_NORETURN __attribute__((noreturn)) +#endif +#define GCC_PRINTF 1 +#ifndef GCC_PRINTFLIKE +#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var))) +#endif +#define GCC_SCANF 1 +#ifndef GCC_SCANFLIKE +#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var))) +#endif +#ifndef GCC_UNUSED +#define GCC_UNUSED __attribute__((unused)) +#endif #define HAVE_ALLOCA 1 #define HAVE_BTOWC 1 #define HAVE_COLOR 1 @@ -56,6 +71,7 @@ #define HAVE_NL_TYPES_H 1 #define HAVE_PUTENV 1 #define HAVE_RC_FILE 1 +#define HAVE_RC_FILE2 1 #define HAVE_SEARCH_H 1 #define HAVE_SETENV 1 #define HAVE_SETLOCALE 1 @@ -91,11 +107,11 @@ #define HAVE_WCTOMB 1 #define HAVE_WCURSYNCUP 1 #define HAVE_WGETPARENT 1 +#define HAVE_WGET_WCH 1 #define HAVE_WHIPTAIL 1 #define HAVE_WSYNCUP 1 #define HAVE_XDIALOG 1 #define HAVE_XDIALOG2 1 -#define HAVE__NC_FREE_AND_EXIT 1 #define ICONV_CONST #define MIXEDCASE_FILENAMES 1 #define NCURSES 1 @@ -103,7 +119,8 @@ #define PACKAGE "dialog" #define RETSIGTYPE void #define STDC_HEADERS 1 -#define SYSTEM_NAME "freebsd12.0" +#define SYSTEM_NAME "MidnightBSD" #define TIME_WITH_SYS_TIME 1 #define TYPE_CHTYPE_IS_SCALAR 1 #define USE_WIDE_CURSES 1 +#define WIDEC_CURSES 1 diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/gnu/lib/tests/Makefile +++ b/gnu/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes