packages: kde4-kdebase-workspace/kde4-kdebase-workspace-python.patch - merg...

[shadzik]

Author: shadzik                      Date: Wed Feb 17 23:40:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace-python.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-python.patch
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-python.patch:1.2 packages/kde4-kdebase-workspace/kde4-kdebase-workspace-python.patch:1.3
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-python.patch:1.2	Sat Jan 30 20:15:29 2010
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-python.patch	Thu Feb 18 00:40:16 2010
@@ -1,16 +1,9 @@
---- kdebase-workspace-4.3.4/CMakeLists.txt~	2009-11-27 14:01:58.000000000 +0100
-+++ kdebase-workspace-4.3.4/CMakeLists.txt	2010-01-05 14:23:22.615963105 +0100
-@@ -52,17 +52,7 @@
-  
- include(SIPMacros)
-  
--macro_optional_find_package(PyQt4)
--if(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
--  message(STATUS "The version of PyQt found is too old. 4.4.0 or later is required.")
--  set(PYQT4_FOUND)
--endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
--
--macro_optional_find_package(PyKDE4)
+--- CMakeLists.txt.orig	2010-01-08 05:34:31.410760301 +0100
++++ CMakeLists.txt	2010-01-08 05:35:34.651532005 +0100
+@@ -60,10 +60,7 @@
+ endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
+ 
+ macro_optional_find_package(PyKDE4)
 -set(PythonSupport_FOUND FALSE)
 -if(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
 -  set(PythonSupport_FOUND TRUE)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-python.patch?r1=1.2&r2=1.3&f=u