diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-17 23:14:10 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-18 01:07:33 +0100 |
| commit | d9559d0f7308301041970ffedc15eb5f2e36b405 (patch) | |
| tree | c15ee2fae063e62c3b96e6e264255a332ad5e21f /sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch | |
| parent | media-libs/qhull: Version bump to 2015.2 (diff) | |
| download | gentoo-d9559d0f7308301041970ffedc15eb5f2e36b405.tar.gz gentoo-d9559d0f7308301041970ffedc15eb5f2e36b405.tar.bz2 gentoo-d9559d0f7308301041970ffedc15eb5f2e36b405.zip | |
sci-geosciences/qgis: Fix build w/ sip-4.19.1, qscintilla-2.10
Silence cmake warnings.
Gentoo-bug: 612924
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch b/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch new file mode 100644 index 000000000000..fb714654579d --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch @@ -0,0 +1,24 @@ +From 30577386cbe0ee9a5509e7f6f54df2c1194153ee Mon Sep 17 00:00:00 2001 +From: Larry Shaffer <lshaffer@boundlessgeo.com> +Date: Thu, 2 Mar 2017 15:00:18 -0700 +Subject: [PATCH] Followup to dfe268f; update QScintilla new lib name in 2.10 + for Qt4 + +[ci skip] +--- + cmake/FindQScintilla.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake +index 7f97624..2f87e4c 100644 +--- a/cmake/FindQScintilla.cmake ++++ b/cmake/FindQScintilla.cmake +@@ -36,7 +36,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR) + if(ENABLE_QT5) + set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib) + else(ENABLE_QT5) +- set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib) ++ set(QSCINTILLA_LIBRARY_NAMES qscintilla2 qscintilla2_qt4 libqscintilla2 libqscintilla2.dylib) + endif(ENABLE_QT5) + + find_library(QSCINTILLA_LIBRARY |