diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sci-geosciences/qgis/files | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'sci-geosciences/qgis/files')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch | 12 | ||||
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch | 30 |
2 files changed, 12 insertions, 30 deletions
diff --git a/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch new file mode 100644 index 000000000000..472b8aa466ce --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.10.0-cmake-lib-suffix.patch @@ -0,0 +1,12 @@ +diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake +--- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100 ++++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100 +@@ -36,7 +36,7 @@ + ELSE(CMAKE_HOST_WIN32) + # TODO osx + SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") +- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib") ++ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") + ENDIF(CMAKE_HOST_WIN32) + + FOREACH(it ${ARGN}) 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 deleted file mode 100644 index 9e56bf5ae959..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 |