| 1 |
commit: 5906613bbbf6fe18757fdd1045aef9e3774a628a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 28 10:55:34 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 28 15:26:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5906613b |
| 7 |
|
| 8 |
sci-geosciences/qgis: Fix QML plugins install path |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
.../qgis/files/qgis-3.4.7-default-qmldir.patch | 25 ++++++++++++++++++++++ |
| 13 |
sci-geosciences/qgis/qgis-9999.ebuild | 3 ++- |
| 14 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..97f8ac12858 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch |
| 21 |
@@ -0,0 +1,25 @@ |
| 22 |
+From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 24 |
+Date: Sun, 28 Apr 2019 12:41:51 +0200 |
| 25 |
+Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout |
| 26 |
+ |
| 27 |
+--- |
| 28 |
+ CMakeLists.txt | 2 +- |
| 29 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 30 |
+ |
| 31 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 32 |
+index 4626042ca4..fe93ff3c4f 100644 |
| 33 |
+--- a/CMakeLists.txt |
| 34 |
++++ b/CMakeLists.txt |
| 35 |
+@@ -660,7 +660,7 @@ IF (WITH_CORE) |
| 36 |
+ SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis) |
| 37 |
+ SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins) |
| 38 |
+ SET (DEFAULT_INCLUDE_SUBDIR include/qgis) |
| 39 |
+- SET (DEFAULT_QML_SUBDIR qml) |
| 40 |
++ SET (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml) |
| 41 |
+ |
| 42 |
+ SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server) |
| 43 |
+ ENDIF (APPLE) |
| 44 |
+-- |
| 45 |
+2.21.0 |
| 46 |
+ |
| 47 |
|
| 48 |
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild |
| 49 |
index 6aa2463ff1c..a541d6c46fd 100644 |
| 50 |
--- a/sci-geosciences/qgis/qgis-9999.ebuild |
| 51 |
+++ b/sci-geosciences/qgis/qgis-9999.ebuild |
| 52 |
@@ -108,6 +108,7 @@ PATCHES=( |
| 53 |
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" |
| 54 |
# TODO upstream |
| 55 |
"${FILESDIR}/${PN}-3.4.7-featuresummary.patch" |
| 56 |
+ "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" |
| 57 |
) |
| 58 |
|
| 59 |
pkg_setup() { |
| 60 |
@@ -120,7 +121,7 @@ src_prepare() { |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
local mycmakeargs=( |
| 64 |
- -DQGIS_MANUAL_SUBDIR=/share/man/ |
| 65 |
+ -DQGIS_MANUAL_SUBDIR=share/man/ |
| 66 |
-DQGIS_LIB_SUBDIR=$(get_libdir) |
| 67 |
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis |
| 68 |
-DQWT_INCLUDE_DIR=/usr/include/qwt6 |
Archives