diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-10 04:21:55 +0100 |
| commit | 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch) | |
| tree | 6c418a1546fff5becab5d8b9ed6803323e7f316e /sci-visualization/kst/files | |
| parent | fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff) | |
gentoo resync : 10.09.2021
Diffstat (limited to 'sci-visualization/kst/files')
3 files changed, 65 insertions, 0 deletions
diff --git a/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch new file mode 100644 index 000000000000..39e2df7d0a64 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-cmake-3.20.patch @@ -0,0 +1,32 @@ +From 6a41644c39ffb394c350de3dacbacdffa54a0a2a Mon Sep 17 00:00:00 2001 +From: Adriaan de Groot <groot@kde.org> +Date: Sat, 3 Apr 2021 00:47:52 +0200 +Subject: [PATCH] Fix CMake-time with CMake 3.20 + +Having multiple else-blocks for a single if() is now a syntax +error; they need to be elseif() with only a single +optional else() at the end. +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 593dcb11..f965bd64 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,10 +116,10 @@ elseif(kst_3rdparty_download) + elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) + set(ver 4.7) + set(md5 de6e8dbab1bb17eee6057941fddc93e3) +- else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) ++ elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) + set(ver 4.6) + set(md5 70d8670af9c21eb8fb466654c95d8e4d) +- else(GCC_VERSION VERSION_GREATER 4.4) ++ elseif(GCC_VERSION VERSION_GREATER 4.4) + set(ver 4.4) + set(md5 999248fb40a44543af4dd4cd1be0ceeb) + else() +-- +GitLab + diff --git a/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch new file mode 100644 index 000000000000..07baa1a32ab1 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-getdata-drop-bogus-lib_debug.patch @@ -0,0 +1,23 @@ +--- a/cmake/modules/FindGetdata.cmake 2014-02-13 10:41:44.000000000 +0100 ++++ b/cmake/modules/FindGetdata.cmake 2021-09-07 14:32:16.248930734 +0200 +@@ -49,19 +49,9 @@ + PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS}) + list(APPEND GETDATA_LIBRARIES_RELEASE ${lib_release}) + list(APPEND GETDATA_LIBRARIES_BOTH optimized ${lib_release}) +- set(lib_debug lib_debug-NOTFOUND CACHE STRING "" FORCE) +- FIND_LIBRARY(lib_debug ${it}d +- HINTS ENV GETDATA_DIR PATH_SUFFIXES lib +- PATHS ${kst_3rdparty_dir} ${PKGGETDATA_LIBRARY_DIRS}) +- list(APPEND GETDATA_LIBRARIES_DEBUG ${lib_debug}) +- list(APPEND GETDATA_LIBRARIES_BOTH debug ${lib_debug}) + endforeach() + +-if(GETDATA_LIBRARIES_DEBUG AND GETDATA_LIBRARIES_RELEASE) +- set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_BOTH} CACHE STRING "" FORCE) +-else() +- set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE) +-endif() ++set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE) + + endif() + diff --git a/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch new file mode 100644 index 000000000000..97b42a6d33c2 --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-qt-5.15.patch @@ -0,0 +1,10 @@ +--- a/src/widgets/gradienteditor.h 2014-02-13 09:41:44.000000000 +0000 ++++ b/src/widgets/gradienteditor.h 2021-04-18 14:45:24.654148450 +0100 +@@ -16,6 +16,7 @@ + #include <QHash> + #include <QWidget> + #include <QGradient> ++#include <QPainterPath> + + #include "kstwidgets_export.h" + |