diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /sci-geosciences | |
parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) |
gentoo resync : 04.05.2019
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/Manifest.gz | bin | 11100 -> 11100 bytes | |||
-rw-r--r-- | sci-geosciences/qgis/Manifest | 8 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.4.7-default-qmldir.patch | 25 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch | 31 | ||||
-rw-r--r-- | sci-geosciences/qgis/metadata.xml | 3 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-3.4.7.ebuild | 218 | ||||
-rw-r--r-- | sci-geosciences/qgis/qgis-9999.ebuild | 69 |
7 files changed, 314 insertions, 40 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz Binary files differindex c5d57203b762..b62da721f093 100644 --- a/sci-geosciences/Manifest.gz +++ b/sci-geosciences/Manifest.gz diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 1b2d973d3f14..ad46cd4dec0c 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,7 +1,11 @@ AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 AUX qgis-3.2.1-qtwebkit-optional.patch 978 BLAKE2B 31ed74dfc390bd132547a3934d5bfb906134efc5b1d56c885a1446a4bf828474a8262414c3cdd446286a7e266d09a0f775ba2087c1741053154ca55b7773274f SHA512 dc71b850f73a11781d89bc1f08c830fd13d2d5d912d746133d7748724933143dbaf7957fbcdd8f8009ad8648d4f528661cf62ebf2aff5d04cd5856ba1429e3d8 +AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133 +AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22 +DIST qgis-3.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d EBUILD qgis-3.2.3.ebuild 6195 BLAKE2B 92beb6aef1915030ae047a9216d2593f2c9a5f0cace785b4ac95aaa38472b1cef8012474eac3f5a59cf2dadb1f93383e6fe0d9016af447404573ad285e40ee1a SHA512 a322aa327c5c2e6512e74597216edb6fef931cb5c2e0a85f28614bda0c5a96b4ba561e1ba2613dc875921a291f4d4dee33cb35ae51ee618b91b7969b777a0a9b -EBUILD qgis-9999.ebuild 6231 BLAKE2B aa18381dd71172108b6d5ffbcbe15019431e4f8ddd1527626390d02c2f14673a34d074ea79361897bd03d56e6d26c7c20a1b31ed2f1d383d47cbd7f41e38971a SHA512 cce02404b78ea718bad247db2cc4e3417c8af449bbdb9161eaacdebcbeb1f85c0d6e879799c8e5c38a0e8f95f330e7c5b83f2dabdf73ba0a5a4bfdec37c9909c -MISC metadata.xml 1211 BLAKE2B 761852f48581c7cca9f9474d1e2e99c751ca2597726cbbb973c82c6292806e4908fcaa091ad4ad5b60f73cea831db2f94be9c7ae3627ad9bfbe0a7572638c929 SHA512 22aa2127957668f8017e20d08297ef222bb1f9fd0a420398ee191426de0b681fb90138bfa8117f67612001d64020455871db4b8a772653d9ee02d7777555e48b +EBUILD qgis-3.4.7.ebuild 6148 BLAKE2B a172b10767c6b4b090f4dce7523886e4cb328c34b263a28702982999c6468a4d0e8bd2f55db6373c79bce77187315b55a8f0bcaf5ab19cea0c6b8b6f984c383b SHA512 93dfd0d7e4fcb926e5c136dffa2c296f27c08e586eca0c7e3f6397a056d1de8e2d1055f9ea18fcabc55bf475d6a4e272fb8af56af854330c4f00efdd1308967c +EBUILD qgis-9999.ebuild 6060 BLAKE2B a3de4e10e3bbb1b403a8aabf9ca3fb7c08ab883438946677edd77f82090823aa2b4d7e2f95e290e0cb46ba221298384bad387e7f1ca49a122019b3e8d1a855ef SHA512 49083b5cacb71c640f9319659c614f21c0dda8503624f0b6437514cbb0addc1f494ca2d00cafcc27e86a18dbd39ecc4a1a672292a5477839aceed5527ed4da1e +MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99 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 000000000000..97f8ac12858c --- /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 <andreas.sturmlechner@gmail.com> +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/files/qgis-3.4.7-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch new file mode 100644 index 000000000000..ec971cef7792 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch @@ -0,0 +1,31 @@ +From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 28 Apr 2019 00:10:21 +0200 +Subject: [PATCH] cmake: Use FeatureSummary + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dff8ea0f4..4626042ca4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,6 +71,8 @@ IF(NOT MSVC) + endif(USE_CCACHE) + endif(NOT MSVC) + ++include(FeatureSummary) ++ + # in generated makefiles use relative paths so the project dir is moveable + # Note commented out since it cause problems but it would be nice to resolve these and enable + # +@@ -937,3 +939,5 @@ ENDIF (WITH_CORE) + IF (UNIX AND NOT APPLE) + ADD_SUBDIRECTORY(linux) + ENDIF (UNIX AND NOT APPLE) ++ ++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +2.21.0 + diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index 162cbbaa3dec..56b0fd7a351e 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -17,7 +17,10 @@ <flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag> <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag> <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag> + <flag name="hdf5">Enable MDAL support for <pkg>sci-libs/hdf5</pkg></flag> <flag name="mapserver">Determines whether mapserver should be built</flag> + <flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag> + <flag name="opencl">Enable OpenCL support</flag> <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag> <flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag> </use> diff --git a/sci-geosciences/qgis/qgis-3.4.7.ebuild b/sci-geosciences/qgis/qgis-3.4.7.ebuild new file mode 100644 index 000000000000..c4b4335cecb7 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.4.7.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6} ) +PYTHON_REQ_USE="sqlite" +QT_MIN_VER="5.9.4" + +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" + inherit git-r3 +else + SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 + examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" + KEYWORDS="~amd64 ~x86" +fi +inherit cmake-utils desktop python-single-r1 qmake-utils xdg + +DESCRIPTION="User friendly Geographic Information System" +HOMEPAGE="https://www.qgis.org/" + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" + +BDEPEND=" + >=dev-qt/linguist-tools-${QT_MIN_VER}:5 + sys-devel/bison + sys-devel/flex +" +COMMON_DEPEND=" + app-crypt/qca:2[qt5(+),ssl] + >=dev-db/spatialite-4.2.0 + dev-db/sqlite:3 + dev-libs/expat + dev-libs/libzip:= + dev-libs/qtkeychain[qt5(+)] + >=dev-qt/designer-${QT_MIN_VER}:5 + >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 + >=dev-qt/qtcore-${QT_MIN_VER}:5 + >=dev-qt/qtgui-${QT_MIN_VER}:5 + >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] + >=dev-qt/qtpositioning-${QT_MIN_VER}:5 + >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 + >=dev-qt/qtserialport-${QT_MIN_VER}:5 + >=dev-qt/qtsvg-${QT_MIN_VER}:5 + >=dev-qt/qtsql-${QT_MIN_VER}:5 + >=dev-qt/qtwidgets-${QT_MIN_VER}:5 + >=dev-qt/qtxml-${QT_MIN_VER}:5 + >=sci-libs/gdal-2.2.3:=[geos] + sci-libs/geos + sci-libs/libspatialindex:= + sci-libs/proj + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] + 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) + georeferencer? ( sci-libs/gsl:= ) + grass? ( =sci-geosciences/grass-7*:= ) + hdf5? ( sci-libs/hdf5:= ) + mapserver? ( dev-libs/fcgi ) + netcdf? ( sci-libs/netcdf:= ) + opencl? ( virtual/opencl ) + oracle? ( + dev-db/oracle-instantclient:= + sci-libs/gdal:=[oracle] + ) + polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) + postgres? ( dev-db/postgresql:= ) + python? ( + ${PYTHON_DEPS} + dev-python/future[${PYTHON_USEDEP}] + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/owslib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + ) + qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 ) + webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qttest-${QT_MIN_VER}:5 + >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="test" + +PATCHES=( + # git master + "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" + # TODO upstream + "${FILESDIR}/${P}-featuresummary.patch" + "${FILESDIR}/${P}-default-qmldir.patch" +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \ + -i CMakeLists.txt || die # TODO fixed in master +} + +src_configure() { + local mycmakeargs=( + -DQGIS_MANUAL_SUBDIR=share/man/ + -DQGIS_LIB_SUBDIR=$(get_libdir) + -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis + -DQWT_INCLUDE_DIR=/usr/include/qwt6 + -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so + -DPEDANTIC=OFF + -DUSE_CCACHE=OFF + -DWITH_APIDOC=OFF + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=OFF + -DWITH_3D=$(usex 3d) + -DWITH_GEOREFERENCER=$(usex georeferencer) + -DWITH_GRASS7=$(usex grass) + $(cmake-utils_use_find_package hdf5 HDF5) + -DWITH_SERVER=$(usex mapserver) + $(cmake-utils_use_find_package netcdf NetCDF) + -DUSE_OPENCL=$(usex opencl) + -DWITH_ORACLE=$(usex oracle) + -DWITH_QWTPOLAR=$(usex polar) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_BINDINGS=$(usex python) + -DWITH_CUSTOM_WIDGETS=$(usex python) + -DWITH_QUICK=$(usex qml) + -DWITH_QTWEBKIT=$(usex webkit) + ) + + if use grass; then + mycmakeargs+=( + -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 + ) + fi + + use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) + + # bugs 612956, 648726 + addpredict /dev/dri/renderD128 + addpredict /dev/dri/renderD129 + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop + + local size type + for size in 16 22 24 32 48 64 96 128 256; do + newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png + newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png + for type in qgs qml qlr qpt; do + newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png + done + done + newicon -s scalable images/icons/qgis_icon.svg qgis.svg + + insinto /usr/share/mime/packages + doins debian/qgis.xml + + if use examples; then + docinto examples + dodoc -r "${WORKDIR}"/qgis_sample_data/. + docompress -x /usr/share/doc/${PF}/examples + fi + + if use python; then + python_optimize "${ED}"/usr/share/qgis/python + fi + + if use grass; then + python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts + fi +} + +pkg_postinst() { + if use postgres; then + elog "If you don't intend to use an external PostGIS server" + elog "you should install:" + elog " dev-db/postgis" + elif use python; then + elog "Support of PostgreSQL is disabled." + elog "But some installed python-plugins import the psycopg2 module." + elog "If you do not need these plugins just disable them" + elog "in the Plugins menu, else you need to set USE=\"postgres\"" + fi + if has_version "<sci-geosciences/qgis-3"; then + elog "QGIS is now based on PyQt5. Old scripts may not work anymore." + fi + + xdg_pkg_postinst +} diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 9e1e9a34acbe..a541d6c46fd2 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -1,32 +1,36 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{5,6} ) PYTHON_REQ_USE="sqlite" QT_MIN_VER="5.9.4" -if [[ ${PV} != *9999 ]]; then +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" + inherit git-r3 +else SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" KEYWORDS="~amd64 ~x86" -else - GIT_ECLASS="git-r3" - EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" fi -inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils -unset GIT_ECLASS +inherit cmake-utils desktop python-single-r1 qmake-utils xdg DESCRIPTION="User friendly Geographic Information System" HOMEPAGE="https://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d examples georeferencer grass mapserver oracle polar postgres python qml webkit" +IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )" +BDEPEND=" + >=dev-qt/linguist-tools-${QT_MIN_VER}:5 + sys-devel/bison + sys-devel/flex +" COMMON_DEPEND=" app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 @@ -41,6 +45,7 @@ COMMON_DEPEND=" >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] >=dev-qt/qtpositioning-${QT_MIN_VER}:5 >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 + >=dev-qt/qtserialport-${QT_MIN_VER}:5 >=dev-qt/qtsvg-${QT_MIN_VER}:5 >=dev-qt/qtsql-${QT_MIN_VER}:5 >=dev-qt/qtwidgets-${QT_MIN_VER}:5 @@ -54,7 +59,10 @@ COMMON_DEPEND=" 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) + hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) + netcdf? ( sci-libs/netcdf:= ) + opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] @@ -84,11 +92,8 @@ COMMON_DEPEND=" webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/linguist-tools-${QT_MIN_VER}:5 >=dev-qt/qttest-${QT_MIN_VER}:5 >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 - sys-devel/bison - sys-devel/flex python? ( ${PYTHON_DEPS} ) " RDEPEND="${COMMON_DEPEND} @@ -101,6 +106,9 @@ RESTRICT="test" PATCHES=( # git master "${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() { @@ -109,22 +117,11 @@ pkg_setup() { src_prepare() { cmake-utils_src_prepare - - sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \ - -i CMakeLists.txt || die "Failed to fix lrelease path" - - sed -e "/QT_LRELEASE_EXECUTABLE/d" \ - -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \ - -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \ - -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake" - - cd src/plugins || die } src_configure() { local mycmakeargs=( - -DQGIS_MANUAL_SUBDIR=/share/man/ - -DBUILD_SHARED_LIBS=ON + -DQGIS_MANUAL_SUBDIR=share/man/ -DQGIS_LIB_SUBDIR=$(get_libdir) -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis -DQWT_INCLUDE_DIR=/usr/include/qwt6 @@ -132,12 +129,16 @@ src_configure() { -DPEDANTIC=OFF -DUSE_CCACHE=OFF -DWITH_APIDOC=OFF + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 -DWITH_QSPATIALITE=ON -DENABLE_TESTS=OFF -DWITH_3D=$(usex 3d) -DWITH_GEOREFERENCER=$(usex georeferencer) -DWITH_GRASS7=$(usex grass) + $(cmake-utils_use_find_package hdf5 HDF5) -DWITH_SERVER=$(usex mapserver) + $(cmake-utils_use_find_package netcdf NetCDF) + -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) -DWITH_QWTPOLAR=$(usex polar) -DWITH_POSTGRESQL=$(usex postgres) @@ -165,14 +166,14 @@ src_configure() { src_install() { cmake-utils_src_install - domenu debian/qgis.desktop + newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop local size type for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png + newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png + newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png + newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png done done newicon -s scalable images/icons/qgis_icon.svg qgis.svg @@ -187,11 +188,11 @@ src_install() { fi if use python; then - python_optimize "${ED%/}"/usr/share/qgis/python + python_optimize "${ED}"/usr/share/qgis/python fi if use grass; then - python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts + python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts fi } @@ -210,13 +211,5 @@ pkg_postinst() { elog "QGIS is now based on PyQt5. Old scripts may not work anymore." fi - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update + xdg_pkg_postinst } |