gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2024-12-15 19:49:35 +00:00
parent b8e24aa12a cf6ad34a2a
commit 88d5d20eca
5 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-ruby/activesupport/activesupport-6.1.7.10.ebuild
View File

@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="test"
RUBY_S="rails-${PV}/${PN}"

1
dev-util/cunit/cunit-2.1_p3-r1.ebuild
View File

@@ -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() {

55
dev-util/cunit/files/cunit-2.1_p3-ncurses-opaque.patch Normal file
View File

@@ -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;

2
media-fonts/sil-abyssinica/sil-abyssinica-2.201.ebuild
View File

@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="OFL-1.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~loong ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos"
KEYWORDS="~alpha amd64 arm ~hppa ~loong ppc ppc64 ~s390 ~sparc x86 ~ppc-macos"
IUSE="doc"
BDEPEND="app-arch/unzip"

2
net-libs/libqmi/libqmi-1.32.4-r1.ebuild
View File

@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
else
SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2"
KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv x86"
KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
fi
inherit bash-completion-r1 meson udev