Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xman for openSUSE:Factory checked in at 2024-03-25 21:11:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xman (Old) and /work/SRC/openSUSE:Factory/.xman.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xman" Mon Mar 25 21:11:42 2024 rev:11 rq:1161221 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xman/xman.changes 2023-10-02 20:06:24.534680371 +0200 +++ /work/SRC/openSUSE:Factory/.xman.new.1905/xman.changes 2024-03-25 21:18:29.124084846 +0100 @@ -1,0 +2,10 @@ +Mon Mar 25 02:22:58 UTC 2024 - Stefan Dirsch <[email protected]> + +- Update to version 1.2.0 + * This release improves the display of the formatted man page + when using man-db, fixes a memory leak when closing a man page, + and removes support for a number of OS'es from the 80's & 90's, + along with removing support for using Xprint to print a man + page. + +------------------------------------------------------------------- Old: ---- xman-1.1.6.tar.xz xman-1.1.6.tar.xz.sig New: ---- xman-1.2.0.tar.xz xman-1.2.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xman.spec ++++++ --- /var/tmp/diff_new_pack.RB8rLI/_old 2024-03-25 21:18:29.788109268 +0100 +++ /var/tmp/diff_new_pack.RB8rLI/_new 2024-03-25 21:18:29.792109415 +0100 @@ -1,7 +1,7 @@ # # spec file for package xman # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xman -Version: 1.1.6 +Version: 1.2.0 Release: 0 Summary: Manual page display program for the X Window System License: MIT ++++++ xman-1.1.6.tar.xz -> xman-1.2.0.tar.xz ++++++ ++++ 7376 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/ChangeLog new/xman-1.2.0/ChangeLog --- old/xman-1.1.6/ChangeLog 2023-09-29 02:47:18.000000000 +0200 +++ new/xman-1.2.0/ChangeLog 2024-03-24 18:54:46.000000000 +0100 @@ -1,3 +1,124 @@ +commit a545f985ac404a771424d08e5ced63e63601c9f5 +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 24 10:51:04 2024 -0700 + + xman 1.2.0 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7cd313b41e64862a5786cf87290c57899c96a67a +Author: Alan Coopersmith <[email protected]> +Date: Tue Feb 13 17:33:10 2024 -0800 + + unifdef NO_COMPRESS + + Had only been defined if defined(__SCO__) || defined(__UNIXWARE__) + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3fd68cb4ed34958cfc4d6cea123377f070561181 +Author: Alan Coopersmith <[email protected]> +Date: Tue Feb 13 17:31:00 2024 -0800 + + unifdef INCLUDE_XPRINT_SUPPORT + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8d5ae4a89ac057bc26db9c819136460331ffd29b +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 19:12:41 2024 -0800 + + unifdef ATHENA + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6a54a5630ee0e33f34387131e16d33d2b8c63aec +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 19:11:14 2024 -0800 + + unifdef BSD < 199103 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4c47303a0af4b5045f7735ccc848cd02fef6995d +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 19:07:56 2024 -0800 + + unifdef __bsdi__ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3ecea7a4526f571949b9d45430cfc44c59e406b6 +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 19:06:59 2024 -0800 + + unifdef defined(SVR4) && !defined(sun) + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 70ebfeb53325e65c9b11aca55d1722a9a76f8aa9 +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 18:06:17 2024 -0800 + + unifdef sony + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 01484cf8029253e704482817ebcff6c0d7449672 +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 18:01:44 2024 -0800 + + unifdef SCO, __SCO__, and __UNIXWARE__ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit c48217d6d977c15ef8bba9fc767a1997a1e91e99 +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 17:53:21 2024 -0800 + + unifdef hpux + + Since NO_MANPATH_SUPPORT was only defined if hpux was defined, + removes it too. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d0ee97550e4103bed00118a10f4adf87767079dc +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 17:51:22 2024 -0800 + + unifdef __osf__ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ae798c59e34eba8a83995579943b689fc42987bb +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 17:49:07 2024 -0800 + + unifdef sgi + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7f69157bb051c52526c3ba210f75564c86654d2f +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 12 17:47:27 2024 -0800 + + unifdef ISC + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 5eaec0c56f2afac5dea8f63f7a7b01c26e06382a +Author: gldrk <[email protected]> +Date: Wed Oct 4 05:36:30 2023 +0300 + + Restore formatting with modern man-db + +commit b8ee816d8045b4a0c216825ed96a5e0515c6d94e +Author: gldrk <[email protected]> +Date: Tue Sep 26 23:21:54 2023 +0300 + + Free buffered file contents when closing man page + commit 4208a0947f08562a727a855ddcd4605d201c99bd Author: Alan Coopersmith <[email protected]> Date: Thu Sep 28 17:44:13 2023 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/ScrollByL.c new/xman-1.2.0/ScrollByL.c --- old/xman-1.1.6/ScrollByL.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/ScrollByL.c 2024-03-24 18:54:37.000000000 +0100 @@ -701,8 +701,11 @@ if (sblw->scroll.bar != NULL) XtDestroyWidget(sblw->scroll.bar); /* Destroy scrollbar. */ - if (sblw->scroll.file != NULL) + if (sblw->scroll.file != NULL) { fclose(sblw->scroll.file); + sblw->scroll.file = NULL; + } + LoadFile(w); DestroyGCs(w); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/ScrollByL.h new/xman-1.2.0/ScrollByL.h --- old/xman-1.1.6/ScrollByL.h 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/ScrollByL.h 2024-03-24 18:54:37.000000000 +0100 @@ -41,17 +41,10 @@ * The default fonts. */ -#ifdef ATHENA -#define MANPAGE_NORMAL "fixed" -#define MANPAGE_BOLD "helvetica-bold12" -#define MANPAGE_ITALIC "helvetica-boldoblique12" -#define MANPAGE_SYMBOL "symbol-medium12" -#else #define MANPAGE_NORMAL "*-new century schoolbook-medium-r-normal--*-120-*" #define MANPAGE_BOLD "*-new century schoolbook-bold-r-normal--*-120-*" #define MANPAGE_ITALIC "*-new century schoolbook-bold-i-normal--*-120-*" #define MANPAGE_SYMBOL "*-symbol-medium-r-normal--*-120-*" -#endif /* ATHENA */ #define XtNindent "indent" #define XtNforceVert "forceVert" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/buttons.c new/xman-1.2.0/buttons.c --- old/xman-1.1.6/buttons.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/buttons.c 2024-03-24 18:54:37.000000000 +0100 @@ -282,10 +282,6 @@ XtSetValues(man_globals->both_screens_entry, arglist, ONE); } -#ifdef INCLUDE_XPRINT_SUPPORT - XtSetArg(arglist[0], XtNsensitive, True); - XtSetValues(man_globals->print_entry, arglist, ONE); -#endif /* INCLUDE_XPRINT_SUPPORT */ man_globals->label = XtCreateManagedWidget("manualTitle", labelWidgetClass, hpane, NULL, (Cardinal) 0); @@ -441,9 +437,6 @@ BOTH_SCREENS, REMOVE_MANPAGE, OPEN_MANPAGE, -#ifdef INCLUDE_XPRINT_SUPPORT - PRINT_MANPAGE, -#endif /* INCLUDE_XPRINT_SUPPORT */ SHOW_VERSION, QUIT }; @@ -479,33 +472,18 @@ case 6: man_globals->open_entry = entry; break; -#ifdef INCLUDE_XPRINT_SUPPORT - case 7: - man_globals->print_entry = entry; - break; - case 8: - man_globals->version_entry = entry; - break; - case 9: - man_globals->quit_entry = entry; - break; -#else /* !INCLUDE_XPRINT_SUPPORT */ case 7: man_globals->version_entry = entry; break; case 8: man_globals->quit_entry = entry; break; -#endif /* !INCLUDE_XPRINT_SUPPORT */ default: Error(("CreateOptionMenu: Unknown id=%d\n", i)); break; } } -#ifdef INCLUDE_XPRINT_SUPPORT - XtVaSetValues(man_globals->print_entry, XtNsensitive, FALSE, NULL); -#endif /* INCLUDE_XPRINT_SUPPORT */ } /* Function Name: CreateSectionMenu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/config.h.in new/xman-1.2.0/config.h.in --- old/xman-1.1.6/config.h.in 2023-09-29 02:47:11.000000000 +0200 +++ new/xman-1.2.0/config.h.in 2024-03-24 18:54:41.000000000 +0100 @@ -9,7 +9,7 @@ /* Define if the man implementation is man-db */ #undef HAVE_MANDB -/* Define to 1 if you have the `mkstemp' function. */ +/* Define to 1 if you have the 'mkstemp' function. */ #undef HAVE_MKSTEMP /* Define to 1 if you have the <stdint.h> header file. */ @@ -87,7 +87,7 @@ /* Release version string if set */ #undef RELEASE_VERSION -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -101,5 +101,11 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES + +/* Number of bits in time_t, on hosts where this is settable. */ +#undef _TIME_BITS + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +#undef __MINGW_USE_VC2005_COMPAT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/configure.ac new/xman-1.2.0/configure.ac --- old/xman-1.1.6/configure.ac 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/configure.ac 2024-03-24 18:54:37.000000000 +0100 @@ -23,8 +23,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xman], [1.1.6], - [https://gitlab.freedesktop.org/xorg/app/xman/issues], [xman]) +AC_INIT([xman], [1.2.0], + [https://gitlab.freedesktop.org/xorg/app/xman/-/issues/], [xman]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/defs.h new/xman-1.2.0/defs.h --- old/xman-1.1.6/defs.h 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/defs.h 2024-03-24 18:54:37.000000000 +0100 @@ -69,11 +69,7 @@ /* Names of the menu buttons */ -#ifdef INCLUDE_XPRINT_SUPPORT -#define NUM_OPTIONS 10 /* Number of menu options. */ -#else /* !INCLUDE_XPRINT_SUPPORT */ #define NUM_OPTIONS 9 /* Number of menu options. */ -#endif /* !INCLUDE_XPRINT_SUPPORT */ #define DIRECTORY "displayDirectory" #define MANPAGE "displayManualPage" @@ -82,9 +78,6 @@ #define BOTH_SCREENS "showBothScreens" #define REMOVE_MANPAGE "removeThisManpage" #define OPEN_MANPAGE "openNewManpage" -#ifdef INCLUDE_XPRINT_SUPPORT -#define PRINT_MANPAGE "printManualPage" -#endif /* INCLUDE_XPRINT_SUPPORT */ #define SHOW_VERSION "showVersion" #define QUIT "quit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/handler.c new/xman-1.2.0/handler.c --- old/xman-1.1.6/handler.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/handler.c 2024-03-24 18:54:37.000000000 +0100 @@ -41,10 +41,6 @@ #include <sys/stat.h> #include "globals.h" #include "vendor.h" -#ifdef INCLUDE_XPRINT_SUPPORT -#include "printdialog.h" -#include "print.h" -#endif /* INCLUDE_XPRINT_SUPPORT */ #ifdef RELEASE_VERSION #define XMAN_VERSION "Xman Version " PACKAGE_VERSION " - X11R" RELEASE_VERSION @@ -90,10 +86,6 @@ RemoveThisManpage(XtParent(w), NULL, NULL, NULL); else if (w == man_globals->open_entry) /* Open new manpage */ CreateNewManpage(XtParent(w), NULL, NULL, NULL); -#ifdef INCLUDE_XPRINT_SUPPORT - else if (w == man_globals->print_entry) /* Print current manpage */ - PrintThisManpage(XtParent(w), NULL, NULL, NULL); -#endif /* INCLUDE_XPRINT_SUPPORT */ else if (w == man_globals->version_entry) /* Get version */ ShowVersion(XtParent(w), NULL, NULL, NULL); else if (w == man_globals->quit_entry) /* Quit. */ @@ -327,21 +319,15 @@ case 'S': case 's': -#ifndef NO_COMPRESS if (!man_globals->compress) -#endif - snprintf(cmdbuf, sizeof(cmdbuf), "%s %s %s", COPY, man_globals->tempfile, man_globals->save_file); - -#ifndef NO_COMPRESS else if (man_globals->gzip) snprintf(cmdbuf, sizeof(cmdbuf), "%s < %s > %s", GZIP_COMPRESS, man_globals->tempfile, man_globals->save_file); else snprintf(cmdbuf, sizeof(cmdbuf), "%s < %s > %s", COMPRESS, man_globals->tempfile, man_globals->save_file); -#endif if (!system(cmdbuf)) { /* make sure the formatted man page is fully accessible by the world */ @@ -639,112 +625,6 @@ } } -#ifdef INCLUDE_XPRINT_SUPPORT -static void -printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData) -{ - ManpageGlobals *mg = GetGlobals(w); - - XawPrintDialogClosePrinterConnection(mg->printdialog, False); -} - -static void -printOKXtProc(Widget w, XtPointer client_data, XtPointer callData) -{ - XawPrintDialogCallbackStruct *pdcs = - (XawPrintDialogCallbackStruct *) callData; - Cardinal n; - Arg args[2]; - ManpageGlobals *mg = GetGlobals(w); - Widget topwindow = mg->This_Manpage; - FILE *file; - - Log(("printOKXtProc: OK.\n")); - - /* Get file object */ - n = 0; - XtSetArg(args[n], XtNfile, &file); - n++; - XtGetValues(mg->manpagewidgets.manpage, args, n); - Assertion(file != NULL, (("printOKXtProc: file == NULL.\n"))); - - DoPrintManpage("Xman", - file, topwindow, - pdcs->pdpy, pdcs->pcontext, pdcs->colorspace, - printshellDestroyXtProc, - mg->manpage_title, - pdcs->printToFile ? pdcs->printToFileName : NULL); - - XtPopdown(mg->printdialog_shell); -} - -static void -printCancelXtProc(Widget w, XtPointer client_data, XtPointer callData) -{ - ManpageGlobals *mg = GetGlobals(w); - - Log(("printCancelXtProc: cancel.\n")); - XtPopdown(mg->printdialog_shell); - - Log(("destroying print dialog shell...\n")); - XtDestroyWidget(mg->printdialog_shell); - mg->printdialog_shell = NULL; - mg->printdialog = NULL; - Log(("... done\n")); -} - -/* Function Name: PrintThisManpage - * Description: Print the current manual page. - * Arguments: mg - manpage globals - * Returns: none. - */ - -/*ARGSUSED*/ -void -PrintThisManpage(Widget w, XEvent * event, String * params, - Cardinal * num_params) -{ - ManpageGlobals *mg = GetGlobals(w); - Dimension width, height; - Position x, y; - Widget parent = mg->This_Manpage; - Widget topwindow = mg->This_Manpage; - - Log(("print!\n")); - - if (!mg->printdialog) { - int n; - Arg args[20]; - - n = 0; - XtSetArg(args[n], XtNallowShellResize, True); - n++; - mg->printdialog_shell = XtCreatePopupShell("printdialogshell", - transientShellWidgetClass, - topwindow, args, n); - n = 0; - mg->printdialog = - XtCreateManagedWidget("printdialog", printDialogWidgetClass, - mg->printdialog_shell, args, n); - XtAddCallback(mg->printdialog, XawNOkCallback, printOKXtProc, NULL); - XtAddCallback(mg->printdialog, XawNCancelCallback, printCancelXtProc, - NULL); - - XtRealizeWidget(mg->printdialog_shell); - } - - /* Center dialog */ - XtVaGetValues(mg->printdialog_shell, - XtNwidth, &width, XtNheight, &height, NULL); - - x = (Position) (XWidthOfScreen(XtScreen(parent)) - width) / 2; - y = (Position) (XHeightOfScreen(XtScreen(parent)) - height) / 3; - - XtVaSetValues(mg->printdialog_shell, XtNx, x, XtNy, y, NULL); - - XtPopup(mg->printdialog_shell, XtGrabNonexclusive); -} -#endif /* INCLUDE_XPRINT_SUPPORT */ /* Function Name: ShowVersion * Description: Show current version. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/main.c new/xman-1.2.0/main.c --- old/xman-1.1.6/main.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/main.c 2024-03-24 18:54:37.000000000 +0100 @@ -121,9 +121,6 @@ {"CreateNewManpage", CreateNewManpage}, {"RemoveThisManpage", RemoveThisManpage}, {"SaveFormattedPage", SaveFormattedPage}, -#ifdef INCLUDE_XPRINT_SUPPORT - {"PrintThisManpage", PrintThisManpage}, -#endif /* INCLUDE_XPRINT_SUPPORT */ {"ShowVersion", ShowVersion}, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/man.c new/xman-1.2.0/man.c --- old/xman-1.1.6/man.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/man.c 2024-03-24 18:54:37.000000000 +0100 @@ -437,11 +437,7 @@ */ if ((ptr = strrchr(path, '.')) != NULL) { -#if !defined(__SCO__) && !defined(ISC) if (streq(ptr + 1, COMPRESSION_EXTENSION)) -#else - if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL) -#endif *ptr = '\0'; #ifdef GZIP_EXTENSION else if (streq(ptr + 1, GZIP_EXTENSION)) @@ -483,11 +479,7 @@ */ if ((ptr = strrchr(full_name, '.')) != NULL) { -#if !defined(__SCO__) && !defined(ISC) if (streq(ptr + 1, COMPRESSION_EXTENSION)) -#else - if (strpbrk(ptr + 1, COMPRESSION_EXTENSIONS) != NULL) -#endif *ptr = '\0'; #ifdef GZIP_EXTENSION else if (streq(ptr + 1, GZIP_EXTENSION)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/man.h new/xman-1.2.0/man.h --- old/xman-1.1.6/man.h 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/man.h 2024-03-24 18:54:37.000000000 +0100 @@ -147,11 +147,6 @@ search_entry, both_screens_entry, remove_entry, open_entry, print_entry, version_entry, quit_entry; -#ifdef INCLUDE_XPRINT_SUPPORT - /* Print objects and data */ - Widget printdialog_shell; /* Shell for the print dialog */ - Widget printdialog; /* Print dialog */ -#endif /*INCLUDE_XPRINT_SUPPORT */ /* Misc. */ char manpage_title[80]; /* The label to use for the current manpage. */ @@ -244,10 +239,6 @@ Cardinal * num_params); void Search(Widget w, XEvent * event, String * params, Cardinal * num_params); -#ifdef INCLUDE_XPRINT_SUPPORT -void PrintThisManpage(Widget w, XEvent * event, String * params, - Cardinal * num_params); -#endif /* INCLUDE_XPRINT_SUPPORT */ void ShowVersion(Widget w, XEvent * event, String * params, Cardinal * num_params); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/misc.c new/xman-1.2.0/misc.c --- old/xman-1.1.6/misc.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/misc.c 2024-03-24 18:54:37.000000000 +0100 @@ -60,16 +60,6 @@ const char *filename, const char *tempfile); #endif -#if defined(ISC) || defined(__SCO__) || defined(__UNIXWARE__) -static char *uncompress_format = NULL; - -static char *uncompress_formats[] = { - UNCOMPRESS_FORMAT_1, - UNCOMPRESS_FORMAT_2, - UNCOMPRESS_FORMAT_3 -}; -#endif - /* Function Name: PopupWarning * Description: This function pops up a warning message. * Arguments: string - the specific warning string. @@ -196,10 +186,6 @@ const char *entry = manual[section_num].entries[entry_num]; int len_cat = strlen(CAT); -#if defined(ISC) || defined(__SCO__) || defined(__UNIXWARE__) - int i; -#endif - temp = CreateManpageName(entry, 0, 0); snprintf(man_globals->manpage_title, sizeof(man_globals->manpage_title), "The current manual page is: %s.", temp); @@ -227,7 +213,6 @@ * Then for compressed files in an uncompressed directory. */ -#if !defined(ISC) && !defined(__UNIXWARE__) #if defined(__OpenBSD__) || defined(__NetBSD__) /* look in machine subdir first */ snprintf(filename, sizeof(filename), "%s/%s%s/%s/%s.%s", path, CAT, @@ -277,18 +262,6 @@ return (file); } #endif -#else - for (i = 0; i < strlen(COMPRESSION_EXTENSIONS); i++) { - snprintf(filename, sizeof(filename), "%s/%s%s/%s.%c", path, CAT, - section + len_cat, page, COMPRESSION_EXTENSIONS[i]); - uncompress_format = uncompress_formats[i]; -#ifdef DEBUG - printf("Trying .%c ...\n", COMPRESSION_EXTENSIONS[i]); -#endif - if ((file = Uncompress(man_globals, filename)) != NULL) - return (file); - } -#endif /* * And lastly files in a compressed directory. @@ -662,7 +635,8 @@ const char *filename, const char *tempfile) { #ifdef HAVE_MANDB - int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null", + int used = snprintf(cmdbuf, BUFSIZ, "MAN_KEEP_FORMATTING=x GROFF_NO_SGR= " + "man -l %s > %s 2>/dev/null", filename, tempfile); if (used >= BUFSIZ - 1) return FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/search.c new/xman-1.2.0/search.c --- old/xman-1.1.6/search.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/search.c 2024-03-24 18:54:37.000000000 +0100 @@ -207,12 +207,8 @@ snprintf(label, sizeof(label), "Results of apropos search on: %s", search_string); -#ifdef NO_MANPATH_SUPPORT /* not quite correct, but the best I can do. */ - snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, search_string, mantmp); -#else snprintf(cmdbuf, sizeof(cmdbuf), APROPOS_FORMAT, path, search_string, mantmp); -#endif if (system(cmdbuf) != 0) { /* execute search. */ snprintf(error_buf, sizeof(error_buf), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/vendor.c new/xman-1.2.0/vendor.c --- old/xman-1.1.6/vendor.c 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/vendor.c 2024-03-24 18:54:37.000000000 +0100 @@ -38,55 +38,6 @@ const char *suffix; } SectionNameRec; -#if (defined(__osf__) || defined(SVR4)) && !defined(sun) - -static SectionNameRec SectionNames[] = { - {"(1) User Commands", "1"}, - {"(1m) Sys, Administration", "1m"}, - {"(2) System Calls", "2"}, - {"(3) Subroutines", "3"}, - {"(4) File Formats", "4"}, - {"(5) Miscellaneous", "5"}, - {"(6) Games", "6"}, - {"(7) Devices", "7"}, - {"(8) Sys. Administration", "8"}, - {"(l) Local", "l"}, - {"(n) New", "n"}, - {"(o) Old", "o"} -#ifdef __SCO__ - , - {"(ADM) System Administration", "ADM"}, - {"(ADMN) Network Administration", "ADMN"}, - {"(ADMP) Protocol Administration", "ADMP"}, - {"(C) Commands", "C"}, - {"(CMD) DOS Commands", "CMD"}, - {"(CP) Programming Commands", "CP"}, - {"(DOS) DOS Subroutines and Libraries", "DOS"}, - {"(F) File Formats", "F"}, - {"(HW) Hardware Dependent", "HW"}, - {"(K) Kernel Subroutines", "K"}, - {"(LOCAL) Local utilities for your system", "LOCAL"}, - {"(M) Miscellaneous", "M"}, - {"(NADM) NFS Administration", "NADM"}, - {"(NC) Network Commands", "NC"}, - {"(NF) Network File Formats", "NF"}, - {"(NS) Network Subroutines", "NS"}, - {"(NSL) Network Services", "NSL"}, - {"(S) Subroutines and Libraries", "S"}, - {"(SCO) Product Engineering Toolkit", "SCO"}, - {"(SFF) Socket File Formats", "SFF"}, - {"(STR) Streams", "STR"}, - {"(TC) Transport Layer Commands", "TC"}, - {"(X) X Man pages", "X"}, - {"(XNX) Xenix Subroutines, Commands and Libs", "XNX"}, - {"(XS) X11 Subroutines and Libraries", "XS"}, - {"(Xm) Motif Commands and Subroutines", "Xm"}, - {"(Xt) X Intrinsics", "Xt"} -#endif -}; - -#else - #if defined(sun) && defined(SVR4) /* losing man.cf is useless because it has no section names */ @@ -204,14 +155,10 @@ {"(l) Local", "l"}, {"(n) New", "n"}, {"(o) Old", "o"}, -#ifdef sony - {"(p) Public Domain", "p"}, - {"(s) Sony Specific", "s"}, -#endif }; #endif -#endif + /* Function Name: AddStandardSections * Description: Adds all the standard sections to the list for this path. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.6/vendor.h new/xman-1.2.0/vendor.h --- old/xman-1.1.6/vendor.h 2023-09-29 02:47:07.000000000 +0200 +++ new/xman-1.2.0/vendor.h 2024-03-24 18:54:37.000000000 +0100 @@ -51,10 +51,7 @@ */ #define SEARCHDIR MAN - -#if (defined(sgi) || (defined(SVR4) && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) || defined(__CYGWIN__) ) -# define SEARCHOTHER CAT -#endif +#define SEARCHOTHER CAT /* * The default manual page directory. @@ -64,20 +61,14 @@ #ifndef SYSMANPATH -#if defined(__bsdi__) -# define SYSMANPATH "/usr/share/man:/usr/contrib/man:/usr/contrib/isode/man:/usr/local/man" -#elif defined(__OpenBSD__) || defined(__DARWIN__) +#if defined(__OpenBSD__) || defined(__DARWIN__) # define SYSMANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man" #elif defined(SVR4) && defined(sun) # define SYSMANPATH "/usr/share/man:/usr/X11/man:/usr/openwin/share/man:/usr/dt/share/man:/usr/sfw/share/man" -#elif defined(SVR4) || defined(__osf__) || (defined(BSD) && (BSD >= 199103)) -# define SYSMANPATH "/usr/share/man" -#elif defined(sgi) -# define SYSMANPATH "/usr/catman/a_man:/usr/catman/g_man:/usr/catman/p_man:/usr/catman/u_man:/usr/man/p_man:/usr/man/u_man:/usr/man" #endif #ifndef SYSMANPATH -# define SYSMANPATH "/usr/man" +# define SYSMANPATH "/usr/share/man" #endif #endif @@ -86,59 +77,29 @@ * Compression Definitions. */ -#if defined(sgi) -# define COMPRESSION_EXTENSION "z" -# define UNCOMPRESS_FORMAT "pcat %s > %s" -# define NO_COMPRESS /* mac can't handle using pack as a filter and - xman needs it to be done that way. */ -#elif defined (ISC) || defined(__SCO__) || defined(__UNIXWARE__) -# define COMPRESSION_EXTENSION "Z" /* dummy */ -# if !defined(__SCO__) && !defined(__UNIXWARE__) -# define COMPRESSION_EXTENSIONS "zZF" /* pack, compress, freeze */ -# else -# define COMPRESSION_EXTENSIONS "zZ" /* pack, compress */ -# endif -# define UNCOMPRESS_FORMAT uncompress_format -# define UNCOMPRESS_FORMAT_1 "pcat %s > %s" -# define UNCOMPRESS_FORMAT_2 "zcat < %s > %s" -# define UNCOMPRESS_FORMAT_3 "fcat < %s > %s" -# define NO_COMPRESS -#else -# define COMPRESSION_EXTENSION "Z" -# define UNCOMPRESS_FORMAT "zcat < %s >> %s" -# define COMPRESS "compress" -# define GZIP_EXTENSION "gz" -# define GUNZIP_FORMAT "gzip -c -d < %s >> %s" -# define GZIP_COMPRESS "gzip" -# define BZIP2_EXTENSION "bz2" -# define BUNZIP2_FORMAT "bunzip2 -c -d < %s >> %s" -# define BZIP2_COMPRESS "bzip2" -# define LZMA_EXTENSION "lzma" -# define UNLZMA_FORMAT "unlzma -c -d < %s >> %s" -# define LZMA_COMPRESS "lzma" -#endif - +#define COMPRESSION_EXTENSION "Z" +#define UNCOMPRESS_FORMAT "zcat < %s >> %s" +#define COMPRESS "compress" +#define GZIP_EXTENSION "gz" +#define GUNZIP_FORMAT "gzip -c -d < %s >> %s" +#define GZIP_COMPRESS "gzip" +#define BZIP2_EXTENSION "bz2" +#define BUNZIP2_FORMAT "bunzip2 -c -d < %s >> %s" +#define BZIP2_COMPRESS "bzip2" +#define LZMA_EXTENSION "lzma" +#define UNLZMA_FORMAT "unlzma -c -d < %s >> %s" +#define LZMA_COMPRESS "lzma" /* * The command filters for the manual and apropos searches. */ -#if defined(hpux) -# define NO_MANPATH_SUPPORT -#endif - -#ifdef NO_MANPATH_SUPPORT -# define APROPOS_FORMAT ("man -k %s | pr -h Apropos >> %s") -#else -# define APROPOS_FORMAT ("man -M %s -k %s | pr -h Apropos >> %s") -#endif +#define APROPOS_FORMAT ("man -M %s -k %s | pr -h Apropos >> %s") #ifndef HANDLE_ROFFSEQ # if defined(CSRG_BASED) # define FORMAT "| eqn | tbl | nroff -mandoc" -# elif defined(BSD) && (BSD >= 199103) -# define FORMAT "| eqn | tbl | nroff -man" # elif defined(linux) || defined(__CYGWIN__) # define FORMAT "| pic | eqn | tbl -Tlatin1 | GROFF_NO_SGR= groff -Tlatin1 -mandoc" # else @@ -173,17 +134,8 @@ * Names of the man and cat dirs. */ -#ifdef __bsdi__ -#define MAN "cat" -#else #define MAN "man" -#endif - -#if defined(SCO) -# define CAT "cat." -#else -# define CAT "cat" -#endif +#define CAT "cat" /* Solaris has nroff man pages in "man" and sgml man pages in "sman" */ #if defined(sun) && defined(SVR4)
