gentoo auto-resync : 16:12:2024 - 02:01:58

3 files changed, 58 insertions, 1 deletions

diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index b3f919db9774..527f68b6f06d 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,4 +1,5 @@
 AUX cunit-2.1_p3-ncurses-format-security.patch 2392 BLAKE2B 9d224a4de5a2dc9cb2bcdc7eb925214f90819693cf8f052e91f87d7e09171d5b80881a61b8cd59ba75883c0bf24afd387d3a590d144791a1fe4a472303d599c8 SHA512 31dc914f4a4fc2a575ba77225b16494e8678ad2b1180f8621665be255abed3b7514f254652a241d1a0ecd4e43c1c3bd435f68d1bd7f58cf868f5e0ca748b4c0d
+AUX cunit-2.1_p3-ncurses-opaque.patch 2153 BLAKE2B acbc6306df76f7439010ec86d249267b5bc8d16ec0756816f867ea678f59abbe3eb90db87814cd8eeda35389a95641325b23c0dc2d7456eae6dabe5ab100d33a SHA512 8e257bacc0d85a6ad81e1700a8d4b9ade1f5ec1efb1a0bc024f425ce32c4210c5720fbd4b371f36c4e36ecbda85732929d2a2a273bf20c10e11db46ad4b2941a
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p3-r1.ebuild 1604 BLAKE2B 1a33e67febab2512e34045eec63e3a49623d686eab3b9ce1eeb4991f155096dfb4d5f639cde64029c58b3532d8ca0479670aa8516bbd47d2f8e78681e28d716b SHA512 32ea1b167da551b07136e74f31cfafb8fb933d08392715f97cb4b6a8440f69ad0fd9ea3840a4198fc7212a3a3601b5a49cbaad3145aa9594301709addc180035
+EBUILD cunit-2.1_p3-r1.ebuild 1653 BLAKE2B 624e52a6c68e22fa5fd4212145ea0663d174340d1893607cf86d20d2afb67de217780c44bac16b3403806029b1a23e79f19eb31807802c192e3f0d3ace86db68 SHA512 4ea117fa98ec692a7a01385a6947452c8596cf7e41d84fc435576bd55564d73080a2b4c580547b546edf3e041cd2dd2a659d5af79ff913b0d3219ea5de783ae3
 MISC metadata.xml 243 BLAKE2B b273312b5c9fbc82a77d8e6b2ce0364ae677c0863242438533aa5dd20f2fd3a27e4ecb63d76a5ad5647153297201239ae63968f9df4672232a5a01627d68ff82 SHA512 335883ce339777d06e702563a9122c0862154ad9551980d8534a3e158c1cc7ff120a18b2172c099c5a5dc469a4ddf2d57039ef0faa003e623e0459a882a42eb0
diff --git a/dev-util/cunit/cunit-2.1_p3-r1.ebuild b/dev-util/cunit/cunit-2.1_p3-r1.ebuild
index 9c91de94aa6d..f2939479882e 100644
--- a/dev-util/cunit/cunit-2.1_p3-r1.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3-r1.ebuild
@@ -27,6 +27,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1_p3-ncurses-format-security.patch
+	"${FILESDIR}"/${PN}-2.1_p3-ncurses-opaque.patch
 )
 
 src_prepare() {
diff --git a/dev-util/cunit/files/cunit-2.1_p3-ncurses-opaque.patch b/dev-util/cunit/files/cunit-2.1_p3-ncurses-opaque.patch
new file mode 100644
index 000000000000..fa52f683faa0
--- /dev/null
+++ b/dev-util/cunit/files/cunit-2.1_p3-ncurses-opaque.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/932110
+https://sources.debian.org/data/main/c/cunit/2.1-3-dfsg-2.7/debian/patches/curses_ftbfs.patch
+
+Description: Use getters for accessing fields of opaque type WINDOW in Curses.c
+Author: Mate Kukri <mate.kukri@canonical.com>
+Last-Update: 2024-01-04
+
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CUnit/Sources/Curses/Curses.c
++++ b/CUnit/Sources/Curses/Curses.c
+@@ -256,10 +256,10 @@
+ 
+   start_color();
+ 
+-  f_nLeft = application_windows.pMainWin->_begx;
+-  f_nTop = application_windows.pMainWin->_begy;
+-  f_nWidth = application_windows.pMainWin->_maxx;
+-  f_nHeight = application_windows.pMainWin->_maxy;
++  f_nLeft = getbegx(application_windows.pMainWin);
++  f_nTop = getbegy(application_windows.pMainWin);
++  f_nWidth = getmaxx(application_windows.pMainWin) - 1;
++  f_nHeight = getmaxy(application_windows.pMainWin) - 1;
+ 
+   if (NULL == (application_windows.pTitleWin = newwin(3, f_nWidth, 0, 0))) {
+     goto title_fail;
+@@ -358,10 +358,10 @@
+ {
+   refresh();
+ 
+-  f_nLeft = application_windows.pMainWin->_begx;
+-  f_nTop = application_windows.pMainWin->_begy;
+-  f_nWidth = application_windows.pMainWin->_maxx;
+-  f_nHeight = application_windows.pMainWin->_maxy;
++  f_nLeft = getbegx(application_windows.pMainWin);
++  f_nTop = getbegy(application_windows.pMainWin);
++  f_nWidth = getmaxx(application_windows.pMainWin) - 1;
++  f_nHeight = getmaxy(application_windows.pMainWin) - 1;
+ 
+   refresh_title_window();
+   refresh_progress_window();
+@@ -907,10 +907,10 @@
+   pPad->uiColumns = uiCols;
+   pPad->uiPadRow = 0;
+   pPad->uiPadCol = 0;
+-  pPad->uiWinLeft = application_windows.pDetailsWin->_begx + 1;
+-  pPad->uiWinTop = application_windows.pDetailsWin->_begy + 1;
+-  pPad->uiWinColumns = application_windows.pDetailsWin->_maxx - 2;
+-  pPad->uiWinRows = application_windows.pDetailsWin->_maxy - 2;
++  pPad->uiWinLeft = getbegx(application_windows.pDetailsWin) + 1;
++  pPad->uiWinTop = getbegy(application_windows.pDetailsWin) + 1;
++  pPad->uiWinColumns = getmaxx(application_windows.pDetailsWin) - 3;
++  pPad->uiWinRows = getmaxy(application_windows.pDetailsWin) - 3;
+ 
+   bStatus = true;
+