[packages/kde4-kdelibs] - work around races in PyQt4/PuKDE4 detection code - rel 5

[baggins]

commit 8669fcb4d12f395b0690451594e6b879927ea588
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 5 19:00:28 2019 +0200

    - work around races in PyQt4/PuKDE4 detection code
    - rel 5

 cmake-py.patch    | 43 +++++++++++++++++++++++++++++++++++++++++++
 kde4-kdelibs.spec |  4 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kdelibs.spec b/kde4-kdelibs.spec
index ef11b71..909e6ef 100644
--- a/kde4-kdelibs.spec
+++ b/kde4-kdelibs.spec
@@ -14,7 +14,7 @@ Summary(ru.UTF-8):	K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
 Version:	4.14.38
-Release:	4
+Release:	5
 License:	LGPL v2.1 or LGPL v3
 Group:		X11/Libraries
 Source0:	https://download.kde.org/Attic/%{_state}/applications/17.08.3/src/%{orgname}-%{version}.tar.xz
@@ -32,6 +32,7 @@ Patch7:		strigi-64bit.patch
 Patch8:		%{name}-exiv2.patch
 Patch9:		%{name}-hunspell.patch
 Patch10:	%{name}-openssl-1.1.patch
+Patch11:	cmake-py.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -251,6 +252,7 @@ KDE.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
diff --git a/cmake-py.patch b/cmake-py.patch
new file mode 100644
index 0000000..521616d
--- /dev/null
+++ b/cmake-py.patch
@@ -0,0 +1,43 @@
+--- a/cmake/modules/FindPyKDE4.py.orig	2019-10-05 18:46:43.123448485 +0200
++++ b/cmake/modules/FindPyKDE4.py	2019-10-05 18:49:02.073443736 +0200
+@@ -2,7 +2,12 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-import PyKDE4.kdecore
++try:
++    import PyKDE4.kdecore
++except ImportError,RuntimeError:
++    import sip
++    import PyKDE4.kdecore
++    pass
+ 
+ if __name__ == '__main__':
+     try:
+--- a/cmake/modules/FindPyQt.py.orig	2017-11-05 02:51:22.000000000 +0100
++++ b/cmake/modules/FindPyQt.py	2019-10-05 18:51:12.803439266 +0200
+@@ -3,7 +3,12 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-import PyQt4.QtCore
++try:
++    import PyQt4.QtCore
++except ImportError,RuntimeError:
++    import sip
++    import PyQt4.QtCore
++    pass
+ import os
+ import sys
+ 
+@@ -41,8 +46,8 @@
+         sip_dir = get_default_sip_dir()
+         sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
+ 
+-    print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION)
+-    print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR)
++#    print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION)
++#    print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR)
+     print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags))
+     print('pyqt_sip_dir:%s' % sip_dir)
+     print('pyqt_sip_flags:%s' % sip_flags)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdelibs.git/commitdiff/8669fcb4d12f395b0690451594e6b879927ea588