commit: 72f630ac6cc2f60f7238658dde585fd5cfcd5c79 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Dec 10 20:49:21 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Dec 10 20:52:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f630ac
app-office/lyx: Fix build w/ Qt 6.10.1 Closes: https://bugs.gentoo.org/967230 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/lyx/files/lyx-2.4.4-qt-6.10.patch | 21 +++++++++++++++++++++ app-office/lyx/lyx-2.4.4.ebuild | 11 +++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/app-office/lyx/files/lyx-2.4.4-qt-6.10.patch b/app-office/lyx/files/lyx-2.4.4-qt-6.10.patch new file mode 100644 index 000000000000..574665f43a9f --- /dev/null +++ b/app-office/lyx/files/lyx-2.4.4-qt-6.10.patch @@ -0,0 +1,21 @@ +commit e98b6ad533360500528b48043e20c79f5cb67b07 +Author: Juergen Spitzmueller <[email protected]> +Date: Wed Oct 15 12:26:49 2025 +0200 + + Fix compilation with Qt 6.10 + + See https://doc.qt.io/qt-6/qstring.html#arg-3 + +diff --git a/src/frontends/qt/GuiSymbols.cpp b/src/frontends/qt/GuiSymbols.cpp +index 01cf73c03e..a62fe1a828 100644 +--- a/src/frontends/qt/GuiSymbols.cpp ++++ b/src/frontends/qt/GuiSymbols.cpp +@@ -249,7 +249,7 @@ public: + "style=\"font-size: xx-large;\">%1" + "</span><br>U+%2</p>%3") + .arg(toqstr(c)) +- .arg(QString("%1").arg(c, 0, 16).toUpper()) ++ .arg(QString("%1").arg(int(c), 0, 16).toUpper()) + .arg(latex)); + } + case Qt::SizeHintRole: diff --git a/app-office/lyx/lyx-2.4.4.ebuild b/app-office/lyx/lyx-2.4.4.ebuild index 4be11113aeac..c1ec22b0be25 100644 --- a/app-office/lyx/lyx-2.4.4.ebuild +++ b/app-office/lyx/lyx-2.4.4.ebuild @@ -24,16 +24,14 @@ RESTRICT="test" RDEPEND="${PYTHON_DEPS} app-text/mythes dev-libs/boost:= + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qtsvg:6 sys-apps/file virtual/zlib:= virtual/imagemagick-tools[png,svg?] x11-libs/libxcb x11-misc/xdg-utils - - dev-qt/qtbase:6[concurrent,dbus,gui,widgets] - dev-qt/qt5compat:6 - dev-qt/qtsvg:6 - aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) @@ -79,7 +77,7 @@ DEPEND="${RDEPEND}" BDEPEND=" app-alternatives/bc virtual/pkgconfig - dev-qt/qttools[linguist] + dev-qt/qttools:6[linguist] nls? ( sys-devel/gettext ) " @@ -93,6 +91,7 @@ PATCHES=( # Try first with xdg-open before hardcoded commands # Patch from Debian using a similar approach to Fedora "${FILESDIR}"/lyx-2.4.4-prefer-xdg-open.patch + "${FILESDIR}"/${P}-qt-6.10.patch # bug #967230 ) pkg_setup() {
