From 6255ee73b3b2a4c898f6f93342345db6d09297f0 Mon Sep 17 00:00:00 2001 From: Amy Winston Date: Wed, 30 Dec 2015 20:56:58 +0100 Subject: sci-geosciences/qgis: 2.12.2 version bump bug #570142. Package-Manager: portage-2.2.24 --- .../qgis/files/qgis-2.12.0-no-pyqtconfig.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch (limited to 'sci-geosciences/qgis/files') diff --git a/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch new file mode 100644 index 000000000000..24fe7bff6cfa --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch @@ -0,0 +1,23 @@ +diff -ur qgis-2.12.0.orig/python/console/console.py qgis-2.12.0/python/console/console.py +--- qgis-2.12.0.orig/python/console/console.py ++++ qgis-2.12.0/python/console/console.py +@@ -25,7 +25,6 @@ + QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, \ + QDesktopServices + from PyQt4.QtGui import QVBoxLayout +-from PyQt4 import pyqtconfig + from qgis.utils import iface + from console_sci import ShellScintilla + from console_output import ShellOutputScintilla +@@ -482,10 +481,7 @@ + self.lineEditFind = QgsFilterLineEdit() + placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...") + +- if pyqtconfig.Configuration().qt_version >= 0x40700: +- self.lineEditFind.setPlaceholderText(placeHolderTxt) +- else: +- self.lineEditFind.setToolTip(placeHolderTxt) ++ self.lineEditFind.setPlaceholderText(placeHolderTxt) + self.findNextButton = QToolButton() + self.findNextButton.setEnabled(False) + toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next") -- cgit v1.2.3-65-gdbad