diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-08-15 12:01:16 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-08-15 12:37:23 +0200 |
| commit | 33704aeb6ed01b61e6276f05a7c1bb1d9ded1671 (patch) | |
| tree | f07d33fafe38221d4f330d93760410fa34a1bff9 /sci-geosciences/qgis | |
| parent | sci-libs/silo: QA: Fix REQUIRED_USE (diff) | |
| download | gentoo-33704aeb6ed01b61e6276f05a7c1bb1d9ded1671.tar.gz gentoo-33704aeb6ed01b61e6276f05a7c1bb1d9ded1671.tar.bz2 gentoo-33704aeb6ed01b61e6276f05a7c1bb1d9ded1671.zip | |
sci-geosciences/qgis: Fix build with USE=-webkit
Closes: https://bugs.gentoo.org/663394
Package-Manager: Portage-2.3.46, Repoman-2.3.10
Diffstat (limited to 'sci-geosciences/qgis')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch | 30 | ||||
| -rw-r--r-- | sci-geosciences/qgis/qgis-3.2.1.ebuild | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch new file mode 100644 index 000000000000..9e56bf5ae959 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch @@ -0,0 +1,30 @@ +From 55473e7e21a068dec904fd4146642c33a44ce22a Mon Sep 17 00:00:00 2001 +From: Denis Rouzaud <denis.rouzaud@gmail.com> +Date: Wed, 8 Aug 2018 13:40:04 +0200 +Subject: [PATCH] fix build without webkit + +--- + src/gui/qgsmaptip.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp +index d9fe4a32607..7af6f97672c 100644 +--- a/src/gui/qgsmaptip.cpp ++++ b/src/gui/qgsmaptip.cpp +@@ -155,12 +155,16 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer, + + void QgsMapTip::resizeContent() + { ++#if WITH_QTWEBKIT + // Get the content size + QWebElement container = mWebView->page()->mainFrame()->findFirstElement( + QStringLiteral( "#QgsWebViewContainer" ) ); + int width = container.geometry().width() + MARGIN_VALUE * 2; + int height = container.geometry().height() + MARGIN_VALUE * 2; + mWidget->resize( width, height ); ++#else ++ mWebView->adjustSize(); ++#endif + } + + void QgsMapTip::clear( QgsMapCanvas * )
\ No newline at end of file diff --git a/sci-geosciences/qgis/qgis-3.2.1.ebuild b/sci-geosciences/qgis/qgis-3.2.1.ebuild index d5c984cfc17c..d5ad55122d0f 100644 --- a/sci-geosciences/qgis/qgis-3.2.1.ebuild +++ b/sci-geosciences/qgis/qgis-3.2.1.ebuild @@ -100,6 +100,7 @@ RESTRICT="test" PATCHES=( # git master "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" + "${FILESDIR}/${P}-qtwebkit-optional.patch" # bug 663394 ) pkg_setup() { |