commit: 5906613bbbf6fe18757fdd1045aef9e3774a628a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Apr 28 10:55:34 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 28 15:26:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5906613b
sci-geosciences/qgis: Fix QML plugins install path Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../qgis/files/qgis-3.4.7-default-qmldir.patch | 25 ++++++++++++++++++++++ sci-geosciences/qgis/qgis-9999.ebuild | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..97f8ac12858 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch @@ -0,0 +1,25 @@ +From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 28 Apr 2019 12:41:51 +0200 +Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4626042ca4..fe93ff3c4f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -660,7 +660,7 @@ IF (WITH_CORE) + SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis) + SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins) + SET (DEFAULT_INCLUDE_SUBDIR include/qgis) +- SET (DEFAULT_QML_SUBDIR qml) ++ SET (DEFAULT_QML_SUBDIR ${DEFAULT_DATA_SUBDIR}/qml) + + SET (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server) + ENDIF (APPLE) +-- +2.21.0 + diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 6aa2463ff1c..a541d6c46fd 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -108,6 +108,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" # TODO upstream "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" + "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" ) pkg_setup() { @@ -120,7 +121,7 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=/share/man/ + -DQGIS_MANUAL_SUBDIR=share/man/ -DQGIS_LIB_SUBDIR=$(get_libdir) -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis -DQWT_INCLUDE_DIR=/usr/include/qwt6
