1 |
commit: 489cdf92cbff00d5f9946533a5928b15e81f17b0 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 14 14:43:54 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 14 16:13:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489cdf92 |
7 |
|
8 |
app-office/kexi: Fix build with modern CMake |
9 |
|
10 |
Closes: https://bugs.gentoo.org/812392 |
11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../kexi/files/kexi-3.2.0-fix-find-marble.patch | 80 ++++++++++++++++++++++ |
15 |
app-office/kexi/kexi-3.2.0-r1.ebuild | 3 +- |
16 |
2 files changed, 82 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch b/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..74716a2c37f |
21 |
--- /dev/null |
22 |
+++ b/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch |
23 |
@@ -0,0 +1,80 @@ |
24 |
+From 3280c5ec9940f329dc75b2b8d9a52285b20209f0 Mon Sep 17 00:00:00 2001 |
25 |
+From: Johannes Zarl-Zierl <johannes@××××××××××.at> |
26 |
+Date: Wed, 5 May 2021 00:09:49 +0200 |
27 |
+Subject: [PATCH] Use plain Marble package instead of KexiMarble |
28 |
+ |
29 |
+Marble has shipped with a MarbleConfig.cmake file since ~2016. Kexi |
30 |
+already depends on KF5 versions that are much newer than that. |
31 |
+ |
32 |
+* asturm 2021-09-14: Backported to 3.2.0. |
33 |
+ - s/KEXI/Kexi/ in set_package_properties(Marble ...) to fix patch context |
34 |
+ - partially merging d09be29f56b94d6a522fa30a5b661926baca973c (drop MARBLE_MIN_VERSION) |
35 |
+ |
36 |
+--- |
37 |
+ CMakeLists.txt | 8 +- |
38 |
+ src/plugins/forms/widgets/CMakeLists.txt | 2 +- |
39 |
+ .../forms/widgets/mapbrowser/CMakeLists.txt | 3 +- |
40 |
+ 3 files changed, 5 insertions(+), 8 deletions(-) |
41 |
+ |
42 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
43 |
+index 97c58fa10..548b2708f 100644 |
44 |
+--- a/CMakeLists.txt |
45 |
++++ b/CMakeLists.txt |
46 |
+@@ -196,17 +196,14 @@ endif() |
47 |
+ ## |
48 |
+ ## Test for marble |
49 |
+ ## |
50 |
+-set(MARBLE_MIN_VERSION "0.19.2") |
51 |
+-find_package(KexiMarble ${MARBLE_MIN_VERSION}) |
52 |
+-set_package_properties(KexiMarble PROPERTIES |
53 |
++find_package(Marble CONFIG) |
54 |
++set_package_properties(Marble PROPERTIES |
55 |
+ DESCRIPTION "KDE World Globe Widget library" |
56 |
+ URL "https://marble.kde.org" |
57 |
+ TYPE RECOMMENDED |
58 |
+ PURPOSE "Required by Kexi form map widget" |
59 |
+ ) |
60 |
+-if(NOT MARBLE_FOUND) |
61 |
+- set(MARBLE_INCLUDE_DIR "") |
62 |
+-else() |
63 |
++if(Marble_FOUND) |
64 |
+ set(HAVE_MARBLE TRUE) |
65 |
+ endif() |
66 |
+ set_package_properties(GLIB2 PROPERTIES TYPE RECOMMENDED PURPOSE "${_REQUIRED_BY_MDB}") |
67 |
+diff --git a/src/plugins/forms/widgets/CMakeLists.txt b/src/plugins/forms/widgets/CMakeLists.txt |
68 |
+index 107d578a8..109341fe0 100644 |
69 |
+--- a/src/plugins/forms/widgets/CMakeLists.txt |
70 |
++++ b/src/plugins/forms/widgets/CMakeLists.txt |
71 |
+@@ -11,7 +11,7 @@ endmacro() |
72 |
+ # the main widgets plugin |
73 |
+ add_subdirectory(main) |
74 |
+ |
75 |
+-if(MARBLE_FOUND) |
76 |
++if(Marble_FOUND) |
77 |
+ #TODO add_subdirectory(mapbrowser) |
78 |
+ endif() |
79 |
+ |
80 |
+diff --git a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt |
81 |
+--- a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt |
82 |
++++ b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt |
83 |
+@@ -1,7 +1,6 @@ |
84 |
+ include_directories( |
85 |
+ ${CMAKE_SOURCE_DIR}/src/formeditor |
86 |
+ ${CMAKE_SOURCE_DIR}/src/core |
87 |
+- ${MARBLE_INCLUDE_DIR} |
88 |
+ ) |
89 |
+ |
90 |
+ set(kexiforms_mapwidgetplugin_SRCS |
91 |
+@@ -20,8 +19,8 @@ target_link_libraries(kexiforms_mapwidgetplugin |
92 |
+ kexiextendedwidgets |
93 |
+ kexiformutils |
94 |
+ kexidataviewcommon |
95 |
+- ${MARBLE_LIBRARIES} |
96 |
+ |
97 |
++ Marble |
98 |
+ Qt5::Xml |
99 |
+ ) |
100 |
+ |
101 |
+-- |
102 |
+GitLab |
103 |
+ |
104 |
|
105 |
diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild |
106 |
index 73ce61cd446..89fe7316ecc 100644 |
107 |
--- a/app-office/kexi/kexi-3.2.0-r1.ebuild |
108 |
+++ b/app-office/kexi/kexi-3.2.0-r1.ebuild |
109 |
@@ -68,6 +68,7 @@ PATCHES=( |
110 |
"${FILESDIR}"/${P}-missing-header.patch |
111 |
"${FILESDIR}"/${P}-postgresql-9.12.patch |
112 |
"${FILESDIR}"/${P}-glib-2.68.patch # bug 784974 |
113 |
+ "${FILESDIR}"/${P}-fix-find-marble.patch # bug 812392 |
114 |
) |
115 |
|
116 |
src_prepare() { |
117 |
@@ -84,7 +85,7 @@ src_configure() { |
118 |
-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug) |
119 |
-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental) |
120 |
-DKEXI_SCRIPTS_SUPPORT=$(usex experimental) |
121 |
- $(cmake_use_find_package marble KexiMarble) |
122 |
+ $(cmake_use_find_package marble Marble) |
123 |
$(cmake_use_find_package mdb GLIB2) |
124 |
$(cmake_use_find_package mysql MySQL) |
125 |
$(cmake_use_find_package postgres PostgreSQL) |