28de83f21c
- Added fix-braindead-logic-in-PyQt-version-detection.diff, fixes build with PyQT >= 4.10 - Add provides/obsoletes for go-kate in libktexteditor, both packages ship the same syntax file OBS-URL: https://build.opensuse.org/request/show/160643 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=30
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From efea0f878622bec033943e50355015a18b7dcfec Mon Sep 17 00:00:00 2001
|
|
From: Luca Beltrame <lbeltrame@kde.org>
|
|
Date: Fri, 15 Mar 2013 00:23:34 +0100
|
|
Subject: [PATCH] Fix braindead logic in PyQt version detection. Fixes build
|
|
for PyQt >= 4.10.
|
|
|
|
CCMAIL: srhaque@theiet.org
|
|
---
|
|
kate/plugins/pate/sip/CMakeLists.txt | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/kate/plugins/pate/sip/CMakeLists.txt b/kate/plugins/pate/sip/CMakeLists.txt
|
|
index d32266f..58b86e1 100644
|
|
--- a/kate/plugins/pate/sip/CMakeLists.txt
|
|
+++ b/kate/plugins/pate/sip/CMakeLists.txt
|
|
@@ -23,12 +23,12 @@ set(SIP_INCLUDES ${PYQT4_SIP_DIR} ${PYKDE4_SIP_DIR} ./kate)
|
|
set(SIP_CONCAT_PARTS 1)
|
|
set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
|
|
|
|
-if(PYQT4_VERSION LESS "040905")
|
|
+if(PYQT4_VERSION STRLESS "040905")
|
|
set(SIP_EXTRA_OPTIONS -g)
|
|
-else (PYQT4_VERSION LESS "040905")
|
|
+else (PYQT4_VERSION STRLESS "040905")
|
|
# Disable QVector<int> for newer PyQt
|
|
set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector)
|
|
-endif(PYQT4_VERSION LESS "040905")
|
|
+endif(PYQT4_VERSION STRLESS "040905")
|
|
|
|
add_sip_python_module(PyKate4.kate ./kate/katemod.sip ${KDE4_KTEXTEDITOR_LIBS} kateinterfaces)
|
|
|
|
--
|
|
1.8.2
|
|
|