Gentoo Archives: gentoo-commits

From: Marc Schiffbauer <mschiff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn-plugin-logbookkonni/files/
Date: Tue, 30 Nov 2021 09:05:35
Message-Id: 1638263110.8321543ab1c500a4444f359423df7e8f677c5eb6.mschiff@gentoo
1 commit: 8321543ab1c500a4444f359423df7e8f677c5eb6
2 Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 30 09:05:10 2021 +0000
4 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 30 09:05:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8321543a
7
8 sci-geosciences/opencpn-plugin-logbookkonni: add cmake patch
9
10 Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
11
12 .../opencpn-plugin-logbookkonni/files/cmake.patch | 57 ++++++++++++++++++++++
13 1 file changed, 57 insertions(+)
14
15 diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch
16 new file mode 100644
17 index 000000000000..4221ce9f82cd
18 --- /dev/null
19 +++ b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch
20 @@ -0,0 +1,57 @@
21 +diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake
22 +--- LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake 2021-10-30 07:35:43.000000000 -1000
23 ++++ LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake 2021-11-29 22:31:48.755156001 -1000
24 +@@ -6,7 +6,7 @@
25 + # Installation items and layout.
26 + # ~~~
27 +
28 +-include(Metadata)
29 ++#include(Metadata)
30 +
31 + if (APPLE)
32 + install(
33 +diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake
34 +--- LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake 2021-10-30 07:35:43.000000000 -1000
35 ++++ LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake 2021-11-29 22:31:48.756156018 -1000
36 +@@ -8,7 +8,7 @@
37 + return()
38 + endif ()
39 +
40 +-include(Metadata)
41 ++#include(Metadata)
42 +
43 + if (UNIX AND NOT APPLE AND NOT QT_ANDROID)
44 + set(_LINUX ON)
45 +diff -urN LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt LogbookKonni_pi-1.4.22.0/CMakeLists.txt
46 +--- LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt 2021-10-30 07:35:43.000000000 -1000
47 ++++ LogbookKonni_pi-1.4.22.0/CMakeLists.txt 2021-11-29 22:42:03.398496368 -1000
48 +@@ -27,6 +27,7 @@
49 + endif ()
50 + message(STATUS "Cmake version: ${CMAKE_VERSION}.")
51 +
52 ++set(BUILD_TYPE "tarball")
53 +
54 + # -------- Build setup (mostly in PluginCompiler) --------
55 + #
56 +@@ -57,6 +58,7 @@
57 +
58 + option(PLUGIN_USE_SVG "Use SVG graphics" ON)
59 +
60 ++
61 + include(PluginOptions)
62 +
63 + #
64 +@@ -135,9 +137,10 @@
65 + create_targets(
66 + ${PROJECT_SOURCE_DIR}/flatpak/org.opencpn.OpenCPN.Plugin.logbook.yaml
67 + )
68 +-if ("${BUILD_TYPE}" STREQUAL "")
69 +- return ()
70 +-endif ()
71 ++#if ("${BUILD_TYPE}" STREQUAL "")
72 ++# return ()
73 ++#endif ()
74 ++include(PluginLibs)
75 +
76 + if (NOT ${BUILD_TYPE} STREQUAL "flatpak")
77 + # Build package as required (flatpak already dealt with).