From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- .../libalkimia/files/libalkimia-8.1.0-cmake.patch | 54 ++++++++++++++++++++++ .../files/libalkimia-8.1.0-missing-header.patch | 25 ++++++++++ 2 files changed, 79 insertions(+) create mode 100644 app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch create mode 100644 app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch (limited to 'app-office/libalkimia/files') diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch b/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch new file mode 100644 index 000000000000..652e951c4bce --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch @@ -0,0 +1,54 @@ +From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 12 Jun 2019 19:44:12 +0200 +Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for + alkimia target + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7c0f0f7..0774032 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) + + install(TARGETS alkimia + EXPORT alkimiaTargets +- ${INSTALL_TARGETS_DEFAULT_ARGS} ++ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} + ) + + if(BUILD_QT4) +-- +2.23.0 + + +From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 12 Jun 2019 16:43:54 +0200 +Subject: [PATCH 2/2] Fix pkgconfig libdir path + +--- + src/libalkimia.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in +index c2087c9..6ada277 100644 +--- a/src/libalkimia.pc.in ++++ b/src/libalkimia.pc.in +@@ -4,8 +4,8 @@ + # General installation directories + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@KDE4_LIB_DIR@ +-includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + # Human-readable name + Name: Alkimia +-- +2.23.0 + diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch b/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch new file mode 100644 index 000000000000..c1f1ff463ee3 --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.1.0-missing-header.patch @@ -0,0 +1,25 @@ +From 0e398425030bae0cfe7be70ce82d61e674160a97 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 5 Mar 2021 22:40:40 +0100 +Subject: [PATCH] Add missing QUrl include with -DBUILD_WITH_WEBENGINE=no + +Signed-off-by: Andreas Sturmlechner +--- + tools/onlinequoteseditor/mainwindow.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/onlinequoteseditor/mainwindow.cpp b/tools/onlinequoteseditor/mainwindow.cpp +index fad7e85..d5a3026 100644 +--- a/tools/onlinequoteseditor/mainwindow.cpp ++++ b/tools/onlinequoteseditor/mainwindow.cpp +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + class MainWindow::Private + { +-- +2.30.1 + -- cgit v1.2.3