mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2026-05-06 07:27:03 -04:00
media-sound/muse: fix build w/ opaque ncurses structures
Closes: https://bugs.gentoo.org/932135 Signed-off-by: Brett A C Sheffield <bacs@librecast.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/576 Merges: https://codeberg.org/gentoo/gentoo/pulls/576 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
4643be3205
commit
ae49a7b3b5
@@ -0,0 +1,47 @@
|
||||
https://bugs.gentoo.org/932135
|
||||
---
|
||||
diff --git a/src/ncursesgui/libcdk/cdk.c b/src/ncursesgui/libcdk/cdk.c
|
||||
index 95ab0bc..91466ba 100644
|
||||
--- a/src/ncursesgui/libcdk/cdk.c
|
||||
+++ b/src/ncursesgui/libcdk/cdk.c
|
||||
@@ -1231,8 +1231,7 @@ void moveCursesWindow (WINDOW *window, int xdiff, int ydiff)
|
||||
ypos += ydiff;
|
||||
mvwin(window, ypos, xpos);
|
||||
#else
|
||||
- window->_begx += xdiff;
|
||||
- window->_begy += ydiff;
|
||||
+ wmove(window, getbegy(window) + ydiff, getbegx(window) + xdiff);
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git a/src/ncursesgui/libcdk/cdk.h b/src/ncursesgui/libcdk/cdk.h
|
||||
index b4868a8..8a47d99 100644
|
||||
--- a/src/ncursesgui/libcdk/cdk.h
|
||||
+++ b/src/ncursesgui/libcdk/cdk.h
|
||||
@@ -199,26 +199,6 @@ typedef int boolean;
|
||||
#define MAX_LINES 5000
|
||||
#define MAX_BUTTONS 200
|
||||
|
||||
-/*
|
||||
- * Not all variants of curses define getmaxx, etc. But use the provided ones
|
||||
- * if they exist, to work around differences in the underlying implementation.
|
||||
- */
|
||||
-#if !(defined(getmaxx) || defined(HAVE_GETMAXX))
|
||||
-#define getmaxx(a) ((a)->_maxx)
|
||||
-#endif
|
||||
-
|
||||
-#if !(defined(getmaxy) || defined(HAVE_GETMAXY))
|
||||
-#define getmaxy(a) ((a)->_maxy)
|
||||
-#endif
|
||||
-
|
||||
-#if !(defined(getbegx) || defined(HAVE_GETBEGX))
|
||||
-#define getbegx(a) ((a)->_begx)
|
||||
-#endif
|
||||
-
|
||||
-#if !(defined(getbegy) || defined(HAVE_GETBEGY))
|
||||
-#define getbegy(a) ((a)->_begy)
|
||||
-#endif
|
||||
-
|
||||
#define MAXIMUM(a,b) ((a) > (b) ? (a) : (b))
|
||||
#define MINIMUM(a,b) ((a) < (b) ? (a) : (b))
|
||||
#define HALF(a) ((a) >> 1)
|
||||
@@ -30,7 +30,10 @@ BDEPEND="
|
||||
virtual/pkgconfig
|
||||
doc? ( app-text/doxygen[dot] )"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch
|
||||
"${FILESDIR}"/${PN}-0.9.2_p20161002-fix-ncurses.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
Reference in New Issue
Block a user