movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

pmars: Fix FTBFS due to ncurses change

Browse source 
WINDOW struct was turned opaque in recent versions, meaning that direct access to struct members is no longer supported.
Add patch to replace direct access with calls to getter functions.
This commit is contained in:
OPNA2608 2025-05-08 23:38:44 +02:00
parent d778e0e12d
commit fe359e9681
2 changed files with 60 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

57
pkgs/by-name/pm/pmars/0003-fix-ncurses-opaque-WINDOW.patch Normal file
View file

@ -0,0 +1,57 @@
diff '--color=auto' -ruN a/src/curdisp.c b/src/curdisp.c
--- a/src/curdisp.c 2025-05-08 23:23:48.070346219 +0200
+++ b/src/curdisp.c 2025-05-08 23:29:33.851400436 +0200
@@ -28,12 +28,6 @@
#include "sim.h"
#endif
-/* For window structure in BSD 4.4/Curses 8.x library */
-#ifdef BSD44
-#define _curx curx
-#define _cury cury
-#endif
-
typedef struct win_st {
WINDOW *win;
int page;
@@ -428,18 +422,18 @@
str--;
maxchar++;
leaveok(curwin, TRUE);
- if (ox = curwin->_curx) {
+ if (ox = getcurx(curwin)) {
#if 0
#ifdef ATTRIBUTE
- mvwaddch(curwin, curwin->_cury, --ox, ' ' | attr);
+ mvwaddch(curwin, getcury(curwin), --ox, ' ' | attr);
#else
- mvwaddch(curwin, curwin->_cury, --ox, ' ');
+ mvwaddch(curwin, getcury(curwin), --ox, ' ');
#endif
#endif /* 0 */
- mvwaddch(curwin, curwin->_cury, --ox, ' ');
- wmove(curwin, curwin->_cury, ox);
+ mvwaddch(curwin, getcury(curwin), --ox, ' ');
+ wmove(curwin, getcury(curwin), ox);
} else {
- oy = curwin->_cury - 1;
+ oy = getcury(curwin) - 1;
#if 0
#ifdef ATTRIBUTE
mvwaddch(curwin, oy, COLS - 1, ' ' | attr);
@@ -470,12 +464,12 @@
if (ox--)
#if 0
#ifdef ATTRIBUTE
- mvwaddch(curwin, curwin->_cury, ox, ' ' | attr);
+ mvwaddch(curwin, getcury(curwin), ox, ' ' | attr);
#else
- mvwaddch(curwin, curwin->_cury, ox, ' ');
+ mvwaddch(curwin, getcury(curwin), ox, ' ');
#endif
#endif /* 0 */
- mvwaddch(curwin, curwin->_cury, ox, ' ');
+ mvwaddch(curwin, getcury(curwin), ox, ' ');
else
#if 0
#ifdef ATTRIBUTE

3
pkgs/by-name/pm/pmars/package.nix
View file

@ -35,6 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
# call to undeclared function 'sighandler' & undefined sighandler on Darwin
./0002-fix-sighandler.patch
# ncurses' WINDOW struct was turned opaque for outside code, use functions for accessing values instead
./0003-fix-ncurses-opaque-WINDOW.patch
];
postPatch = ''