[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/, sci-visualization/labplot/files/

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/labplot/, sci-visualization/labplot/files/

[Andreas Sturmlechner]

commit:     cd2e586412d2630b39df98988357fc7baa88c995
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 21:00:49 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 21:01:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2e5864

sci-visualization/labplot: Fix build with USE=ods

Bug: https://bugs.gentoo.org/939807
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/labplot-2.11.1-ods-buildfix.patch        | 38 ++++++++++++++++++++++
 sci-visualization/labplot/labplot-2.11.1.ebuild    |  2 ++
 2 files changed, 40 insertions(+)

diff --git a/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch b/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch
new file mode 100644
index 000000000000..affddeeaae5b
--- /dev/null
+++ b/sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch
@@ -0,0 +1,38 @@
+From 0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17 Mon Sep 17 00:00:00 2001
+From: Alexander Semke <alexander.semke@web.de>
+Date: Mon, 15 Jul 2024 09:56:40 +0200
+Subject: [PATCH] Minor qt6 related fixes.
+
+---
+ src/kdefrontend/datasources/OdsOptionsWidget.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/kdefrontend/datasources/OdsOptionsWidget.cpp b/src/kdefrontend/datasources/OdsOptionsWidget.cpp
+index 6424032dd..c90943695 100644
+--- a/src/kdefrontend/datasources/OdsOptionsWidget.cpp
++++ b/src/kdefrontend/datasources/OdsOptionsWidget.cpp
+@@ -67,9 +67,9 @@ void OdsOptionsWidget::sheetSelectionChanged() {
+ 	}
+ 
+ 	if (selectedItems.size() > 1)
+-		emit enableDataPortionSelection(false);
++		Q_EMIT enableDataPortionSelection(false);
+ 	else // one selected item
+-		emit enableDataPortionSelection(true);
++		Q_EMIT enableDataPortionSelection(true);
+ 
+ 	auto* item = selectedItems.last();
+ 	auto* const filter = static_cast<OdsFilter*>(m_fileWidget->currentFileFilter());
+@@ -98,7 +98,8 @@ void OdsOptionsWidget::sheetSelectionChanged() {
+ 		const int maxColumns = 100;
+ 		for (int row = 0; row < rowCount; ++row) {
+ 			auto lineString = importedStrings.at(row);
+-			colCount = std::min(maxColumns, lineString.size());
++			const int size = lineString.size();
++			colCount = std::min(maxColumns, size);
+ 			if (row == 0) {
+ 				ui.twPreview->setColumnCount(colCount);
+ 
+-- 
+GitLab
+

diff --git a/sci-visualization/labplot/labplot-2.11.1.ebuild b/sci-visualization/labplot/labplot-2.11.1.ebuild
index 4684a482542b..2c5e9dedfc90 100644
--- a/sci-visualization/labplot/labplot-2.11.1.ebuild
+++ b/sci-visualization/labplot/labplot-2.11.1.ebuild
@@ -76,6 +76,8 @@ BDEPEND="
 	sys-devel/gettext
 "
 
+PATCHES=( "${FILESDIR}/${P}-ods-buildfix.patch" )
+
 src_prepare() {
 	ecm_src_prepare