* [gentoo-commits] repo/gentoo:master commit in: app-emulation/86Box/, app-emulation/86Box/files/
@ 2024-09-15 13:50 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2024-09-15 13:50 UTC (permalink / raw
To: gentoo-commits
commit: df8fea79797d2acee18ea747481046dadd718a86
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 13:40:42 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 13:40:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df8fea79
app-emulation/86Box: drop 4.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-emulation/86Box/86Box-4.2.ebuild | 85 -------------------------
app-emulation/86Box/Manifest | 1 -
app-emulation/86Box/files/86Box-4.2-gcc14.patch | 28 --------
3 files changed, 114 deletions(-)
diff --git a/app-emulation/86Box/86Box-4.2.ebuild b/app-emulation/86Box/86Box-4.2.ebuild
deleted file mode 100644
index d71b01dcb937..000000000000
--- a/app-emulation/86Box/86Box-4.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Emulator of x86-based machines based on PCem"
-HOMEPAGE="https://github.com/86Box/86Box"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="experimental +fluidsynth +munt new-dynarec +openal qt5 +qt6 +threads"
-
-DEPEND="
- app-emulation/faudio
- dev-libs/libevdev
- media-libs/freetype:2=
- media-libs/libpng:=
- media-libs/libsdl2
- media-libs/openal
- media-libs/rtmidi
- net-libs/libslirp
- sys-libs/zlib
- qt5? ( x11-libs/libXi )
- qt6? ( x11-libs/libXi )
-"
-
-RDEPEND="
- ${DEPEND}
- fluidsynth? ( media-sound/fluidsynth )
- munt? ( media-libs/munt-mt32emu )
- openal? ( media-libs/openal )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qttranslations:5
- dev-qt/qtwidgets:5
- kde-frameworks/extra-cmake-modules
- )
- qt6? (
- dev-qt/qtbase:6[gui,network,opengl,widgets]
- dev-qt/qttranslations:6
- kde-frameworks/extra-cmake-modules
- )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-gcc14.patch" )
-
-src_configure() {
- # LTO needs to be filtered
- # See https://bugs.gentoo.org/854507
- filter-lto
- append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DCPPTHREADS="$(usex threads)"
- -DDEV_BRANCH="$(usex experimental)"
- -DDYNAREC="ON"
- -DMUNT_EXTERNAL="$(usex munt)"
- -DFLUIDSYNTH="$(usex fluidsynth)"
- -DMINITRACE="OFF"
- -DMUNT="$(usex munt)"
- -DNEW_DYNAREC="$(usex new-dynarec)"
- -DOPENAL="$(usex openal)"
- -DPREFER_STATIC="OFF"
- -DRTMIDI="ON"
- -DQT="$(usex qt5 'ON' $(usex qt6))"
- -DRELEASE="ON"
- $(usex qt6 '-DUSE_QT6=ON' '')
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- elog "In order to use 86Box, you will need some roms for various emulated systems."
- elog "See https://github.com/86Box/roms for more information."
-}
diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest
index ba6834853309..ae6146a24334 100644
--- a/app-emulation/86Box/Manifest
+++ b/app-emulation/86Box/Manifest
@@ -1,2 +1 @@
DIST 86Box-4.2.1.tar.gz 5320110 BLAKE2B cf3379dffcd93f9c317c02b91ba5772a54abcc0e67ca588b22e07d5b221d40db4c0a54dcdd30cd1e2dd46a808393a9e09db917fe9445cbfb56ff9675d4eb35d9 SHA512 ed8e90f68318d163c39202479d654859d4d74b6fdffd47cfcba6b0393965265615aa008b02cfd04ac8cafc2f38cead53ed5d6071cabd4b96eba91ec805c5a2df
-DIST 86Box-4.2.tar.gz 5297797 BLAKE2B a1933aaaa501f54539b05436a2c0f91454a253a0f1a98bbea165f0a11188c3f5a55af58dbbc53387fec1be853c5bcacb510d74f5a98a47d7821ab0f257f93f82 SHA512 af817d2fdf385e761bf98728633f6c5cf4feca5e39d7323d7825f2f6a11c42882009005d2c50fded19fb2615eff8679b010ab85fd38b7cabc08408e2c447baed
diff --git a/app-emulation/86Box/files/86Box-4.2-gcc14.patch b/app-emulation/86Box/files/86Box-4.2-gcc14.patch
deleted file mode 100644
index 68794d21cf1b..000000000000
--- a/app-emulation/86Box/files/86Box-4.2-gcc14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aca6355eb291171d652f09a530040d18f29dbd2e Mon Sep 17 00:00:00 2001
-From: OBattler <oubattler@gmail.com>
-Date: Sat, 27 Jul 2024 16:58:36 +0200
-Subject: [PATCH] Rewrote a line in unix.c, fixes #4658.
-
----
- src/unix/unix.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/unix/unix.c b/src/unix/unix.c
-index 1fe477a231..d4d73817f9 100644
---- a/src/unix/unix.c
-+++ b/src/unix/unix.c
-@@ -640,8 +640,12 @@ ui_msgbox_header(int flags, void *header, void *message)
- SDL_MessageBoxData msgdata;
- SDL_MessageBoxButtonData msgbtn;
-
-- if (!header)
-- header = (void *) ((flags & MBX_ANSI) ? "86Box" : L"86Box");
-+ if (!header) {
-+ if (flags & MBX_ANSI)
-+ header = (void *) "86Box";
-+ else
-+ header = (void *) L"86Box";
-+ }
-
- msgbtn.buttonid = 1;
- msgbtn.text = "OK";
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/86Box/, app-emulation/86Box/files/
@ 2025-05-05 9:13 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-05-05 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 1fee19f28119bce9c5c378e239ed5d3b4d752b2f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 5 09:05:18 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 5 09:06:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fee19f2
Revert "app-emulation/86Box: drop 4.2"
This reverts commit df8fea79797d2acee18ea747481046dadd718a86.
4.2.1 has a bug and upcoming 4.2.2 should fix that.
Bug: https://bugs.gentoo.org/953992
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-emulation/86Box/86Box-4.2.ebuild | 85 +++++++++++++++++++++++++
app-emulation/86Box/Manifest | 1 +
app-emulation/86Box/files/86Box-4.2-gcc14.patch | 28 ++++++++
3 files changed, 114 insertions(+)
diff --git a/app-emulation/86Box/86Box-4.2.ebuild b/app-emulation/86Box/86Box-4.2.ebuild
new file mode 100644
index 000000000000..d71b01dcb937
--- /dev/null
+++ b/app-emulation/86Box/86Box-4.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Emulator of x86-based machines based on PCem"
+HOMEPAGE="https://github.com/86Box/86Box"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="experimental +fluidsynth +munt new-dynarec +openal qt5 +qt6 +threads"
+
+DEPEND="
+ app-emulation/faudio
+ dev-libs/libevdev
+ media-libs/freetype:2=
+ media-libs/libpng:=
+ media-libs/libsdl2
+ media-libs/openal
+ media-libs/rtmidi
+ net-libs/libslirp
+ sys-libs/zlib
+ qt5? ( x11-libs/libXi )
+ qt6? ( x11-libs/libXi )
+"
+
+RDEPEND="
+ ${DEPEND}
+ fluidsynth? ( media-sound/fluidsynth )
+ munt? ( media-libs/munt-mt32emu )
+ openal? ( media-libs/openal )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qttranslations:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/extra-cmake-modules
+ )
+ qt6? (
+ dev-qt/qtbase:6[gui,network,opengl,widgets]
+ dev-qt/qttranslations:6
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-4.2-gcc14.patch" )
+
+src_configure() {
+ # LTO needs to be filtered
+ # See https://bugs.gentoo.org/854507
+ filter-lto
+ append-flags -fno-strict-aliasing
+
+ local mycmakeargs=(
+ -DCPPTHREADS="$(usex threads)"
+ -DDEV_BRANCH="$(usex experimental)"
+ -DDYNAREC="ON"
+ -DMUNT_EXTERNAL="$(usex munt)"
+ -DFLUIDSYNTH="$(usex fluidsynth)"
+ -DMINITRACE="OFF"
+ -DMUNT="$(usex munt)"
+ -DNEW_DYNAREC="$(usex new-dynarec)"
+ -DOPENAL="$(usex openal)"
+ -DPREFER_STATIC="OFF"
+ -DRTMIDI="ON"
+ -DQT="$(usex qt5 'ON' $(usex qt6))"
+ -DRELEASE="ON"
+ $(usex qt6 '-DUSE_QT6=ON' '')
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ elog "In order to use 86Box, you will need some roms for various emulated systems."
+ elog "See https://github.com/86Box/roms for more information."
+}
diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest
index ae6146a24334..ba6834853309 100644
--- a/app-emulation/86Box/Manifest
+++ b/app-emulation/86Box/Manifest
@@ -1 +1,2 @@
DIST 86Box-4.2.1.tar.gz 5320110 BLAKE2B cf3379dffcd93f9c317c02b91ba5772a54abcc0e67ca588b22e07d5b221d40db4c0a54dcdd30cd1e2dd46a808393a9e09db917fe9445cbfb56ff9675d4eb35d9 SHA512 ed8e90f68318d163c39202479d654859d4d74b6fdffd47cfcba6b0393965265615aa008b02cfd04ac8cafc2f38cead53ed5d6071cabd4b96eba91ec805c5a2df
+DIST 86Box-4.2.tar.gz 5297797 BLAKE2B a1933aaaa501f54539b05436a2c0f91454a253a0f1a98bbea165f0a11188c3f5a55af58dbbc53387fec1be853c5bcacb510d74f5a98a47d7821ab0f257f93f82 SHA512 af817d2fdf385e761bf98728633f6c5cf4feca5e39d7323d7825f2f6a11c42882009005d2c50fded19fb2615eff8679b010ab85fd38b7cabc08408e2c447baed
diff --git a/app-emulation/86Box/files/86Box-4.2-gcc14.patch b/app-emulation/86Box/files/86Box-4.2-gcc14.patch
new file mode 100644
index 000000000000..68794d21cf1b
--- /dev/null
+++ b/app-emulation/86Box/files/86Box-4.2-gcc14.patch
@@ -0,0 +1,28 @@
+From aca6355eb291171d652f09a530040d18f29dbd2e Mon Sep 17 00:00:00 2001
+From: OBattler <oubattler@gmail.com>
+Date: Sat, 27 Jul 2024 16:58:36 +0200
+Subject: [PATCH] Rewrote a line in unix.c, fixes #4658.
+
+---
+ src/unix/unix.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/unix/unix.c b/src/unix/unix.c
+index 1fe477a231..d4d73817f9 100644
+--- a/src/unix/unix.c
++++ b/src/unix/unix.c
+@@ -640,8 +640,12 @@ ui_msgbox_header(int flags, void *header, void *message)
+ SDL_MessageBoxData msgdata;
+ SDL_MessageBoxButtonData msgbtn;
+
+- if (!header)
+- header = (void *) ((flags & MBX_ANSI) ? "86Box" : L"86Box");
++ if (!header) {
++ if (flags & MBX_ANSI)
++ header = (void *) "86Box";
++ else
++ header = (void *) L"86Box";
++ }
+
+ msgbtn.buttonid = 1;
+ msgbtn.text = "OK";
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/86Box/, app-emulation/86Box/files/
@ 2025-05-19 16:20 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-05-19 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 1863774d994a4cd9b8af57e1882eaeef7a391d10
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 22:10:28 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 19 16:19:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1863774d
app-emulation/86Box: Fix IUSE qt6 dependencies, backport crashfixes
Add several missing dependencies
Add missing dev-qt/qtbase:6= and media-sound/fluidsynth slot ops
Move several RDEPEND(-only) -> (COMMON_)DEPEND
Move kde-frameworks/extra-cmake-modules to BDEPEND
See also:
https://github.com/flathub/net._86box._86Box/issues/18
Bug: https://bugs.gentoo.org/953992
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-emulation/86Box/86Box-4.2.1-r2.ebuild | 79 ++++++++++++++++++++++
.../86Box/files/86Box-4.2.1-crashfix-1.patch | 22 ++++++
.../86Box/files/86Box-4.2.1-crashfix-2.patch | 36 ++++++++++
.../86Box/files/86Box-4.2.1-crashfix-3.patch | 40 +++++++++++
4 files changed, 177 insertions(+)
diff --git a/app-emulation/86Box/86Box-4.2.1-r2.ebuild b/app-emulation/86Box/86Box-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..d37ca0a97463
--- /dev/null
+++ b/app-emulation/86Box/86Box-4.2.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Emulator of x86-based machines based on PCem"
+HOMEPAGE="https://github.com/86Box/86Box"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="experimental +fluidsynth +munt new-dynarec +openal +qt6 +threads vde"
+
+DEPEND="
+ app-emulation/faudio
+ dev-libs/libevdev
+ media-libs/freetype:2=
+ media-libs/libpng:=
+ media-libs/libsdl2
+ media-libs/openal
+ media-libs/rtmidi
+ net-libs/libslirp
+ sys-libs/zlib
+ fluidsynth? ( media-sound/fluidsynth:= )
+ munt? ( media-libs/munt-mt32emu )
+ openal? ( media-libs/openal )
+ qt6? (
+ dev-libs/wayland
+ dev-qt/qtbase:6=[gui,network,opengl,widgets]
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ )
+"
+RDEPEND="${DEPEND}
+ qt6? ( dev-qt/qttranslations:6 )
+ vde? ( net-misc/vde )
+"
+BDEPEND="
+ virtual/pkgconfig
+ qt6? ( kde-frameworks/extra-cmake-modules )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-crashfix-{1,2,3}.patch ) # bug #953992, git master
+
+src_configure() {
+ # LTO needs to be filtered
+ # See https://bugs.gentoo.org/854507
+ filter-lto
+ append-flags -fno-strict-aliasing
+
+ local mycmakeargs=(
+ -DCPPTHREADS="$(usex threads)"
+ -DDEV_BRANCH="$(usex experimental)"
+ -DDYNAREC="ON"
+ -DMUNT_EXTERNAL="$(usex munt)"
+ -DFLUIDSYNTH="$(usex fluidsynth)"
+ -DMINITRACE="OFF"
+ -DMUNT="$(usex munt)"
+ -DNEW_DYNAREC="$(usex new-dynarec)"
+ -DOPENAL="$(usex openal)"
+ -DPREFER_STATIC="OFF"
+ -DRTMIDI="ON"
+ -DQT="$(usex qt6)"
+ -DRELEASE="ON"
+ $(usex qt6 '-DUSE_QT6=ON' '')
+ -DHAS_VDE="$(usex vde "${EPREFIX}/usr/$(get_libdir)/libvdeplug.so" "HAS_VDE-NOTFOUND")"
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ elog "In order to use 86Box, you will need some roms for various emulated systems."
+ elog "See https://github.com/86Box/roms for more information."
+}
diff --git a/app-emulation/86Box/files/86Box-4.2.1-crashfix-1.patch b/app-emulation/86Box/files/86Box-4.2.1-crashfix-1.patch
new file mode 100644
index 000000000000..56dfae1cad56
--- /dev/null
+++ b/app-emulation/86Box/files/86Box-4.2.1-crashfix-1.patch
@@ -0,0 +1,22 @@
+From f37c2339dce9213c21c7ccc8f8ad01260ce80603 Mon Sep 17 00:00:00 2001
+From: Tarek Soliman <tarek@bashasoliman.com>
+Date: Fri, 6 Sep 2024 17:05:44 -0500
+Subject: [PATCH] Media history: fix buffer overflow
+
+---
+ src/qt/qt_mediahistorymanager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp
+index 9886c205bd..cd9be766b3 100644
+--- a/src/qt/qt_mediahistorymanager.cpp
++++ b/src/qt/qt_mediahistorymanager.cpp
+@@ -337,7 +337,7 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
+ }
+
+ char *p = checked_path.toUtf8().data();
+- char temp[1024] = { 0 };
++ char temp[MAX_IMAGE_PATH_LEN -1] = { 0 };
+
+ if (path_abs(p)) {
+ if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
diff --git a/app-emulation/86Box/files/86Box-4.2.1-crashfix-2.patch b/app-emulation/86Box/files/86Box-4.2.1-crashfix-2.patch
new file mode 100644
index 000000000000..2b7fca267f47
--- /dev/null
+++ b/app-emulation/86Box/files/86Box-4.2.1-crashfix-2.patch
@@ -0,0 +1,36 @@
+From ea5ef55bd13f504c26d075ce73f72867c1d4cea3 Mon Sep 17 00:00:00 2001
+From: RichardG867 <richardg867@gmail.com>
+Date: Fri, 11 Oct 2024 16:50:12 -0300
+Subject: [PATCH] qt: Fix another media menu string deallocation crash
+
+---
+ src/qt/qt_mediahistorymanager.cpp | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp
+index cd9be766b3..2acdc8e5bb 100644
+--- a/src/qt/qt_mediahistorymanager.cpp
++++ b/src/qt/qt_mediahistorymanager.cpp
+@@ -336,17 +336,16 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
+ continue;
+ }
+
+- char *p = checked_path.toUtf8().data();
+ char temp[MAX_IMAGE_PATH_LEN -1] = { 0 };
+
+- if (path_abs(p)) {
+- if (strlen(p) > (MAX_IMAGE_PATH_LEN - 1))
+- fatal("removeMissingImages(): strlen(p) > 2047\n");
++ if (path_abs(checked_path.toUtf8().data())) {
++ if (checked_path.length() > (MAX_IMAGE_PATH_LEN - 1))
++ fatal("removeMissingImages(): checked_path.length() > 2047\n");
+ else
+- snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", p);
++ snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", checked_path.toUtf8().constData());
+ } else
+ snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
+- path_get_slash(usr_path), p);
++ path_get_slash(usr_path), checked_path.toUtf8().constData());
+ path_normalize(temp);
+
+ QString qstr = QString::fromUtf8(temp);
diff --git a/app-emulation/86Box/files/86Box-4.2.1-crashfix-3.patch b/app-emulation/86Box/files/86Box-4.2.1-crashfix-3.patch
new file mode 100644
index 000000000000..d97f4d274e1d
--- /dev/null
+++ b/app-emulation/86Box/files/86Box-4.2.1-crashfix-3.patch
@@ -0,0 +1,40 @@
+From 6b05602ea4d1593edf8d0fff17e733b182e94637 Mon Sep 17 00:00:00 2001
+From: OBattler <oubattler@gmail.com>
+Date: Sun, 5 Jan 2025 22:35:50 +0100
+Subject: [PATCH] QT: Increase buffer size and improve sanity checking when
+ removing an image.
+
+---
+ src/qt/qt_mediahistorymanager.cpp | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/qt/qt_mediahistorymanager.cpp b/src/qt/qt_mediahistorymanager.cpp
+index 2acdc8e5bb..d548c0779c 100644
+--- a/src/qt/qt_mediahistorymanager.cpp
++++ b/src/qt/qt_mediahistorymanager.cpp
+@@ -336,16 +336,20 @@ MediaHistoryManager::removeMissingImages(device_index_list_t &device_history)
+ continue;
+ }
+
+- char temp[MAX_IMAGE_PATH_LEN -1] = { 0 };
++ char temp[MAX_IMAGE_PATH_LEN * 2] = { 0 };
+
+ if (path_abs(checked_path.toUtf8().data())) {
+ if (checked_path.length() > (MAX_IMAGE_PATH_LEN - 1))
+- fatal("removeMissingImages(): checked_path.length() > 2047\n");
++ fatal("removeMissingImages(): checked_path.length() > %i\n", MAX_IMAGE_PATH_LEN - 1);
+ else
+ snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s", checked_path.toUtf8().constData());
+- } else
+- snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
+- path_get_slash(usr_path), checked_path.toUtf8().constData());
++ } else {
++ if ((strlen(usr_path) + strlen(path_get_slash(usr_path)) + checked_path.length()) > (MAX_IMAGE_PATH_LEN - 1))
++ fatal("removeMissingImages(): Combined absolute path length > %i\n", MAX_IMAGE_PATH_LEN - 1);
++ else
++ snprintf(temp, (MAX_IMAGE_PATH_LEN - 1), "%s%s%s", usr_path,
++ path_get_slash(usr_path), checked_path.toUtf8().constData());
++ }
+ path_normalize(temp);
+
+ QString qstr = QString::fromUtf8(temp);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/86Box/, app-emulation/86Box/files/
@ 2025-05-20 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-05-20 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 5abb801b14e0e1752f72710c7ade952b19dba915
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 13:40:42 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 20 21:13:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5abb801b
app-emulation/86Box: drop 4.2
(cherry picked from commit df8fea79797d2acee18ea747481046dadd718a86)
Closes: https://bugs.gentoo.org/953992
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-emulation/86Box/86Box-4.2.ebuild | 85 -------------------------
app-emulation/86Box/Manifest | 1 -
app-emulation/86Box/files/86Box-4.2-gcc14.patch | 28 --------
3 files changed, 114 deletions(-)
diff --git a/app-emulation/86Box/86Box-4.2.ebuild b/app-emulation/86Box/86Box-4.2.ebuild
deleted file mode 100644
index d71b01dcb937..000000000000
--- a/app-emulation/86Box/86Box-4.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Emulator of x86-based machines based on PCem"
-HOMEPAGE="https://github.com/86Box/86Box"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="experimental +fluidsynth +munt new-dynarec +openal qt5 +qt6 +threads"
-
-DEPEND="
- app-emulation/faudio
- dev-libs/libevdev
- media-libs/freetype:2=
- media-libs/libpng:=
- media-libs/libsdl2
- media-libs/openal
- media-libs/rtmidi
- net-libs/libslirp
- sys-libs/zlib
- qt5? ( x11-libs/libXi )
- qt6? ( x11-libs/libXi )
-"
-
-RDEPEND="
- ${DEPEND}
- fluidsynth? ( media-sound/fluidsynth )
- munt? ( media-libs/munt-mt32emu )
- openal? ( media-libs/openal )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qttranslations:5
- dev-qt/qtwidgets:5
- kde-frameworks/extra-cmake-modules
- )
- qt6? (
- dev-qt/qtbase:6[gui,network,opengl,widgets]
- dev-qt/qttranslations:6
- kde-frameworks/extra-cmake-modules
- )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-gcc14.patch" )
-
-src_configure() {
- # LTO needs to be filtered
- # See https://bugs.gentoo.org/854507
- filter-lto
- append-flags -fno-strict-aliasing
-
- local mycmakeargs=(
- -DCPPTHREADS="$(usex threads)"
- -DDEV_BRANCH="$(usex experimental)"
- -DDYNAREC="ON"
- -DMUNT_EXTERNAL="$(usex munt)"
- -DFLUIDSYNTH="$(usex fluidsynth)"
- -DMINITRACE="OFF"
- -DMUNT="$(usex munt)"
- -DNEW_DYNAREC="$(usex new-dynarec)"
- -DOPENAL="$(usex openal)"
- -DPREFER_STATIC="OFF"
- -DRTMIDI="ON"
- -DQT="$(usex qt5 'ON' $(usex qt6))"
- -DRELEASE="ON"
- $(usex qt6 '-DUSE_QT6=ON' '')
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- elog "In order to use 86Box, you will need some roms for various emulated systems."
- elog "See https://github.com/86Box/roms for more information."
-}
diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest
index ba6834853309..ae6146a24334 100644
--- a/app-emulation/86Box/Manifest
+++ b/app-emulation/86Box/Manifest
@@ -1,2 +1 @@
DIST 86Box-4.2.1.tar.gz 5320110 BLAKE2B cf3379dffcd93f9c317c02b91ba5772a54abcc0e67ca588b22e07d5b221d40db4c0a54dcdd30cd1e2dd46a808393a9e09db917fe9445cbfb56ff9675d4eb35d9 SHA512 ed8e90f68318d163c39202479d654859d4d74b6fdffd47cfcba6b0393965265615aa008b02cfd04ac8cafc2f38cead53ed5d6071cabd4b96eba91ec805c5a2df
-DIST 86Box-4.2.tar.gz 5297797 BLAKE2B a1933aaaa501f54539b05436a2c0f91454a253a0f1a98bbea165f0a11188c3f5a55af58dbbc53387fec1be853c5bcacb510d74f5a98a47d7821ab0f257f93f82 SHA512 af817d2fdf385e761bf98728633f6c5cf4feca5e39d7323d7825f2f6a11c42882009005d2c50fded19fb2615eff8679b010ab85fd38b7cabc08408e2c447baed
diff --git a/app-emulation/86Box/files/86Box-4.2-gcc14.patch b/app-emulation/86Box/files/86Box-4.2-gcc14.patch
deleted file mode 100644
index 68794d21cf1b..000000000000
--- a/app-emulation/86Box/files/86Box-4.2-gcc14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aca6355eb291171d652f09a530040d18f29dbd2e Mon Sep 17 00:00:00 2001
-From: OBattler <oubattler@gmail.com>
-Date: Sat, 27 Jul 2024 16:58:36 +0200
-Subject: [PATCH] Rewrote a line in unix.c, fixes #4658.
-
----
- src/unix/unix.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/unix/unix.c b/src/unix/unix.c
-index 1fe477a231..d4d73817f9 100644
---- a/src/unix/unix.c
-+++ b/src/unix/unix.c
-@@ -640,8 +640,12 @@ ui_msgbox_header(int flags, void *header, void *message)
- SDL_MessageBoxData msgdata;
- SDL_MessageBoxButtonData msgbtn;
-
-- if (!header)
-- header = (void *) ((flags & MBX_ANSI) ? "86Box" : L"86Box");
-+ if (!header) {
-+ if (flags & MBX_ANSI)
-+ header = (void *) "86Box";
-+ else
-+ header = (void *) L"86Box";
-+ }
-
- msgbtn.buttonid = 1;
- msgbtn.text = "OK";
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-05-20 21:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-05 9:13 [gentoo-commits] repo/gentoo:master commit in: app-emulation/86Box/, app-emulation/86Box/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-05-20 21:13 Andreas Sturmlechner
2025-05-19 16:20 Andreas Sturmlechner
2024-09-15 13:50 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox