diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-04-24 21:19:35 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-04-24 21:27:21 +0200 |
| commit | d8ddbd32ac5980a6c2ee4c9fd1075c01ea439982 (patch) | |
| tree | 2fe3890226d2f26c8b25e85d88fe517eac886660 /sci-geosciences | |
| parent | sci-geosciences/qgis: Add missing dependency (diff) | |
| download | gentoo-d8ddbd32ac5980a6c2ee4c9fd1075c01ea439982.tar.gz gentoo-d8ddbd32ac5980a6c2ee4c9fd1075c01ea439982.tar.bz2 gentoo-d8ddbd32ac5980a6c2ee4c9fd1075c01ea439982.zip | |
sci-geosciences/qgis: Qt5Webkit unconditional, segfaults without
Reported-by: Andreas Plesch <andreasplesch@netscape.net>
Gentoo-bug: 612070
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/qgis/qgis-2.18.7.ebuild | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sci-geosciences/qgis/qgis-2.18.7.ebuild b/sci-geosciences/qgis/qgis-2.18.7.ebuild index 5db53eae7f30..72e00e7022a9 100644 --- a/sci-geosciences/qgis/qgis-2.18.7.ebuild +++ b/sci-geosciences/qgis/qgis-2.18.7.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="http://www.qgis.org/" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="designer examples georeferencer grass mapserver oracle postgres python touch webkit" +IUSE="designer examples georeferencer grass mapserver oracle postgres python touch" REQUIRED_USE=" mapserver? ( python ) @@ -42,6 +42,7 @@ COMMON_DEPEND=" dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtsql:5 + dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}] @@ -66,7 +67,7 @@ COMMON_DEPEND=" dev-python/jinja[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}] + dev-python/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] @@ -76,7 +77,6 @@ COMMON_DEPEND=" dev-python/six[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) ) - webkit? ( dev-qt/qtwebkit:5 ) " DEPEND="${COMMON_DEPEND} dev-qt/qttest:5 @@ -129,8 +129,9 @@ src_configure() { -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) -DWITH_TOUCH="$(usex touch)" - -DWITH_QTWEBKIT=$(usex webkit) ) +# # FIXME: Re-add when segfaults were figured out upstream, bug #612070 +# -DWITH_QTWEBKIT=$(usex webkit) if has_version '<x11-libs/qscintilla-2.10'; then mycmakeargs+=( |