summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-09-20 23:00:49 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2024-09-20 23:01:26 +0200
commitcd2e586412d2630b39df98988357fc7baa88c995 (patch)
tree88e6c11244be5d648dff419b2c7a60994ef2d3f2 /sci-visualization/labplot
parentdev-libs/libixion: drop 0.19.0 (diff)
downloadgentoo-cd2e586412d2630b39df98988357fc7baa88c995.tar.gz
gentoo-cd2e586412d2630b39df98988357fc7baa88c995.tar.bz2
gentoo-cd2e586412d2630b39df98988357fc7baa88c995.zip
sci-visualization/labplot: Fix build with USE=ods
Bug: https://bugs.gentoo.org/939807 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-visualization/labplot')
-rw-r--r--sci-visualization/labplot/files/labplot-2.11.1-ods-buildfix.patch38
-rw-r--r--sci-visualization/labplot/labplot-2.11.1.ebuild2
2 files changed, 40 insertions, 0 deletions
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