diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-11-24 07:12:25 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-11-24 07:12:25 +0000 |
| commit | 63e0061fe722092aac647e6e470364556bb68096 (patch) | |
| tree | d075ffc3cc3f7d3c21987bbe1e80bebcdb04967a /sci-visualization/labplot | |
| parent | c3cf257d2a4731d21194208b52e8305a73564a9b (diff) | |
| download | baldeagleos-repo-63e0061fe722092aac647e6e470364556bb68096.tar.gz baldeagleos-repo-63e0061fe722092aac647e6e470364556bb68096.tar.xz baldeagleos-repo-63e0061fe722092aac647e6e470364556bb68096.zip | |
Adding metadata
Diffstat (limited to 'sci-visualization/labplot')
| -rw-r--r-- | sci-visualization/labplot/files/labplot-2.11.1-qt-6.10.patch | 32 | ||||
| -rw-r--r-- | sci-visualization/labplot/labplot-2.11.1-r1.ebuild | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/sci-visualization/labplot/files/labplot-2.11.1-qt-6.10.patch b/sci-visualization/labplot/files/labplot-2.11.1-qt-6.10.patch new file mode 100644 index 000000000000..df718210ee71 --- /dev/null +++ b/sci-visualization/labplot/files/labplot-2.11.1-qt-6.10.patch @@ -0,0 +1,32 @@ +From b0e233b6b20134177af40e8904b593b8dbc18ada Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Thu, 9 Oct 2025 12:33:38 +0200 +Subject: [PATCH] Fix build with Qt 6.10 + +The private API has been moved into a separate CMake package + +See https://bugreports.qt.io/browse/QTBUG-87776 +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e6a6d81796..e1fc6a4c30 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,11 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONEN + ) + + # building QADS or Xlsx requires Qt${QT_VERSION_MAJOR}GuiPrivate (QADS is required, Xlsx is optional) +-find_package(Qt${QT_MAJOR_VERSION}Gui ${QT_MIN_VERSION} CONFIG REQUIRED Private) ++if (Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.10.0) ++ find_package(Qt6GuiPrivate ${QT_MIN_VERSION} CONFIG REQUIRED) ++else() ++ find_package(Qt${QT_MAJOR_VERSION}Gui ${QT_MIN_VERSION} CONFIG REQUIRED Private) ++endif() + + find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS + Archive +-- +GitLab + diff --git a/sci-visualization/labplot/labplot-2.11.1-r1.ebuild b/sci-visualization/labplot/labplot-2.11.1-r1.ebuild index 69c821a125ee..ff768b9734d7 100644 --- a/sci-visualization/labplot/labplot-2.11.1-r1.ebuild +++ b/sci-visualization/labplot/labplot-2.11.1-r1.ebuild @@ -79,6 +79,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-ods-buildfix.patch" "${FILESDIR}/${P}-qtads-cmake-minreqver-3.16.patch" # bug #965103 + "${FILESDIR}/${P}-qt-6.10.patch" # bug #966308 ) src_prepare() { |